Fix shift enter when cell are defined (#4541)

IanMatthewHuff · IanMatthewHuff · commit ad0fb7c89f95 · 2019-02-25T18:57:21.000-08:00
diff --git a/news/2 Fixes/4413.md b/news/2 Fixes/4413.md
@@ -0,0 +1 @@
+Fix shift enter to send selection when cells are defined.
diff --git a/package.json b/package.json
@@ -110,12 +110,12 @@
             {
                 "command": "python.datascience.execSelectionInteractive",
                 "key": "shift+enter",
-                "when": "editorFocus && editorLangId == python && !findInputFocussed && !replaceInputFocussed && python.datascience.ownsSelection && python.datascience.featureenabled"
+                "when": "editorFocus && editorHasSelection && editorLangId == python && !findInputFocussed && !replaceInputFocussed && python.datascience.ownsSelection && python.datascience.featureenabled"
             },
             {
                 "command": "python.datascience.runcurrentcelladvance",
                 "key": "shift+enter",
-                "when": "editorFocus && python.datascience.hascodecells && python.datascience.featureenabled"
+                "when": "editorFocus && !editorHasSelection && python.datascience.hascodecells && python.datascience.featureenabled"
             }
         ],
         "commands": [

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix shift enter to send selection when cells are defined.`
Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,12 @@`
`110`	`110`	`{`
`111`	`111`	`"command": "python.datascience.execSelectionInteractive",`
`112`	`112`	`"key": "shift+enter",`
`113`		`- "when": "editorFocus && editorLangId == python && !findInputFocussed && !replaceInputFocussed && python.datascience.ownsSelection && python.datascience.featureenabled"`
	`113`	`+ "when": "editorFocus && editorHasSelection && editorLangId == python && !findInputFocussed && !replaceInputFocussed && python.datascience.ownsSelection && python.datascience.featureenabled"`
`114`	`114`	`},`
`115`	`115`	`{`
`116`	`116`	`"command": "python.datascience.runcurrentcelladvance",`
`117`	`117`	`"key": "shift+enter",`
`118`		`- "when": "editorFocus && python.datascience.hascodecells && python.datascience.featureenabled"`
	`118`	`+ "when": "editorFocus && !editorHasSelection && python.datascience.hascodecells && python.datascience.featureenabled"`
`119`	`119`	`}`
`120`	`120`	`],`
`121`	`121`	`"commands": [`