Skip to content

Commit 98f5b49

Browse files
joyceerhljoyceerhl
authored
Fix when clauses for new interactive cell shortcuts (microsoft#13273)
1 parent fdc7d7b commit 98f5b49

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,73 +1080,73 @@
10801080
"command": "python.datascience.insertCellBelowPosition",
10811081
"title": "%python.command.python.datascience.insertCellBelowPosition.title%",
10821082
"category": "Python",
1083-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1083+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
10841084
},
10851085
{
10861086
"command": "python.datascience.insertCellBelow",
10871087
"title": "%python.command.python.datascience.insertCellBelow.title%",
10881088
"category": "Python",
1089-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1089+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
10901090
},
10911091
{
10921092
"command": "python.datascience.insertCellAbove",
10931093
"title": "%python.command.python.datascience.insertCellAbove.title%",
10941094
"category": "Python",
1095-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1095+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
10961096
},
10971097
{
10981098
"command": "python.datascience.deleteCells",
10991099
"title": "%python.command.python.datascience.deleteCells.title%",
11001100
"category": "Python",
1101-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1101+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
11021102
},
11031103
{
11041104
"command": "python.datascience.selectCell",
11051105
"title": "%python.command.python.datascience.selectCell.title%",
11061106
"category": "Python",
1107-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1107+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
11081108
},
11091109
{
11101110
"command": "python.datascience.selectCellContents",
11111111
"title": "%python.command.python.datascience.selectCellContents.title%",
11121112
"category": "Python",
1113-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1113+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
11141114
},
11151115
{
11161116
"command": "python.datascience.extendSelectionByCellAbove",
11171117
"title": "%python.command.python.datascience.extendSelectionByCellAbove.title%",
11181118
"category": "Python",
1119-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1119+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
11201120
},
11211121
{
11221122
"command": "python.datascience.extendSelectionByCellBelow",
11231123
"title": "%python.command.python.datascience.extendSelectionByCellBelow.title%",
11241124
"category": "Python",
1125-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1125+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
11261126
},
11271127
{
11281128
"command": "python.datascience.moveCellsUp",
11291129
"title": "%python.command.python.datascience.moveCellsUp.title%",
11301130
"category": "Python",
1131-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1131+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
11321132
},
11331133
{
11341134
"command": "python.datascience.moveCellsDown",
11351135
"title": "%python.command.python.datascience.moveCellsDown.title%",
11361136
"category": "Python",
1137-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1137+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
11381138
},
11391139
{
11401140
"command": "python.datascience.changeCellToMarkdown",
11411141
"title": "%python.command.python.datascience.changeCellToMarkdown.title%",
11421142
"category": "Python",
1143-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1143+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
11441144
},
11451145
{
11461146
"command": "python.datascience.changeCellToCode",
11471147
"title": "%python.command.python.datascience.changeCellToCode.title%",
11481148
"category": "Python",
1149-
"when": "python.datascience.hascodecells && editorFocus && editorLangId == python && python.datascience.featureenabled"
1149+
"when": "python.datascience.hascodecells && python.datascience.featureenabled && !notebookEditorFocused"
11501150
},
11511151
{
11521152
"command": "python.datascience.runcurrentcell",
@@ -3685,4 +3685,4 @@
36853685
"publisherDisplayName": "Microsoft",
36863686
"publisherId": "998b010b-e2af-44a5-a6cd-0b5fd3b9b6f8"
36873687
}
3688-
}
3688+
}

‎package.nls.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@
446446
"downloading.file.progress": "{0}{1} of {2} KB ({3}%)",
447447
"DataScience.jupyterDataRateExceeded": "Cannot view variable because data rate exceeded. Please restart your server with a higher data rate limit. For example, --NotebookApp.iopub_data_rate_limit=10000000000.0",
448448
"DataScience.addCellBelowCommandTitle": "Add cell",
449-
"DataScience.debugCellCommandTitle": "Debug cell",
449+
"DataScience.debugCellCommandTitle": "Debug Cell",
450450
"DataScience.debugStepOverCommandTitle": "Step over",
451451
"DataScience.debugContinueCommandTitle": "Continue",
452452
"DataScience.debugStopCommandTitle": "Stop",

‎src/client/common/utils/localize.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ export namespace DataScience {
787787
'Cannot view variable because data rate exceeded. Please restart your server with a higher data rate limit. For example, --NotebookApp.iopub_data_rate_limit=10000000000.0'
788788
);
789789
export const addCellBelowCommandTitle = localize('DataScience.addCellBelowCommandTitle', 'Add cell');
790-
export const debugCellCommandTitle = localize('DataScience.debugCellCommandTitle', 'Debug cell');
790+
export const debugCellCommandTitle = localize('DataScience.debugCellCommandTitle', 'Debug Cell');
791791
export const debugStepOverCommandTitle = localize('DataScience.debugStepOverCommandTitle', 'Step over');
792792
export const debugContinueCommandTitle = localize('DataScience.debugContinueCommandTitle', 'Continue');
793793
export const debugStopCommandTitle = localize('DataScience.debugStopCommandTitle', 'Stop');

0 commit comments

Comments
 (0)