Skip to content

Commit

Permalink
Revert "Adopt version 0.0.14 of the language server (#233)"
Browse files Browse the repository at this point in the history
This reverts commit c7e7da6.
  • Loading branch information
chrisdias committed Mar 31, 2018
1 parent f0ce598 commit d7ff884
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 94 deletions.
8 changes: 5 additions & 3 deletions dockerExtension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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, DidChangeConfigurationNotification, ConfigurationParams } from 'vscode-languageclient';
import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Middleware, Proposed, ProposedFeatures, DidChangeConfigurationNotification } 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';
Expand Down Expand Up @@ -150,7 +150,7 @@ namespace Configuration {

let configurationListener: vscode.Disposable;

export function computeConfiguration(params: ConfigurationParams): vscode.WorkspaceConfiguration[] {
export function computeConfiguration(params: Proposed.ConfigurationParams): vscode.WorkspaceConfiguration[] {
if (!params.items) {
return null;
}
Expand Down Expand Up @@ -192,7 +192,7 @@ function activateLanguageClient(ctx: vscode.ExtensionContext) {
debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
}

let middleware: Middleware = {
let middleware: ProposedFeatures.ConfigurationMiddleware | Middleware = {
workspace: {
configuration: Configuration.computeConfiguration
}
Expand All @@ -207,6 +207,8 @@ 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();
Expand Down
126 changes: 37 additions & 89 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -606,14 +606,14 @@
"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.14",
"dockerfile-language-server-nodejs": "^0.0.13",
"dockerode": "^2.5.1",
"gradle-to-js": "^1.0.1",
"moment": "^2.19.3",
"opn": "^5.1.0",
"pom-parser": "^1.1.1",
"request-promise": "^4.2.2",
"vscode-extension-telemetry": "^0.0.6",
"vscode-languageclient": "^4.0.0"
"vscode-languageclient": "^3.5.0-next.4"
}
}

0 comments on commit d7ff884

Please sign in to comment.