Merge pull request #5760 from microsoft/rchiodo/release_merge

Merge commits from master

Author: rchiodo

news/2 Fixes/5537.md

@@ -0,0 +1 @@
+Fix magics running from a python file. 

news/2 Fixes/5560.md

@@ -0,0 +1 @@
+Change scrolling to not animate to workaround async updates breaking the animation.

news/2 Fixes/5729.md

@@ -0,0 +1 @@
+Adjust input box prompt to look more an IPython console prompt.

package-lock.json

@@ -32,6 +32,11 @@ export class CellMatcher {
         return this.codeMatchRegEx.test(code);
     }
 
+    public stripMarkers(code: string) : string {
+        const lines = code.splitLines({trim: false, removeEmptyEntries: false});
+        return lines.filter(l => !this.isCode(l) && !this.isMarkdown(l)).join('\n');
+    }
+
     public exec(code: string) : string | undefined {
         let result: RegExpExecArray | null = null;
         if (this.codeMatchRegEx.test(code)) {

src/client/datascience/cellMatcher.ts

@@ -24,12 +24,13 @@ export function concatMultilineString(str: nbformat.MultilineString): string {
 }
 
 // Strip out comment lines from code
-export function stripComments(str: nbformat.MultilineString): nbformat.MultilineString {
-    if (Array.isArray(str)) {
-        return extractNonComments(str);
-    } else {
-        return extractNonComments([str]);
-    }
+export function stripComments(str: string): string {
+    let result: string = '';
+    parseForComments(
+        str.splitLines({trim: false, removeEmptyEntries: false}),
+        (_s) => noop,
+        (s) => result = result.concat(`${s}\n`));
+    return result;
 }
 
 export function formatStreamText(str: string): string {
@@ -77,6 +78,7 @@ export function generateMarkdownFromCodeLines(lines: string[]) {
     return appendLineFeed(extractComments(lines.slice(1)));
 }
 
+// tslint:disable-next-line: cyclomatic-complexity
 export function parseForComments(
     lines: string[],
     foundCommentLine: (s: string, i: number) => void,
@@ -109,15 +111,20 @@ export function parseForComments(
             }
         // Not inside either, see if starting a quote
         } else if (isMultilineQuote && !isMultilineComment) {
-            insideMultilineQuote = isMultilineQuote;
+            // Make sure doesn't begin and end on the same line.
+            const beginQuote = trim.indexOf(isMultilineQuote);
+            const endQuote = trim.lastIndexOf(isMultilineQuote);
+            insideMultilineQuote = endQuote !== beginQuote ? undefined : isMultilineQuote;
             foundNonCommentLine(l, pos);
         // Not starting a quote, might be starting a comment
         } else if (isMultilineComment) {
-            insideMultilineComment = isMultilineComment;
+            // See if this line ends the comment too or not
+            const endIndex = trim.indexOf(isMultilineComment, 3);
+            insideMultilineComment = endIndex >= 0 ? undefined : isMultilineComment;
 
             // Might end with text too
             if (trim.length > 3) {
-                foundCommentLine(trim.slice(3), pos);
+                foundCommentLine(trim.slice(3, endIndex >= 0 ? endIndex : undefined), pos);
             }
         } else {
             // Normal line
@@ -136,9 +143,3 @@ function extractComments(lines: string[]): string[] {
     parseForComments(lines, (s) => result.push(s), (_s) => noop());
     return result;
 }
-
-function extractNonComments(lines: string[]): string[] {
-    const result: string[] = [];
-    parseForComments(lines, (_s) => noop, (s) => result.push(s));
-    return result;
-}

src/client/datascience/common.ts

@@ -21,6 +21,7 @@ import { createDeferred, Deferred, sleep } from '../../common/utils/async';
 import * as localize from '../../common/utils/localize';
 import { noop } from '../../common/utils/misc';
 import { generateCells } from '../cellFactory';
+import { CellMatcher } from '../cellMatcher';
 import { concatMultilineString } from '../common';
 import { Identifiers } from '../constants';
 import {
@@ -514,10 +515,11 @@ export class JupyterServerBase implements INotebookServer {
     private generateRequest = (code: string, silent?: boolean): Kernel.IFuture | undefined => {
         //this.logger.logInformation(`Executing code in jupyter : ${code}`)
         try {
+            const cellMatcher = new CellMatcher(this.configService.getSettings().datascience);
             return this.session ? this.session.requestExecute(
                 {
-                    // Replace windows line endings with unix line endings.
-                    code: code.replace(/\r\n/g, '\n'),
+                    // Remove the cell marker if we have one.
+                    code: cellMatcher.stripMarkers(code),
                     stop_on_error: false,
                     allow_stdin: false,
                     store_history: !silent // Silent actually means don't output anything. Store_history is what affects execution_count

src/client/datascience/jupyter/jupyterServer.ts

@@ -290,6 +290,7 @@ export class MainPanel extends React.Component<IMainPanelProps, IMainPanelState>
         const errorBackgroundColor = getSettings().errorBackgroundColor;
         const actualErrorBackgroundColor = errorBackgroundColor ? errorBackgroundColor : '#FFFFFF';
         const maxTextSize = maxOutputSize && maxOutputSize < 10000 && maxOutputSize > 0 ? maxOutputSize : undefined;
+        const executionCount = this.getInputExecutionCount(this.state.cellVMs);
 
         return (
             <div className='edit-panel'>
@@ -309,6 +310,7 @@ export class MainPanel extends React.Component<IMainPanelProps, IMainPanelState>
                         ref={this.saveEditCellRef}
                         gotoCode={noop}
                         delete={noop}
+                        editExecutionCount={executionCount}
                         onCodeCreated={this.editableCodeCreated}
                         onCodeChange={this.codeChange}
                         monacoTheme={this.state.monacoTheme}

src/datascience-ui/history-react/MainPanel.tsx

@@ -21,7 +21,6 @@ import './cell.css';
 import { CellButton } from './cellButton';
 import { Code } from './code';
 import { CollapseButton } from './collapseButton';
-import { CommandPrompt } from './commandPrompt';
 import { ExecutionCount } from './executionCount';
 import { Image, ImageName } from './image';
 import { InputHistory } from './inputHistory';
@@ -41,6 +40,7 @@ interface ICellProps {
     errorBackgroundColor: string;
     monacoTheme: string | undefined;
     editorOptions: monacoEditor.editor.IEditorOptions;
+    editExecutionCount: number;
     gotoCode(): void;
     delete(): void;
     submitNewCode(code: string): void;
@@ -187,7 +187,7 @@ export class Cell extends React.Component<ICellProps> {
             return this.props.cellVM.editable ?
                 (
                     <div className='controls-div'>
-                        <CommandPrompt />
+                        <ExecutionCount isBusy={busy} count={this.props.editExecutionCount.toString()} visible={this.isCodeCell()} />
                     </div>
                 ) : (
                     <div className='controls-div'>

src/datascience-ui/history-react/cell.tsx

@@ -3,6 +3,7 @@
     position: relative;
     width:100%;
     margin-bottom:16px;
+    top: -2px; /* Account for spacing removed from the monaco editor */
 }
 
 .code-area-editable {