cherry pick from master branch

IanMatthewHuff · IanMatthewHuff · commit 2412a589cf47 · 2019-03-22T10:54:48.000-07:00
diff --git a/news/1 Enhancements/4855.md b/news/1 Enhancements/4855.md
@@ -0,0 +1 @@
+Add "Run In Interactive" command to run the contents of a file not cell by cell. Group data science context commands in one group. Add run file command to explorer context menu.
diff --git a/package.json b/package.json
@@ -340,9 +340,14 @@
                 "title": "%python.command.python.datascience.showhistorypane.title%",
                 "category": "Python"
             },
+            {
+                "command": "python.datascience.runFileInteractive",
+                "title": "%python.command.python.datascience.runFileInteractive.title%",
+                "category": "Python"
+            },
             {
                 "command": "python.datascience.runallcells",
-                "title": "%python.command.python.datascience.runallcells.command.title%",
+                "title": "%python.command.python.datascience.runallcells.title%",
                 "category": "Python"
             },
             {
@@ -472,50 +477,55 @@
                     "command": "python.runCurrentTestFile",
                     "group": "Python"
                 },
+                {
+                    "when": "editorFocus && editorLangId == python && python.datascience.hascodecells && python.datascience.featureenabled",
+                    "command": "python.datascience.runallcells",
+                    "group": "Python2"
+                },
                 {
                     "when": "editorFocus && editorLangId == python && python.datascience.hascodecells && python.datascience.featureenabled",
                     "command": "python.datascience.runcurrentcell",
-                    "group": "Python"
+                    "group": "Python2"
                 },
                 {
                     "when": "editorFocus && editorLangId == python && python.datascience.hascodecells && python.datascience.featureenabled",
                     "command": "python.datascience.runcurrentcelladvance",
-                    "group": "Python"
+                    "group": "Python2"
                 },
                 {
-                    "command": "python.datascience.runallcells",
-                    "group": "Python",
-                    "when": "editorFocus && editorLangId == python && python.datascience.hascodecells && python.datascience.featureenabled"
+                    "command": "python.datascience.runFileInteractive",
+                    "group": "Python2",
+                    "when": "editorFocus && editorLangId == python && python.datascience.featureenabled"
                 },
                 {
                     "command": "python.datascience.runfromline",
-                    "group": "Python",
+                    "group": "Python2",
                     "when": "editorFocus && editorLangId == python && python.datascience.ownsSelection && python.datascience.featureenabled"
                 },
                 {
                     "command": "python.datascience.runtoline",
-                    "group": "Python",
+                    "group": "Python2",
                     "when": "editorFocus && editorLangId == python && python.datascience.ownsSelection && python.datascience.featureenabled"
                 },
                 {
                     "command": "python.datascience.execSelectionInteractive",
-                    "group": "Python",
+                    "group": "Python2",
                     "when": "editorFocus && editorLangId == python &&  python.datascience.featureenabled && python.datascience.ownsSelection"
                 },
                 {
                     "when": "editorFocus && editorLangId == python && resourceLangId == jupyter && python.datascience.featureenabled",
                     "command": "python.datascience.importnotebook",
-                    "group": "Python"
+                    "group": "Python3@1"
                 },
                 {
                     "when": "editorFocus && editorLangId == python && python.datascience.hascodecells && python.datascience.featureenabled",
                     "command": "python.datascience.exportfileasnotebook",
-                    "group": "Python2"
+                    "group": "Python3@2"
                 },
                 {
                     "when": "editorFocus && editorLangId == python && python.datascience.hascodecells && python.datascience.featureenabled",
                     "command": "python.datascience.exportfileandoutputasnotebook",
-                    "group": "Python2@2"
+                    "group": "Python3@3"
                 }
             ],
             "explorer/context": [
@@ -534,6 +544,11 @@
                     "command": "python.execInTerminal",
                     "group": "Python"
                 },
+                {
+                    "when": "resourceLangId == python && python.datascience.featureenabled",
+                    "command": "python.datascience.runFileInteractive",
+                    "group": "Python2"
+                },
                 {
                     "when": "resourceLangId == jupyter",
                     "command": "python.datascience.importnotebook",
@@ -594,7 +609,7 @@
                 },
                 {
                     "command": "python.datascience.runallcells",
-                    "title": "%python.command.python.datascience.runallcells.command.title%",
+                    "title": "%python.command.python.datascience.runallcells.title%",
                     "category": "Python",
                     "when": "python.datascience.featureenabled"
                 },
@@ -604,6 +619,12 @@
                     "category": "Python",
                     "when": "python.datascience.featureenabled"
                 },
