From 3510f1e793f19585b9e3bc060e354851f0dbffdb Mon Sep 17 00:00:00 2001 From: luabud Date: Wed, 21 Oct 2020 12:27:25 -0700 Subject: [PATCH 1/3] Removing dependency on pythonPath setting --- .vscode/cpx.json | 1 + .vscode/settings.json | 7 ++++++- package.json | 3 +++ src/service/setupService.ts | 15 ++++++++++++++- 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 .vscode/cpx.json diff --git a/.vscode/cpx.json b/.vscode/cpx.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/.vscode/cpx.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 0b79e8a23..3cd1b263c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,6 +5,11 @@ }, "search.exclude": { "out": true // set this to false to include "out" folder in search results - } + }, + "python.linting.pylintArgs": [ + "--init-hook", + "import sys; sys.path.extend([\"\"c:\\\\Users\\\\luabud\\\\.vscode\\\\extensions\\\\ms-python.devicesimulatorexpress-2020.0.36321\\\\out\"\",\"\"c:\\\\Users\\\\luabud\\\\.vscode\\\\extensions\\\\ms-python.devicesimulatorexpress-2020.0.36321\\\\out\\\\micropython\"\",\"\"c:\\\\Users\\\\luabud\\\\.vscode\\\\extensions\\\\ms-python.devicesimulatorexpress-2020.0.36321\\\\out\\\\clue\"\",\"\"c:\\\\Users\\\\luabud\\\\.vscode\\\\extensions\\\\ms-python.devicesimulatorexpress-2020.0.36321\\\\out\\\\base_circuitpython\"\"])" + ], + "python.pythonPath": "c:\\Users\\luabud\\.vscode\\extensions\\ms-python.devicesimulatorexpress-2020.0.36321\\venv\\Scripts\\python.exe" // Turn off tsc task auto detection since we have the necessary tasks as npm scripts } diff --git a/package.json b/package.json index a0f2375df..cf34e246e 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,9 @@ "publisher": "__PUBLISHER__", "instrumentationKey": "__AIKEY__", "icon": "assets/icon.png", + "featureFlags": { + "usingNewPythonInterpreterPathApi": true + }, "engines": { "vscode": "^1.43.0" }, diff --git a/src/service/setupService.ts b/src/service/setupService.ts index 04c757a72..d80b043dd 100644 --- a/src/service/setupService.ts +++ b/src/service/setupService.ts @@ -171,7 +171,20 @@ export class SetupService { : GLOBAL_ENV_VARS.PYTHON; // try to get name from interpreter try { - originalPythonExecutablePath = getConfig(CONFIG.PYTHON_PATH); + const extension = vscode.extensions.getExtension("ms-python.python"); + const usingNewInterpreterStorage = extension.packageJSON?.featureFlags?.usingNewInterpreterStorage; + if (usingNewInterpreterStorage) { + if (!extension.isActive) { + await extension.activate(); + } + const execCommand = extension.exports.settings.getExecutionDetails ? + extension.exports.settings.getExecutionDetails().execCommand : + extension.exports.settings.getExecutionCommand(); + originalPythonExecutablePath = execCommand.join(" "); + } + else { + originalPythonExecutablePath = getConfig(CONFIG.PYTHON_PATH); + } } catch (err) { originalPythonExecutablePath = systemPythonVar; } From 72c1697a6219857b0961ab6030487edbc4d4203d Mon Sep 17 00:00:00 2001 From: Luciana Abud <45497113+luabud@users.noreply.github.com> Date: Tue, 6 Apr 2021 08:56:52 -0700 Subject: [PATCH 2/3] Delete local entry from settings.json --- .vscode/settings.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3cd1b263c..ee3c3388b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,10 +6,4 @@ "search.exclude": { "out": true // set this to false to include "out" folder in search results }, - "python.linting.pylintArgs": [ - "--init-hook", - "import sys; sys.path.extend([\"\"c:\\\\Users\\\\luabud\\\\.vscode\\\\extensions\\\\ms-python.devicesimulatorexpress-2020.0.36321\\\\out\"\",\"\"c:\\\\Users\\\\luabud\\\\.vscode\\\\extensions\\\\ms-python.devicesimulatorexpress-2020.0.36321\\\\out\\\\micropython\"\",\"\"c:\\\\Users\\\\luabud\\\\.vscode\\\\extensions\\\\ms-python.devicesimulatorexpress-2020.0.36321\\\\out\\\\clue\"\",\"\"c:\\\\Users\\\\luabud\\\\.vscode\\\\extensions\\\\ms-python.devicesimulatorexpress-2020.0.36321\\\\out\\\\base_circuitpython\"\"])" - ], - "python.pythonPath": "c:\\Users\\luabud\\.vscode\\extensions\\ms-python.devicesimulatorexpress-2020.0.36321\\venv\\Scripts\\python.exe" - // Turn off tsc task auto detection since we have the necessary tasks as npm scripts } From 1465e304a42fbff0bd28b94efc13197343ce00f1 Mon Sep 17 00:00:00 2001 From: Luciana Abud <45497113+luabud@users.noreply.github.com> Date: Tue, 6 Apr 2021 08:57:35 -0700 Subject: [PATCH 3/3] Delete cpx.json --- .vscode/cpx.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .vscode/cpx.json diff --git a/.vscode/cpx.json b/.vscode/cpx.json deleted file mode 100644 index 9e26dfeeb..000000000 --- a/.vscode/cpx.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file