Running an empty cell should not put an empty cell into the int… (microsoft#6844)

joyceerhl · rchiodo · commit f55c334e4ea5 · 2019-08-06T08:10:02.000-07:00
* Do not execute or render empty code cells  submitted from editor

* Do not execute or render empty cells submitted from the input box

* Add news entry

* Code hygiene

* Use cellMatcher
diff --git a/news/2 Fixes/6839.md b/news/2 Fixes/6839.md
@@ -0,0 +1 @@
+Do not execute empty code cells or render them in the interactive window when sent from the editor or input box
diff --git a/src/client/datascience/interactive-window/interactiveWindow.ts b/src/client/datascience/interactive-window/interactiveWindow.ts
@@ -75,6 +75,7 @@ import {
     ISubmitNewCell,
     SysInfoReason
 } from './interactiveWindowTypes';
+import { CellMatcher } from '../cellMatcher';
 
 @injectable()
 export class InteractiveWindow extends WebViewHost<IInteractiveWindowMapping> implements IInteractiveWindow {
@@ -744,8 +745,15 @@ export class InteractiveWindow extends WebViewHost<IInteractiveWindowMapping> im
     }
 
     private async submitCode(code: string, file: string, line: number, id?: string, _editor?: TextEditor, debug?: boolean): Promise<boolean> {
-        traceInfo(`Submitting code for ${this.id}`);
         let result = true;
+
+        // Do not execute or render empty code cells
+        const cellMatcher = new CellMatcher(this.configService.getSettings().datascience);
+        if (cellMatcher.stripFirstMarker(code).length === 0) {
+            return result;
+        }
+
+        traceInfo(`Submitting code for ${this.id}`);
         // Start a status item
         const status = this.setStatus(localize.DataScience.executingCode());
 
diff --git a/src/client/datascience/webViewHost.ts b/src/client/datascience/webViewHost.ts
@@ -29,7 +29,7 @@ export class WebViewHost<IMapping> implements IDisposable {
     private startupStopwatch = new StopWatch();
 
     constructor(
-        @unmanaged() private configService: IConfigurationService,
+        @unmanaged() protected configService: IConfigurationService,
         @unmanaged() private provider: IWebPanelProvider,
         @unmanaged() private cssGenerator: ICodeCssGenerator,
         @unmanaged() protected themeFinder: IThemeFinder,
diff --git a/src/datascience-ui/history-react/MainPanel.tsx b/src/datascience-ui/history-react/MainPanel.tsx

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Do not execute empty code cells or render them in the interactive window when sent from the editor or input box`