Adopt version 0.0.14 of the language server (#233)
This release includes changes to how workspace/configuration requests are handled as they have become a part of the official LSP specification. textDocument/documentLink requests are now handled by creating links for image names that open to hub.docker.com. Signed-off-by: Remy Suen <remy.suen@gmail.com>
This commit is contained in:
Remy Suen
Chris Dias
Родитель
916d9c7026
Коммит
c7e7da61b1
|
|
@ -26,7 +26,7 @@ import { Reporter } from './telemetry/telemetry';
|
|||
import DockerInspectDocumentContentProvider, { SCHEME as DOCKER_INSPECT_SCHEME } from './documentContentProviders/dockerInspect';
|
||||
import { DockerExplorerProvider } from './explorer/dockerExplorer';
|
||||
import { removeContainer } from './commands/remove-container';
|
||||
import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Middleware, Proposed, ProposedFeatures, DidChangeConfigurationNotification } from 'vscode-languageclient';
|
||||
import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Middleware, DidChangeConfigurationNotification, ConfigurationParams } from 'vscode-languageclient';
|
||||
import { WebAppCreator } from './explorer/deploy/webAppCreator';
|
||||
import { AzureImageNode, AzureRegistryNode, AzureRepositoryNode } from './explorer/models/azureRegistryNodes';
|
||||
import { DockerHubImageNode, DockerHubRepositoryNode, DockerHubOrgNode } from './explorer/models/dockerHubNodes';
|
||||
|
|
@ -150,7 +150,7 @@ namespace Configuration {
|
|||
|
||||
let configurationListener: vscode.Disposable;
|
||||
|
||||
export function computeConfiguration(params: Proposed.ConfigurationParams): vscode.WorkspaceConfiguration[] {
|
||||
export function computeConfiguration(params: ConfigurationParams): vscode.WorkspaceConfiguration[] {
|
||||
if (!params.items) {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -192,7 +192,7 @@ function activateLanguageClient(ctx: vscode.ExtensionContext) {
|
|||
debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
|
||||
}
|
||||
|
||||
let middleware: ProposedFeatures.ConfigurationMiddleware | Middleware = {
|
||||
let middleware: Middleware = {
|
||||
workspace: {
|
||||
configuration: Configuration.computeConfiguration
|
||||
}
|
||||
|
|
@ -207,8 +207,6 @@ function activateLanguageClient(ctx: vscode.ExtensionContext) {
|
|||
}
|
||||
|
||||
client = new LanguageClient("dockerfile-langserver", "Dockerfile Language Server", serverOptions, clientOptions);
|
||||
// enable the proposed workspace/configuration feature
|
||||
client.registerProposedFeatures();
|
||||
client.onReady().then(() => {
|
||||
// attach the VS Code settings listener
|
||||
Configuration.initialize();
|
||||
|
|
|
|||
|
|
@ -629,30 +629,82 @@
|
|||
}
|
||||
},
|
||||
"dockerfile-ast": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.1.tgz",
|
||||
"integrity": "sha1-0b09ju5fJmiilLck/ZCm4BKs+5Y=",
|
||||
"version": "0.0.3",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.3.tgz",
|
||||
"integrity": "sha1-RnpnKRpqLBnnMgDfR1n4xECVrl4=",
|
||||
"requires": {
|
||||
"vscode-languageserver-types": "3.5.0"
|
||||
"vscode-languageserver-types": "3.6.0"
|
||||
}
|
||||
},
|
||||
"dockerfile-language-server-nodejs": {
|
||||
"version": "0.0.13",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.13.tgz",
|
||||
"integrity": "sha1-5zJv/cyVIjEZYf/oUr9jmDaRpLA=",
|
||||
"version": "0.0.14",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.14.tgz",
|
||||
"integrity": "sha512-7YOtBsGGhHTDxUNSyiNs8vmsBayqO1tOvXOxuMOrNdg9kiU485MrdVPSTHhxLP47vXa80hoUxIaefBlQdEJCaQ==",
|
||||
"requires": {
|
||||
"dockerfile-ast": "0.0.1",
|
||||
"dockerfile-utils": "0.0.5",
|
||||
"vscode-languageserver": "3.5.0"
|
||||
"dockerfile-ast": "0.0.3",
|
||||
"dockerfile-language-service": "0.0.2",
|
||||
"dockerfile-utils": "0.0.6",
|
||||
"vscode-languageserver": "4.0.0"
|
||||
}
|
||||
},
|
||||
"dockerfile-language-service": {
|
||||
"version": "0.0.2",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.2.tgz",
|
||||
"integrity": "sha512-G5Cl+0JUxBzldLugRagTcEFUfFTvNqA0D8nGUmmHyvJbK/CeNMSCTiKnXsRs96/vMWuDBgN367LrBICxc1vGmA==",
|
||||
"requires": {
|
||||
"dockerfile-ast": "0.0.3",
|
||||
"dockerfile-utils": "0.0.7",
|
||||
"vscode-languageserver-types": "3.6.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"dockerfile-utils": {
|
||||
"version": "0.0.7",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.7.tgz",
|
||||
"integrity": "sha1-37dpwRfo+moNtQhQKW9MkYH9mIk=",
|
||||
"requires": {
|
||||
"dockerfile-ast": "0.0.2",
|
||||
"vscode-languageserver-types": "3.5.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"dockerfile-ast": {
|
||||
"version": "0.0.2",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.2.tgz",
|
||||
"integrity": "sha1-g0U5EiTvCN8eexWRbjRqygVLTKg=",
|
||||
"requires": {
|
||||
"vscode-languageserver-types": "3.5.0"
|
||||
}
|
||||
},
|
||||
"vscode-languageserver-types": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz",
|
||||
"integrity": "sha1-5I15li8LjgLelV4/UkkI4rGcA3Q="
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"dockerfile-utils": {
|
||||
"version": "0.0.5",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.5.tgz",
|
||||
"integrity": "sha1-cSl6hRXJ2/1WKI9NJ6otO8Hc8tw=",
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.6.tgz",
|
||||
"integrity": "sha1-L/+YZaGvhqU6yAVSZrkXriClvLY=",
|
||||
"requires": {
|
||||
"dockerfile-ast": "0.0.1",
|
||||
"dockerfile-ast": "0.0.2",
|
||||
"vscode-languageserver-types": "3.5.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"dockerfile-ast": {
|
||||
"version": "0.0.2",
|
||||
"resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.2.tgz",
|
||||
"integrity": "sha1-g0U5EiTvCN8eexWRbjRqygVLTKg=",
|
||||
"requires": {
|
||||
"vscode-languageserver-types": "3.5.0"
|
||||
}
|
||||
},
|
||||
"vscode-languageserver-types": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz",
|
||||
"integrity": "sha1-5I15li8LjgLelV4/UkkI4rGcA3Q="
|
||||
}
|
||||
}
|
||||
},
|
||||
"dockerode": {
|
||||
|
|
@ -3027,45 +3079,45 @@
|
|||
}
|
||||
},
|
||||
"vscode-jsonrpc": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz",
|
||||
"integrity": "sha1-hyOdnhZrLXNSJFuKgTWXgEwdY6o="
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz",
|
||||
"integrity": "sha512-PqHHjuTlz3ks0vyZv3IkdduJReA/lqe6OP5zRl5nXn2ptMLW++fBotNyayyZEQLIF6nNrx/Rn6WhMSHElf02Yw=="
|
||||
},
|
||||
"vscode-languageclient": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.5.0.tgz",
|
||||
"integrity": "sha1-NtAswYaoNlpEZ3GaKQ+yAKmuSQo=",
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.0.tgz",
|
||||
"integrity": "sha512-wW0QguaZ11bZUclacOkCA9QjF4wzsu2hKUP62kuO1j0a1+jXcwKDtdxjyYNVki4ry8aybHPuoYpQ0eq7QVm7jQ==",
|
||||
"requires": {
|
||||
"vscode-languageserver-protocol": "3.5.0"
|
||||
"vscode-languageserver-protocol": "3.6.0"
|
||||
}
|
||||
},
|
||||
"vscode-languageserver": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0.tgz",
|
||||
"integrity": "sha1-0oCZvG3dqMHdFrcH5FThsd2uDbo=",
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz",
|
||||
"integrity": "sha512-bxj9nRadNkXYfVG/fjA5a+KA5WaJCeP1F2Tnj3rYFS0pKALZQCPNqk3KO/LdiGFidjyICMG7xoHvYO9J9xosXg==",
|
||||
"requires": {
|
||||
"vscode-languageserver-protocol": "3.5.0",
|
||||
"vscode-uri": "1.0.1"
|
||||
"vscode-languageserver-protocol": "3.6.0",
|
||||
"vscode-uri": "1.0.3"
|
||||
}
|
||||
},
|
||||
"vscode-languageserver-protocol": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz",
|
||||
"integrity": "sha1-Bnxcvidwl5U5jRGWksl+u6FFIgk=",
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz",
|
||||
"integrity": "sha512-PN5hVQQQxrtHSZR8UCstqaoI9f2H9JctFTtdIpONWjzQNurWrc48qSXXU/vTfnbSrNou8qrJgkZ4QEZsyozOMA==",
|
||||
"requires": {
|
||||
"vscode-jsonrpc": "3.5.0",
|
||||
"vscode-languageserver-types": "3.5.0"
|
||||
"vscode-jsonrpc": "3.6.0",
|
||||
"vscode-languageserver-types": "3.6.0"
|
||||
}
|
||||
},
|
||||
"vscode-languageserver-types": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz",
|
||||
"integrity": "sha1-5I15li8LjgLelV4/UkkI4rGcA3Q="
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0.tgz",
|
||||
"integrity": "sha512-GSgQtGmtza4PoNH0+iHWylWg/1sw2DODezqYWRxbN910dPchI3CQaSJN76csKcQGv55wsWgX82T6n74q8mFSpw=="
|
||||
},
|
||||
"vscode-uri": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.1.tgz",
|
||||
"integrity": "sha1-Eahr7+rDxKo+wIYjZRo8gabQu8g="
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.3.tgz",
|
||||
"integrity": "sha1-Yxvb9xbcyrDmUpGo3CXCMjIIWlI="
|
||||
},
|
||||
"winreg": {
|
||||
"version": "1.2.3",
|
||||
|
|
|
|||
|
|
@ -606,7 +606,7 @@
|
|||
"azure-arm-containerregistry": "^1.0.0-preview",
|
||||
"azure-arm-resource": "^2.0.0-preview",
|
||||
"azure-arm-website": "^1.0.0-preview",
|
||||
"dockerfile-language-server-nodejs": "^0.0.13",
|
||||
"dockerfile-language-server-nodejs": "^0.0.14",
|
||||
"dockerode": "^2.5.1",
|
||||
"gradle-to-js": "^1.0.1",
|
||||
"moment": "^2.19.3",
|
||||
|
|
@ -614,6 +614,6 @@
|
|||
"pom-parser": "^1.1.1",
|
||||
"request-promise": "^4.2.2",
|
||||
"vscode-extension-telemetry": "^0.0.6",
|
||||
"vscode-languageclient": "^3.5.0-next.4"
|
||||
"vscode-languageclient": "^4.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче