Fix for showing button in merge result editor (microsoft#21408) (micr…

…osoft#21409) Closes microsoft#21398
karthiknadig · Jun 13, 2023 · ddc44f2 · ddc44f2
1 parent 0a8dd5e
commit ddc44f2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1742,12 +1742,12 @@
                 {
                     "group": "Python",
                     "command": "python.createEnvironment-button",
-                    "when": "showCreateEnvButton && resourceLangId == pip-requirements && !virtualWorkspace && shellExecutionSupported && !inDiffEditor && pythonDepsNotInstalled"
+                    "when": "showCreateEnvButton && resourceLangId == pip-requirements && !virtualWorkspace && shellExecutionSupported && !inDiffEditor && !isMergeResultEditor && pythonDepsNotInstalled"
                 },
                 {
                     "group": "Python",
                     "command": "python.createEnvironment-button",
-                    "when": "showCreateEnvButton && resourceFilename == pyproject.toml && pipInstallableToml && !virtualWorkspace && shellExecutionSupported  && !inDiffEditor && pythonDepsNotInstalled"
+                    "when": "showCreateEnvButton && resourceFilename == pyproject.toml && pipInstallableToml && !virtualWorkspace && shellExecutionSupported  && !inDiffEditor && !isMergeResultEditor && pythonDepsNotInstalled"
                 }
             ],
             "editor/context": [