Skip to content

Commit f86ad52

Browse files
committed
if pylance support its own client, just use that.
1 parent a6a08ee commit f86ad52

File tree

5 files changed

+1
-13
lines changed

5 files changed

+1
-13
lines changed

package.json

-6
Original file line numberDiff line numberDiff line change
@@ -926,12 +926,6 @@
926926
"description": "%python.pylanceLspNotebooksEnabled.description%",
927927
"scope": "machine"
928928
},
929-
"python.pylanceLspClientEnabled": {
930-
"type": "boolean",
931-
"default": false,
932-
"description": "%python.pylanceLspClientEnabled.description%",
933-
"scope": "machine"
934-
},
935929
"python.sortImports.args": {
936930
"default": [],
937931
"description": "%python.sortImports.args.description%",

package.nls.json

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
"python.pipenvPath.description": "Path to the pipenv executable to use for activation.",
9696
"python.poetryPath.description": "Path to the poetry executable.",
9797
"python.pylanceLspNotebooksEnabled.description": "Determines if Pylance's experimental LSP notebooks support is used or not.",
98-
"python.pylanceLspClientEnabled.description": "Determines if Pylance's experimental LSP client support is used or not.",
9998
"python.sortImports.args.description": "Arguments passed in. Each argument is a separate item in the array.",
10099
"python.sortImports.path.description": "Path to isort script, default using inner version",
101100
"python.tensorBoard.logDirectory.description": "Set this setting to your preferred TensorBoard log directory to skip log directory prompt when starting TensorBoard.",

src/client/activation/node/languageServerProxy.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ export class NodeLanguageServerProxy implements ILanguageServerProxy {
108108
const extension = await this.getPylanceExtension();
109109
this.lsVersion = extension?.packageJSON.version || '0';
110110

111-
const usePylanceClient = this.configurationService.getSettings().pylanceLspClientEnabled;
112-
if (usePylanceClient && extension && (extension.exports as PylanceApi).startClient) {
111+
if (extension && (extension.exports as PylanceApi).startClient) {
113112
this.pylanceApi = extension.exports as PylanceApi;
114113
await this.pylanceApi.startClient!();
115114
} else {

src/client/common/configSettings.ts

-3
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ export class PythonSettings implements IPythonSettings {
124124

125125
public pylanceLspNotebooksEnabled = false;
126126

127-
public pylanceLspClientEnabled = false;
128-
129127
public experiments!: IExperiments;
130128

131129
public languageServer: LanguageServerType = LanguageServerType.Node;
@@ -316,7 +314,6 @@ export class PythonSettings implements IPythonSettings {
316314

317315
this.globalModuleInstallation = pythonSettings.get<boolean>('globalModuleInstallation') === true;
318316
this.pylanceLspNotebooksEnabled = pythonSettings.get<boolean>('pylanceLspNotebooksEnabled') === true;
319-
this.pylanceLspClientEnabled = pythonSettings.get<boolean>('pylanceLspClientEnabled') === true;
320317

321318
const sortImportSettings = systemVariables.resolveAny(pythonSettings.get<ISortImportSettings>('sortImports'))!;
322319
if (this.sortImports) {

src/client/common/types.ts

-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ export interface IPythonSettings {
197197
readonly envFile: string;
198198
readonly globalModuleInstallation: boolean;
199199
readonly pylanceLspNotebooksEnabled: boolean;
200-
readonly pylanceLspClientEnabled: boolean;
201200
readonly experiments: IExperiments;
202201
readonly languageServer: LanguageServerType;
203202
readonly languageServerIsDefault: boolean;

0 commit comments

Comments
 (0)