Skip to content

Commit c9a2f24

Browse files
bschnurrbschnurr
authored
LSP version update (microsoft#12386)
1 parent 6009235 commit c9a2f24

35 files changed

+118
-84
lines changed

‎package-lock.json‎

Lines changed: 65 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"theme": "dark"
2929
},
3030
"engines": {
31-
"vscode": "^1.45.0"
31+
"vscode": "^1.46.0"
3232
},
3333
"keywords": [
3434
"python",
@@ -3128,10 +3128,10 @@
31283128
"vscode-debugadapter": "^1.28.0",
31293129
"vscode-debugprotocol": "^1.28.0",
31303130
"vscode-extension-telemetry": "0.1.4",
3131-
"vscode-jsonrpc": "^5.0.1",
3132-
"vscode-languageclient": "^6.2.0-next.2",
3133-
"vscode-languageserver": "^6.2.0-next.2",
3134-
"vscode-languageserver-protocol": "^3.16.0-next.2",
3131+
"vscode-jsonrpc": "^6.0.0-next.3",
3132+
"vscode-languageclient": "^7.0.0-next.6",
3133+
"vscode-languageserver": "^7.0.0-next.4",
3134+
"vscode-languageserver-protocol": "^3.16.0-next.5",
31353135
"vscode-tas-client": "^0.0.864",
31363136
"vsls": "^0.3.1291",
31373137
"winreg": "^1.2.4",
@@ -3212,7 +3212,7 @@
32123212
"@types/tmp": "0.0.33",
32133213
"@types/untildify": "^3.0.0",
32143214
"@types/uuid": "^3.4.3",
3215-
"@types/vscode": "^1.45.0",
3215+
"@types/vscode": "^1.46.0",
32163216
"@types/webpack-bundle-analyzer": "^2.13.0",
32173217
"@types/winreg": "^1.2.30",
32183218
"@types/ws": "^6.0.1",

‎pythonFiles/vscode_datascience_helpers/daemon/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
```javascript
44
const cp = require('child_process');
5-
const rpc = require('vscode-jsonrpc');
5+
const rpc = require('vscode-jsonrpc/node');
66
const env = {
77
PYTHONUNBUFFERED: '1',
88
PYTHONPATH: '<extension dir>/pythonFiles:<extension dir>/pythonFiles/lib/python'

‎src/client/activation/common/activatorBase.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
TextDocumentContentChangeEvent,
2323
WorkspaceEdit
2424
} from 'vscode';
25-
import * as vscodeLanguageClient from 'vscode-languageclient';
25+
import * as vscodeLanguageClient from 'vscode-languageclient/node';
2626

2727
import { injectable } from 'inversify';
2828
import { IWorkspaceService } from '../../common/application/types';

‎src/client/activation/common/analysisOptions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT License.
33
import { injectable } from 'inversify';
44
import { Disposable, Event, EventEmitter, WorkspaceFolder } from 'vscode';
5-
import { DocumentFilter, LanguageClientOptions, RevealOutputChannelOn } from 'vscode-languageclient';
5+
import { DocumentFilter, LanguageClientOptions, RevealOutputChannelOn } from 'vscode-languageclient/node';
66

77
import { PYTHON, PYTHON_LANGUAGE } from '../../common/constants';
88
import { traceDecorators } from '../../common/logger';

‎src/client/activation/languageClientMiddleware.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ import {
5656
ResolveCompletionItemSignature,
5757
ResolveDocumentLinkSignature,
5858
ResponseError
59-
} from 'vscode-languageclient';
59+
} from 'vscode-languageclient/node';
6060

61-
import { ProvideDeclarationSignature } from 'vscode-languageclient/lib/declaration';
61+
import { ProvideDeclarationSignature } from 'vscode-languageclient/lib/common/declaration';
6262
import { HiddenFilePrefix } from '../common/constants';
6363
import { CollectLSRequestTiming, CollectNodeLSRequestTiming } from '../common/experiments/groups';
6464
import { IConfigurationService, IExperimentsManager, IPythonExtensionBanner } from '../common/types';

‎src/client/activation/languageServer/analysisOptions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { inject, injectable } from 'inversify';
44
import * as path from 'path';
55
import { ConfigurationChangeEvent, WorkspaceFolder } from 'vscode';
6-
import { DocumentFilter } from 'vscode-languageclient';
6+
import { DocumentFilter } from 'vscode-languageclient/node';
77

88
import { IWorkspaceService } from '../../common/application/types';
99
import { traceDecorators, traceError } from '../../common/logger';

‎src/client/activation/languageServer/languageClientFactory.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { inject, injectable, unmanaged } from 'inversify';
55
import * as path from 'path';
6-
import { LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient';
6+
import { LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient/node';
77

88
import { EXTENSION_ROOT_DIR, PYTHON_LANGUAGE } from '../../common/constants';
99
import { IConfigurationService, Resource } from '../../common/types';
@@ -40,7 +40,7 @@ export class DotNetDownloadedLanguageClientFactory implements ILanguageClientFac
4040
run: { command: serverModule, args: [], options },
4141
debug: { command: serverModule, args: ['--debug'], options }
4242
};
43-
const vscodeLanguageClient = require('vscode-languageclient') as typeof import('vscode-languageclient');
43+
const vscodeLanguageClient = require('vscode-languageclient/node') as typeof import('vscode-languageclient/node');
4444
return new vscodeLanguageClient.LanguageClient(
4545
PYTHON_LANGUAGE,
4646
languageClientName,
@@ -69,7 +69,7 @@ export class DotNetSimpleLanguageClientFactory implements ILanguageClientFactory
6969
run: { command: dotNetCommand, args: [serverModule], options },
7070
debug: { command: dotNetCommand, args: [serverModule, '--debug'], options }
7171
};
72-
const vscodeLanguageClient = require('vscode-languageclient') as typeof import('vscode-languageclient');
72+
const vscodeLanguageClient = require('vscode-languageclient/node') as typeof import('vscode-languageclient/node');
7373
return new vscodeLanguageClient.LanguageClient(
7474
PYTHON_LANGUAGE,
7575
languageClientName,

‎src/client/activation/languageServer/languageServerProxy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import '../../common/extensions';
44

55
import { inject, injectable } from 'inversify';
6-
import { Disposable, LanguageClient, LanguageClientOptions } from 'vscode-languageclient';
6+
import { Disposable, LanguageClient, LanguageClientOptions } from 'vscode-languageclient/node';
77

88
import { traceDecorators, traceError } from '../../common/logger';
99
import { IConfigurationService, Resource } from '../../common/types';

‎src/client/activation/node/activator.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33
import { inject, injectable } from 'inversify';
4-
54
import { CancellationToken, CompletionItem, ProviderResult } from 'vscode';
6-
import * as vscodeLanguageClient from 'vscode-languageclient';
75
// tslint:disable-next-line: import-name
8-
import ProtocolCompletionItem from 'vscode-languageclient/lib/protocolCompletionItem';
6+
import ProtocolCompletionItem from 'vscode-languageclient/lib/common/protocolCompletionItem';
7+
import { CompletionResolveRequest } from 'vscode-languageclient/node';
98
import { IWorkspaceService } from '../../common/application/types';
109
import { traceDecorators } from '../../common/logger';
1110
import { IFileSystem } from '../../common/platform/types';
@@ -56,11 +55,7 @@ export class NodeLanguageServerActivator extends LanguageServerActivatorBase {
5655
Object.assign(protoItem, item);
5756

5857
const args = languageClient.code2ProtocolConverter.asCompletionItem(protoItem);
59-
const result = await languageClient.sendRequest(
60-
vscodeLanguageClient.CompletionResolveRequest.type,
61-
args,
62-
token
63-
);
58+
const result = await languageClient.sendRequest(CompletionResolveRequest.type, args, token);
6459

6560
if (result) {
6661
return languageClient.protocol2CodeConverter.asCompletionItem(result);

0 commit comments

Comments
 (0)