From 840be41d2c52a482bac87c9d36186e4d9a33aead Mon Sep 17 00:00:00 2001 From: ChaseKnowlden Date: Sat, 29 Oct 2022 11:13:33 -0400 Subject: [PATCH 1/2] :sparkles: Merge with main --- package.json | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index f47c984833cb..c2e380f15159 100644 --- a/package.json +++ b/package.json @@ -1614,87 +1614,87 @@ "category": "Python", "command": "python.analysis.restartLanguageServer", "title": "%python.command.python.analysis.restartLanguageServer.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.clearCacheAndReload", "title": "%python.command.python.clearCacheAndReload.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.clearWorkspaceInterpreter", "title": "%python.command.python.clearWorkspaceInterpreter.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.configureTests", "title": "%python.command.python.configureTests.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.createEnvironment", "title": "%python.command.python.createEnvironment.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.createTerminal", "title": "%python.command.python.createTerminal.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.enableLinting", "title": "%python.command.python.enableLinting.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.enableSourceMapSupport", "title": "%python.command.python.enableSourceMapSupport.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.execInTerminal", "title": "%python.command.python.execInTerminal.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.execInTerminal-icon", "icon": "$(play)", "title": "%python.command.python.execInTerminalIcon.title%", - "when": "false" + "when": "false && editorLangId == python" }, { "category": "Python", "command": "python.debugInTerminal", "icon": "$(debug-alt)", "title": "%python.command.python.debugInTerminal.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.execSelectionInDjangoShell", "title": "%python.command.python.execSelectionInDjangoShell.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.execSelectionInTerminal", "title": "%python.command.python.execSelectionInTerminal.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.launchTensorBoard", "title": "%python.command.python.launchTensorBoard.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", @@ -1702,63 +1702,63 @@ "enablement": "python.hasActiveTensorBoardSession", "icon": "$(refresh)", "title": "%python.command.python.refreshTensorBoard.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.reportIssue", "title": "%python.command.python.reportIssue.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Test", "command": "testing.reRunFailTests", "icon": "$(run-errors)", "title": "%python.command.testing.rerunFailedTests.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.runLinting", "title": "%python.command.python.runLinting.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.setInterpreter", "title": "%python.command.python.setInterpreter.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.setLinter", "title": "%python.command.python.setLinter.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python Refactor", "command": "python.sortImports", "title": "%python.command.python.sortImports.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.startREPL", "title": "%python.command.python.startREPL.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.viewLanguageServerOutput", "enablement": "python.hasLanguageServerOutputChannel", "title": "%python.command.python.viewLanguageServerOutput.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" }, { "category": "Python", "command": "python.viewOutput", "title": "%python.command.python.viewOutput.title%", - "when": "!virtualWorkspace && shellExecutionSupported" + "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" } ], "editor/context": [ From b66c1b29364d196a4f4027d2f9a1878a6eec46b2 Mon Sep 17 00:00:00 2001 From: ChaseKnowlden Date: Fri, 21 Oct 2022 18:18:11 -0400 Subject: [PATCH 2/2] Update commands --- package.json | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index c2e380f15159..2f34c45b6ebb 100644 --- a/package.json +++ b/package.json @@ -63,28 +63,19 @@ "onLanguage:python", "onDebugDynamicConfigurations:python", "onDebugResolve:python", - "onCommand:python.execInTerminal", - "onCommand:python.debugInTerminal", - "onCommand:python.sortImports", "onCommand:python.setInterpreter", - "onCommand:python.setShebangInterpreter", "onCommand:python.viewLanguageServerOutput", "onCommand:python.viewOutput", - "onCommand:python.execSelectionInTerminal", - "onCommand:python.execSelectionInDjangoShell", "onCommand:python.startREPL", - "onCommand:python.goToPythonObject", - "onCommand:python.reportIssue", - "onCommand:python.setLinter", - "onCommand:python.enableLinting", "onCommand:python.createTerminal", "onCommand:python.configureTests", - "onCommand:python.clearWorkspaceInterpreter", "onCommand:python.enableSourceMapSupport", "onCommand:python.launchTensorBoard", "onCommand:python.clearCacheAndReload", "onCommand:python.createEnvironment", "onCommand:python.createNewFile", + "onCommand:python.refreshTensorBoard", + "onCommand:testing.reRunFailTests", "onWalkthrough:pythonWelcome", "onWalkthrough:pythonWelcomeWithEnv", "onWalkthrough:pythonWelcomeWithDS", @@ -1620,7 +1611,7 @@ "category": "Python", "command": "python.clearCacheAndReload", "title": "%python.command.python.clearCacheAndReload.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", @@ -1632,19 +1623,19 @@ "category": "Python", "command": "python.configureTests", "title": "%python.command.python.configureTests.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", "command": "python.createEnvironment", "title": "%python.command.python.createEnvironment.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", "command": "python.createTerminal", "title": "%python.command.python.createTerminal.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", @@ -1656,7 +1647,7 @@ "category": "Python", "command": "python.enableSourceMapSupport", "title": "%python.command.python.enableSourceMapSupport.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", @@ -1694,7 +1685,7 @@ "category": "Python", "command": "python.launchTensorBoard", "title": "%python.command.python.launchTensorBoard.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", @@ -1702,7 +1693,7 @@ "enablement": "python.hasActiveTensorBoardSession", "icon": "$(refresh)", "title": "%python.command.python.refreshTensorBoard.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", @@ -1715,7 +1706,7 @@ "command": "testing.reRunFailTests", "icon": "$(run-errors)", "title": "%python.command.testing.rerunFailedTests.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", @@ -1727,7 +1718,7 @@ "category": "Python", "command": "python.setInterpreter", "title": "%python.command.python.setInterpreter.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", @@ -1745,20 +1736,20 @@ "category": "Python", "command": "python.startREPL", "title": "%python.command.python.startREPL.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", "command": "python.viewLanguageServerOutput", "enablement": "python.hasLanguageServerOutputChannel", "title": "%python.command.python.viewLanguageServerOutput.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" }, { "category": "Python", "command": "python.viewOutput", "title": "%python.command.python.viewOutput.title%", - "when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python" + "when": "!virtualWorkspace && shellExecutionSupported" } ], "editor/context": [