Skip to content

Commit ef47d38

Browse files
author
David Kutugata
authored
Changed the name of the setting 'Run Magic Commands' (#7163)
to 'Run Startup Commands' to avoid confusion.
1 parent 39cf9e0 commit ef47d38

File tree

11 files changed

+12
-11
lines changed

11 files changed

+12
-11
lines changed

news/2 Fixes/6842.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Changed the name of the setting 'Run Magic Commands' to 'Run Startup Commands' to avoid confusion.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,7 @@
23382338
"description": "Uncomment shell assignments (#!), line magic (#!%) and cell magic (#!%%) when parsing code cells.",
23392339
"scope": "resource"
23402340
},
2341-
"python.dataScience.runMagicCommands": {
2341+
"python.dataScience.runStartupCommands": {
23422342
"type": "string",
23432343
"default": "",
23442344
"description": "A series of Python instructions that will be executed when the interactive window loads.",

src/client/common/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ export interface IDataScienceSettings {
341341
remoteDebuggerPort?: number;
342342
colorizeInputBox?: boolean;
343343
addGotoCodeLenses?: boolean;
344-
runMagicCommands: string;
344+
runStartupCommands: string;
345345
debugJustMyCode: boolean;
346346
}
347347

src/client/datascience/interactive-window/interactiveWindow.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ export class InteractiveWindow extends WebViewHost<IInteractiveWindowMapping> im
149149
this.loadPromise = this.load();
150150

151151
const settings = this.configuration.getSettings();
152-
if (settings.datascience.runMagicCommands) {
153-
this.addCode(settings.datascience.runMagicCommands, Identifiers.EmptyFileName, 0).ignoreErrors();
152+
if (settings.datascience.runStartupCommands) {
153+
this.addCode(settings.datascience.runStartupCommands, Identifiers.EmptyFileName, 0).ignoreErrors();
154154
}
155155

156156
// For each listener sign up for their post events

src/datascience-ui/react-common/settingsReactSide.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function load() {
7373
wordBasedSuggestions: true,
7474
parameterHintsEnabled: true
7575
},
76-
runMagicCommands: '',
76+
runStartupCommands: '',
7777
debugJustMyCode: true
7878
};
7979
}

src/test/datascience/color.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ suite('Theme colors', () => {
7070
codeRegularExpression: '^(#\\s*%%|#\\s*\\<codecell\\>|#\\s*In\\[\\d*?\\]|#\\s*In\\[ \\])',
7171
markdownRegularExpression: '^(#\\s*%%\\s*\\[markdown\\]|#\\s*\\<markdowncell\\>)',
7272
enablePlotViewer: true,
73-
runMagicCommands: '',
73+
runStartupCommands: '',
7474
debugJustMyCode: true
7575
};
7676
configService = TypeMoq.Mock.ofType<IConfigurationService>();

src/test/datascience/dataScienceIocContainer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ export class DataScienceIocContainer extends UnitTestIocContainer {
432432
stopOnError: true,
433433
addGotoCodeLenses: true,
434434
enableCellCodeLens: true,
435-
runMagicCommands: '',
435+
runStartupCommands: '',
436436
debugJustMyCode: true
437437
};
438438

src/test/datascience/editor-integration/codewatcher.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ suite('DataScience Code Watcher Unit Tests', () => {
9292
markdownRegularExpression: '^(#\\s*%%\\s*\\[markdown\\]|#\\s*\\<markdowncell\\>)',
9393
enableCellCodeLens: true,
9494
enablePlotViewer: true,
95-
runMagicCommands: '',
95+
runStartupCommands: '',
9696
debugJustMyCode: true
9797
};
9898
debugService.setup(d => d.activeDebugSession).returns(() => undefined);

src/test/datascience/execution.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ suite('Jupyter Execution', async () => {
558558
markdownRegularExpression: '^(#\\s*%%\\s*\\[markdown\\]|#\\s*\\<markdowncell\\>)',
559559
allowLiveShare: false,
560560
enablePlotViewer: true,
561-
runMagicCommands: '',
561+
runStartupCommands: '',
562562
debugJustMyCode: true
563563
};
564564

src/test/datascience/interactiveWindowCommandListener.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ suite('Interactive window command listener', async () => {
151151
markdownRegularExpression: '^(#\\s*%%\\s*\\[markdown\\]|#\\s*\\<markdowncell\\>)',
152152
autoPreviewNotebooksInInteractivePane: true,
153153
enablePlotViewer: true,
154-
runMagicCommands: '',
154+
runStartupCommands: '',
155155
debugJustMyCode: true
156156
};
157157

0 commit comments

Comments
 (0)