From f11d7e9d20c390ca75d72df61efbc451ebc1f4b1 Mon Sep 17 00:00:00 2001 From: HeeJae Chang Date: Wed, 5 Oct 2022 16:43:51 -0700 Subject: [PATCH 1/2] removed old notebook experiment option that is no longer used. --- package.json | 6 ------ package.nls.json | 1 - src/client/activation/node/lspNotebooksExperiment.ts | 2 +- src/client/common/configSettings.ts | 3 --- src/client/common/types.ts | 1 - 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/package.json b/package.json index a9de3c576e58..a7a7cf73ba71 100644 --- a/package.json +++ b/package.json @@ -920,12 +920,6 @@ "scope": "machine-overridable", "type": "string" }, - "python.pylanceLspNotebooksEnabled": { - "type": "boolean", - "default": true, - "description": "%python.pylanceLspNotebooksEnabled.description%", - "scope": "machine" - }, "python.sortImports.args": { "default": [], "description": "%python.sortImports.args.description%", diff --git a/package.nls.json b/package.nls.json index 7a39d545fab6..7dbd2b942c6a 100644 --- a/package.nls.json +++ b/package.nls.json @@ -94,7 +94,6 @@ "python.logging.level.description": "The logging level the extension logs at, defaults to 'error'", "python.pipenvPath.description": "Path to the pipenv executable to use for activation.", "python.poetryPath.description": "Path to the poetry executable.", - "python.pylanceLspNotebooksEnabled.description": "Determines if Pylance's experimental LSP notebooks support is used or not.", "python.sortImports.args.description": "Arguments passed in. Each argument is a separate item in the array.", "python.sortImports.path.description": "Path to isort script, default using inner version", "python.tensorBoard.logDirectory.description": "Set this setting to your preferred TensorBoard log directory to skip log directory prompt when starting TensorBoard.", diff --git a/src/client/activation/node/lspNotebooksExperiment.ts b/src/client/activation/node/lspNotebooksExperiment.ts index 7cadc1044a2b..d469cfb112df 100644 --- a/src/client/activation/node/lspNotebooksExperiment.ts +++ b/src/client/activation/node/lspNotebooksExperiment.ts @@ -68,7 +68,7 @@ export class LspNotebooksExperiment implements IExtensionSingleActivationService private updateExperimentSupport(): void { const wasInExperiment = this.isInExperiment; - const isInTreatmentGroup = this.configurationService.getSettings().pylanceLspNotebooksEnabled; + const isInTreatmentGroup = true; const languageServerType = this.configurationService.getSettings().languageServer; this.isInExperiment = false; diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts index 52ed1cbeda79..93a3f631c67a 100644 --- a/src/client/common/configSettings.ts +++ b/src/client/common/configSettings.ts @@ -122,8 +122,6 @@ export class PythonSettings implements IPythonSettings { public globalModuleInstallation = false; - public pylanceLspNotebooksEnabled = false; - public experiments!: IExperiments; public languageServer: LanguageServerType = LanguageServerType.Node; @@ -313,7 +311,6 @@ export class PythonSettings implements IPythonSettings { } this.globalModuleInstallation = pythonSettings.get('globalModuleInstallation') === true; - this.pylanceLspNotebooksEnabled = pythonSettings.get('pylanceLspNotebooksEnabled') === true; const sortImportSettings = systemVariables.resolveAny(pythonSettings.get('sortImports'))!; if (this.sortImports) { diff --git a/src/client/common/types.ts b/src/client/common/types.ts index 66c91b13444d..18b6e1481746 100644 --- a/src/client/common/types.ts +++ b/src/client/common/types.ts @@ -196,7 +196,6 @@ export interface IPythonSettings { readonly sortImports: ISortImportSettings; readonly envFile: string; readonly globalModuleInstallation: boolean; - readonly pylanceLspNotebooksEnabled: boolean; readonly experiments: IExperiments; readonly languageServer: LanguageServerType; readonly languageServerIsDefault: boolean; From 572c738217887380110273560b001cc1667c32cf Mon Sep 17 00:00:00 2001 From: HeeJae Chang Date: Wed, 5 Oct 2022 17:21:17 -0700 Subject: [PATCH 2/2] updated middleware version --- package-lock.json | 54 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b831b0cbe4f..0ea2f8c850e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@vscode/extension-telemetry": "^0.6.2", - "@vscode/jupyter-lsp-middleware": "^0.2.46", + "@vscode/jupyter-lsp-middleware": "^0.2.50", "arch": "^2.1.0", "diff-match-patch": "^1.0.0", "fs-extra": "^10.0.1", @@ -1107,15 +1107,15 @@ } }, "node_modules/@vscode/jupyter-lsp-middleware": { - "version": "0.2.46", - "resolved": "https://registry.npmjs.org/@vscode/jupyter-lsp-middleware/-/jupyter-lsp-middleware-0.2.46.tgz", - "integrity": "sha512-xP7E8YwdwS9+pCdLaoZcvtWy6vJpuCIN990IgVjKRrGAqwpJzSojuZs1Lai7YYkOqWYfa1xjsNfZ+kw3N2gzlw==", + "version": "0.2.50", + "resolved": "https://registry.npmjs.org/@vscode/jupyter-lsp-middleware/-/jupyter-lsp-middleware-0.2.50.tgz", + "integrity": "sha512-oOEpRZOJdKjByRMkUDVdGlQDiEO4/Mjr88u5zqktaS/4h0NtX8Hk6+HNQwENp4ur3Dpu47gD8wOTCrkOWzbHlA==", "dependencies": { - "@vscode/lsp-notebook-concat": "^0.1.13", + "@vscode/lsp-notebook-concat": "^0.1.16", "fast-myers-diff": "^3.0.1", "sha.js": "^2.4.11", - "vscode-languageclient": "^8.0.2-next.3", - "vscode-languageserver-protocol": "^3.17.2-next.3", + "vscode-languageclient": "^8.0.2-next.4", + "vscode-languageserver-protocol": "^3.17.2-next.5", "vscode-uri": "^3.0.2" }, "engines": { @@ -1123,12 +1123,12 @@ } }, "node_modules/@vscode/lsp-notebook-concat": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/@vscode/lsp-notebook-concat/-/lsp-notebook-concat-0.1.13.tgz", - "integrity": "sha512-+w5AAYMc/lC3kKagLWuH0t+/0at24Fm3SsksKfWeKRH/Mg4SQC5TNv5xy3SS8nDeyxB0JIx0vp6WXmu+PUz4tA==", + "version": "0.1.16", + "resolved": "https://registry.npmjs.org/@vscode/lsp-notebook-concat/-/lsp-notebook-concat-0.1.16.tgz", + "integrity": "sha512-jN2ut22GR/xelxHx2W9U+uZoylHGCezsNmsMYn20LgVHTcJMGL+4bL5PJeh63yo6P5XjAPtoeeymvp5EafJV+w==", "dependencies": { "object-hash": "^3.0.0", - "vscode-languageserver-protocol": "^3.17.2-next.3", + "vscode-languageserver-protocol": "^3.17.2-next.5", "vscode-uri": "^3.0.2" } }, @@ -14601,9 +14601,9 @@ } }, "node_modules/vscode-uri": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz", - "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==" + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz", + "integrity": "sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==" }, "node_modules/watchpack": { "version": "2.3.1", @@ -16174,25 +16174,25 @@ } }, "@vscode/jupyter-lsp-middleware": { - "version": "0.2.46", - "resolved": "https://registry.npmjs.org/@vscode/jupyter-lsp-middleware/-/jupyter-lsp-middleware-0.2.46.tgz", - "integrity": "sha512-xP7E8YwdwS9+pCdLaoZcvtWy6vJpuCIN990IgVjKRrGAqwpJzSojuZs1Lai7YYkOqWYfa1xjsNfZ+kw3N2gzlw==", + "version": "0.2.50", + "resolved": "https://registry.npmjs.org/@vscode/jupyter-lsp-middleware/-/jupyter-lsp-middleware-0.2.50.tgz", + "integrity": "sha512-oOEpRZOJdKjByRMkUDVdGlQDiEO4/Mjr88u5zqktaS/4h0NtX8Hk6+HNQwENp4ur3Dpu47gD8wOTCrkOWzbHlA==", "requires": { - "@vscode/lsp-notebook-concat": "^0.1.13", + "@vscode/lsp-notebook-concat": "^0.1.16", "fast-myers-diff": "^3.0.1", "sha.js": "^2.4.11", - "vscode-languageclient": "^8.0.2-next.3", - "vscode-languageserver-protocol": "^3.17.2-next.3", + "vscode-languageclient": "^8.0.2-next.4", + "vscode-languageserver-protocol": "^3.17.2-next.5", "vscode-uri": "^3.0.2" } }, "@vscode/lsp-notebook-concat": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/@vscode/lsp-notebook-concat/-/lsp-notebook-concat-0.1.13.tgz", - "integrity": "sha512-+w5AAYMc/lC3kKagLWuH0t+/0at24Fm3SsksKfWeKRH/Mg4SQC5TNv5xy3SS8nDeyxB0JIx0vp6WXmu+PUz4tA==", + "version": "0.1.16", + "resolved": "https://registry.npmjs.org/@vscode/lsp-notebook-concat/-/lsp-notebook-concat-0.1.16.tgz", + "integrity": "sha512-jN2ut22GR/xelxHx2W9U+uZoylHGCezsNmsMYn20LgVHTcJMGL+4bL5PJeh63yo6P5XjAPtoeeymvp5EafJV+w==", "requires": { "object-hash": "^3.0.0", - "vscode-languageserver-protocol": "^3.17.2-next.3", + "vscode-languageserver-protocol": "^3.17.2-next.5", "vscode-uri": "^3.0.2" } }, @@ -26853,9 +26853,9 @@ } }, "vscode-uri": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz", - "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==" + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz", + "integrity": "sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==" }, "watchpack": { "version": "2.3.1", diff --git a/package.json b/package.json index a7a7cf73ba71..e2a157fc37cf 100644 --- a/package.json +++ b/package.json @@ -1791,7 +1791,7 @@ "webpack": "webpack" }, "dependencies": { - "@vscode/jupyter-lsp-middleware": "^0.2.46", + "@vscode/jupyter-lsp-middleware": "^0.2.50", "@vscode/extension-telemetry": "^0.6.2", "arch": "^2.1.0", "diff-match-patch": "^1.0.0",