+                {
+                    "command": "python.datascience.runFileInteractive",
+                    "title": "%python.command.python.datascience.runFileInteractive.title%",
+                    "category": "Python",
+                    "when": "python.datascience.featureenabled"
+                },
                 {
                     "command": "python.datascience.importnotebook",
                     "title": "%python.command.python.datascience.importnotebook.title%",
diff --git a/package.nls.json b/package.nls.json
@@ -26,7 +26,7 @@
     "python.command.python.setLinter.title": "Select Linter",
     "python.command.python.enableLinting.title": "Enable Linting",
     "python.command.python.runLinting.title": "Run Linting",
-    "python.command.python.datascience.runallcells.command.title": "Run Current File in Python Interactive window",
+    "python.command.python.datascience.runFileInteractive.title": "Run Current File in Python Interactive Window",
     "python.command.python.datascience.runallcells.title": "Run All Cells",
     "python.command.python.datascience.runallcellsabove.title": "Run Above",
     "python.command.python.datascience.runcellandallbelow.title": "Run Below",
diff --git a/package.nls.nl.json b/package.nls.nl.json
@@ -23,7 +23,6 @@
     "python.command.python.setLinter.title": "Linter selecteren",
     "python.command.python.enableLinting.title": "Linting activeren",
     "python.command.python.runLinting.title": "Linting uitvoeren",
-    "python.command.python.datascience.runallcells.command.title": "Huidige bestand in interactief Python-venster uitvoeren",
     "python.command.python.datascience.runallcells.title": "Alle cellen uitvoeren",
     "python.command.python.datascience.runcurrentcell.title": "Huidige cel uitvoeren",
     "python.command.python.datascience.runcurrentcelladvance.title": "Huidige cel uitvoeren en doorgaan",
diff --git a/package.nls.pl.json b/package.nls.pl.json
@@ -25,7 +25,6 @@
     "python.command.python.setLinter.title": "Wybierz linter",
     "python.command.python.enableLinting.title": "Włącz linting",
     "python.command.python.runLinting.title": "Uruchom linting",
-    "python.command.python.datascience.runallcells.command.title": "Uruchom bieżący plik w oknie IPythona",
     "python.command.python.datascience.runallcells.title": "Uruchom wszystkie komórki",
     "python.command.python.datascience.runcurrentcell.title": "Uruchom bieżącą komórkę",
     "python.command.python.datascience.runcurrentcelladvance.title": "Uruchom bieżące komórki i pokaż",
diff --git a/src/client/common/application/commands.ts b/src/client/common/application/commands.ts
@@ -100,4 +100,5 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
     [DSCommands.RunFromLine]: [string, number, number];
     [DSCommands.ImportNotebook]: [undefined | Uri, undefined | CommandSource];
     [DSCommands.ExportFileAsNotebook]: [undefined | Uri, undefined | CommandSource];
+    [DSCommands.RunFileInInteractiveWindows]: [string];
 }
