Fix for showing button in merge result editor (#21408) (#21409)

karthiknadig · web-flow · commit ddc44f24ecf4 · 2023-06-13T10:24:29.000-07:00
Closes #21398
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": [

Original file line number	Diff line number	Diff line change
`@@ -1742,12 +1742,12 @@`
`1742`	`1742`	`{`
`1743`	`1743`	`"group": "Python",`
`1744`	`1744`	`"command": "python.createEnvironment-button",`
`1745`		`- "when": "showCreateEnvButton && resourceLangId == pip-requirements && !virtualWorkspace && shellExecutionSupported && !inDiffEditor && pythonDepsNotInstalled"`
	`1745`	`+ "when": "showCreateEnvButton && resourceLangId == pip-requirements && !virtualWorkspace && shellExecutionSupported && !inDiffEditor && !isMergeResultEditor && pythonDepsNotInstalled"`
`1746`	`1746`	`},`
`1747`	`1747`	`{`
`1748`	`1748`	`"group": "Python",`
`1749`	`1749`	`"command": "python.createEnvironment-button",`
`1750`		`- "when": "showCreateEnvButton && resourceFilename == pyproject.toml && pipInstallableToml && !virtualWorkspace && shellExecutionSupported && !inDiffEditor && pythonDepsNotInstalled"`
	`1750`	`+ "when": "showCreateEnvButton && resourceFilename == pyproject.toml && pipInstallableToml && !virtualWorkspace && shellExecutionSupported && !inDiffEditor && !isMergeResultEditor && pythonDepsNotInstalled"`
`1751`	`1751`	`}`
`1752`	`1752`	`],`
`1753`	`1753`	`"editor/context": [`