diff --git a/src/client/datascience/constants.ts b/src/client/datascience/constants.ts
@@ -30,6 +30,7 @@ export namespace Commands {
     export const CollapseAllCells = 'python.datascience.collapseallcells';
     export const ExportOutputAsNotebook = 'python.datascience.exportoutputasnotebook';
     export const ExecSelectionInInteractiveWindow = 'python.datascience.execSelectionInteractive';
+    export const RunFileInInteractiveWindows = 'python.datascience.runFileInteractive';
 }
 
 export namespace EditorContexts {
@@ -90,7 +91,8 @@ export enum Telemetry {
     ConnectRemoteFailedJupyter = 'DATASCIENCE.CONNECTREMOTEFAILEDJUPYTER',
     RemoteAddCode = 'DATASCIENCE.LIVESHARE.ADDCODE',
     ShiftEnterBannerShown = 'DATASCIENCE.SHIFTENTER_BANNER_SHOWN',
-    EnableInteractiveShiftEnter = 'DATASCIENCE.ENABLE_INTERACTIVE_SHIFT_ENTER'
+    EnableInteractiveShiftEnter = 'DATASCIENCE.ENABLE_INTERACTIVE_SHIFT_ENTER',
+    RunFileInteractive = 'DATASCIENCE.RUN_FILE_INTERACTIVE'
  }
 
 export namespace HelpLinks {
diff --git a/src/client/datascience/datascience.ts b/src/client/datascience/datascience.ts
@@ -74,6 +74,20 @@ export class DataScience implements IDataScience {
         }
     }
 
+    public async runFileInteractive(file: string): Promise<void> {
+        this.dataScienceSurveyBanner.showBanner().ignoreErrors();
+
+        let codeWatcher = this.getCodeWatcher(file);
+        if (!codeWatcher) {
+            codeWatcher = this.getCurrentCodeWatcher();
+        }
+        if (codeWatcher) {
+            return codeWatcher.runFileInteractive();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
     public async runAllCells(file: string): Promise<void> {
         this.dataScienceSurveyBanner.showBanner().ignoreErrors();
 
@@ -278,6 +292,8 @@ export class DataScience implements IDataScience {
         this.disposableRegistry.push(disposable);
         disposable = this.commandManager.registerCommand(Commands.RunFromLine, this.runFromLine, this);
         this.disposableRegistry.push(disposable);
+        disposable = this.commandManager.registerCommand(Commands.RunFileInInteractiveWindows, this.runFileInteractive, this);
+        this.disposableRegistry.push(disposable);
         this.commandListeners.forEach((listener: IDataScienceCommandListener) => {
             listener.register(this.commandManager);
         });
diff --git a/src/client/datascience/editor-integration/codewatcher.ts b/src/client/datascience/editor-integration/codewatcher.ts
@@ -108,14 +108,15 @@ export class CodeWatcher implements ICodeWatcher {
 
         // If there are no codelenses, just run all of the code as a single cell
         if (this.codeLenses.length === 0) {
-            if (this.document) {
-                const code = this.document.getText();
-                const activeHistory = await this.historyProvider.getOrCreateActive();
-                await activeHistory.addCode(code, this.getFileName(), 0);
-            }
+            return this.runFileInteractiveInternal();
         }
     }
 
+    @captureTelemetry(Telemetry.RunFileInteractive)
+    public async runFileInteractive() {
+        return this.runFileInteractiveInternal();
+    }
+
     // Run all cells up to the cell containing this start line and character
     @captureTelemetry(Telemetry.RunAllCellsAbove)
     public async runAllCellsAbove(stopLine: number, stopCharacter: number) {
@@ -274,6 +275,14 @@ export class CodeWatcher implements ICodeWatcher {
         }
     }
 
+    private async runFileInteractiveInternal() {
+        if (this.document) {
+            const code = this.document.getText();
+            const activeHistory = await this.historyProvider.getOrCreateActive();
+            await activeHistory.addCode(code, this.getFileName(), 0);
+        }
+    }
+
     // tslint:disable-next-line:no-any
     private handleError = (err : any) => {
         if (err instanceof JupyterInstallError) {
diff --git a/src/client/datascience/types.ts b/src/client/datascience/types.ts
@@ -179,6 +179,7 @@ export interface ICodeWatcher {
     runFromLine(targetLine: number): Promise<void>;
     runAllCellsAbove(stopLine: number, stopCharacter: number): Promise<void>;
     runCellAndAllBelow(startLine: number, startCharacter: number): Promise<void>;
+    runFileInteractive(): Promise<void>;
 }
 
 export enum CellState {
diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts
@@ -339,6 +339,7 @@ export interface IEventNamePropertyMapping {
     [Telemetry.RunCellAndAllBelow]: never | undefined;
     [Telemetry.RunCurrentCellAndAdvance]: never | undefined;
     [Telemetry.RunToLine]: never | undefined;
+    [Telemetry.RunFileInteractive]: never | undefined;
     [Telemetry.RunFromLine]: never | undefined;
     [Telemetry.SelectJupyterURI]: never | undefined;
     [Telemetry.SetJupyterURIToLocal]: never | undefined;
diff --git a/src/test/datascience/editor-integration/codewatcher.unit.test.ts b/src/test/datascience/editor-integration/codewatcher.unit.test.ts
@@ -296,6 +296,33 @@ fourth line
         document.verifyAll();
     });
 
+    test('Test the RunFileInteractive command', async () => {
+        const fileName = 'test.py';
+        const version = 1;
+        const inputText =
+`#%%
+testing1
+#%%
+testing2`; // Command tests override getText, so just need the ranges here
+        const document = createDocument(inputText, fileName, version, TypeMoq.Times.atLeastOnce(), true);
+
+        codeWatcher.setDocument(document.object);
+
+        // Set up our expected calls to add code
+        // RunFileInteractive should run the entire file in one block, not cell by cell like RunAllCells
+        activeHistory.setup(h => h.addCode(TypeMoq.It.isValue(inputText),
+                                TypeMoq.It.isValue('test.py'),
+                                TypeMoq.It.isValue(0),
+                                TypeMoq.It.isAny()
+                                )).verifiable(TypeMoq.Times.once());
+
+        await codeWatcher.runFileInteractive();
+
+        // Verify function calls
+        activeHistory.verifyAll();
+        document.verifyAll();
+    });
+
     test('Test the RunAllCells command', async () => {
         const fileName = 'test.py';
         const version = 1;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Add "Run In Interactive" command to run the contents of a file not cell by cell. Group data science context commands in one group. Add run file command to explorer context menu.`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,5 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu`
`100`	`100`	`[DSCommands.RunFromLine]: [string, number, number];`
`101`	`101`	`[DSCommands.ImportNotebook]: [undefined \| Uri, undefined \| CommandSource];`
`102`	`102`	`[DSCommands.ExportFileAsNotebook]: [undefined \| Uri, undefined \| CommandSource];`
	`103`	`+ [DSCommands.RunFileInInteractiveWindows]: [string];`
`103`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ export interface ICodeWatcher {`
`179`	`179`	`runFromLine(targetLine: number): Promise<void>;`
`180`	`180`	`runAllCellsAbove(stopLine: number, stopCharacter: number): Promise<void>;`
`181`	`181`	`runCellAndAllBelow(startLine: number, startCharacter: number): Promise<void>;`
	`182`	`+ runFileInteractive(): Promise<void>;`
`182`	`183`	`}`
`183`	`184`
`184`	`185`	`export enum CellState {`