Merge pull request #5406 from Microsoft/rchiodo/release_update

Cherry-pick two more changes into release

Author: rchiodo

news/2 Fixes/5278.md

@@ -0,0 +1 @@
+Filtered rows shows 'fetching' instead of No rows.

news/2 Fixes/5395.md

@@ -0,0 +1 @@
+Multi-dimensional arrays don't open in the data viewer.

package.nls.json

@@ -49,8 +49,8 @@
     "python.command.python.datascience.undocells.title": "Undo last Python Interactive action",
     "python.command.python.datascience.redocells.title": "Redo last Python Interactive action",
     "python.command.python.datascience.removeallcells.title": "Delete all Python Interactive cells",
-    "python.command.python.datascience.interruptkernel.title": "Interrupt iPython Kernel",
-    "python.command.python.datascience.restartkernel.title": "Restart iPython Kernel",
+    "python.command.python.datascience.interruptkernel.title": "Interrupt IPython Kernel",
+    "python.command.python.datascience.restartkernel.title": "Restart IPython Kernel",
     "python.command.python.datascience.expandallcells.title": "Expand all Python Interactive cells",
     "python.command.python.datascience.collapseallcells.title": "Collapse all Python Interactive cells",
     "python.snippet.launch.standard.label": "Python: Current File",
@@ -100,7 +100,7 @@
     "Interpreters.LoadingInterpreters": "Loading Python Interpreters",
     "Common.doNotShowAgain": "Do not show again",
     "Interpreters.environmentPromptMessage": "We noticed a new virtual environment has been created. Do you want to select it for the workspace folder?",
-    "DataScience.restartKernelMessage": "Do you want to restart the iPython kernel? All variables will be lost.",
+    "DataScience.restartKernelMessage": "Do you want to restart the IPython kernel? All variables will be lost.",
     "DataScience.restartKernelMessageYes": "Restart",
     "DataScience.restartKernelMessageNo": "Cancel",
     "DataScience.restartingKernelFailed": "Kernel restart failed. Jupyter server is hung. Please reload VS Code.",
@@ -111,12 +111,12 @@
     "InteractiveShiftEnterBanner.bannerMessage": "Would you like to run code in the 'Python Interactive' window (an IPython console) for 'shift-enter'? Select 'No' to continue to run code in the Python Terminal. This can be changed later in settings.",
     "InteractiveShiftEnterBanner.bannerLabelYes": "Yes",
     "InteractiveShiftEnterBanner.bannerLabelNo": "No",
-    "DataScience.restartingKernelStatus": "Restarting iPython Kernel",
+    "DataScience.restartingKernelStatus": "Restarting IPython Kernel",
     "DataScience.executingCode": "Executing Cell",
     "DataScience.collapseAll": "Collapse all cell inputs",
     "DataScience.expandAll": "Expand all cell inputs",
     "DataScience.export": "Export as Jupyter Notebook",
-    "DataScience.restartServer": "Restart iPython Kernel",
+    "DataScience.restartServer": "Restart IPython Kernel",
     "DataScience.undo": "Undo",
     "DataScience.redo": "Redo",
     "DataScience.clearAll": "Remove All Cells",
@@ -161,13 +161,13 @@
     "diagnostics.yesUpdateLaunch": "Yes, update launch.json",
     "diagnostics.bannerLabelNo": "No, I will do it later",
     "diagnostics.invalidTestSettings": "Your settings needs to be updated to change the setting \"python.unitTest.\" to \"python.testing.\", otherwise testing Python code using the extension may not work. Would you like to automatically update your settings now?",
-    "DataScience.interruptKernel": "Interrupt iPython Kernel",
+    "DataScience.interruptKernel": "Interrupt IPython Kernel",
     "DataScience.exportingFormat": "Exporting {0}",
     "DataScience.exportCancel": "Cancel",
     "Common.canceled": "Canceled",
     "DataScience.importChangeDirectoryComment": "#%% Change working directory from the workspace root to the ipynb file location. Turn this addition off with the DataScience.changeDirOnImportExport setting",
     "DataScience.exportChangeDirectoryComment": "# Change directory to VSCode workspace root so that relative path loads work correctly. Turn this addition off with the DataScience.changeDirOnImportExport setting",
-    "DataScience.interruptKernelStatus": "Interrupting iPython Kernel",
+    "DataScience.interruptKernelStatus": "Interrupting IPython Kernel",
     "DataScience.restartKernelAfterInterruptMessage": "Interrupting the kernel timed out. Do you want to restart the kernel instead? All variables will be lost.",
     "DataScience.pythonInterruptFailedHeader": "Keyboard interrupt crashed the kernel. Kernel restarted.",
     "DataScience.sysInfoURILabel": "Jupyter Server URI: ",
@@ -226,7 +226,8 @@
     "DataScience.dataExplorerInvalidVariableFormat": "'{0}' is not an active variable.",
     "DataScience.jupyterGetVariablesExecutionError": "Failure during variable extraction:\r\n{0}",
     "DataScience.loadingMessage": "loading ...",
-    "DataScience.noRowsInDataViewer": "Fetching data ...",
+    "DataScience.fetchingDataViewer": "Fetching data ...",
+    "DataScience.noRowsInDataViewer": "No rows match current filter",
     "DataScience.pandasTooOldForViewingFormat": "Python package 'pandas' is version {0}. Version 0.20 or greater is required for viewing data.",
     "DataScience.pandasRequiredForViewing": "Python package 'pandas' is required for viewing data.",
     "DataScience.valuesColumn": "values",

pythonFiles/datascience/getJupyterVariableDataFrameInfo.py

@@ -35,8 +35,7 @@
         _VSCODE_columnTypes = list(_VSCODE_evalResult.dtypes)
         _VSCODE_columnNames = list(_VSCODE_evalResult)
     elif _VSCODE_targetVariable['type'] == 'ndarray':
-        _VSCODE_evalResult = _VSCODE_pd.Series(_VSCODE_evalResult)
-        _VSCODE_evalResult = _VSCODE_pd.Series.to_frame(_VSCODE_evalResult)
+        _VSCODE_evalResult = _VSCODE_pd.DataFrame(_VSCODE_evalResult)
         _VSCODE_columnTypes = list(_VSCODE_evalResult.dtypes)
         _VSCODE_columnNames = list(_VSCODE_evalResult)
     elif _VSCODE_targetVariable['type'] == 'DataFrame':

pythonFiles/datascience/getJupyterVariableDataFrameRows.py

@@ -23,8 +23,7 @@
     _VSCODE_evalResult = _VSCODE_pd.Series(_VSCODE_evalResult)
     _VSCODE_df = _VSCODE_pd.Series.to_frame(_VSCODE_evalResult)
 elif _VSCODE_targetVariable['type'] == 'ndarray':
-    _VSCODE_evalResult = _VSCODE_pd.Series(_VSCODE_evalResult)
-    _VSCODE_df = _VSCODE_pd.Series.to_frame(_VSCODE_evalResult)
+    _VSCODE_df = _VSCODE_pd.DataFrame(_VSCODE_evalResult)
 # If not a known type, then just let pandas handle it.
 elif not (hasattr(_VSCODE_df, 'iloc')):
     _VSCODE_df = _VSCODE_pd.DataFrame(_VSCODE_evalResult)

pythonFiles/tests/ipython/test_variables.py

@@ -49,13 +49,15 @@ def test_dataframe_info(capsys):
 ls = list([10, 20, 30, 40])
 df = pd.DataFrame(ls)
 se = pd.Series(ls)
-np = np.array(ls)
+np1 = np.array(ls)
+np2 = np.array([[1, 2, 3], [4, 5, 6]])
 obj = {}
 ''')
     vars = get_variables(capsys)
     df = get_variable_value(vars, 'df', capsys)
     se = get_variable_value(vars, 'se', capsys)
-    np = get_variable_value(vars, 'np', capsys)
+    np = get_variable_value(vars, 'np1', capsys)
+    np2 = get_variable_value(vars, 'np2', capsys)
     ls = get_variable_value(vars, 'ls', capsys)
     obj = get_variable_value(vars, 'obj', capsys)
     assert df
@@ -65,8 +67,9 @@ def test_dataframe_info(capsys):
     assert obj
     verify_dataframe_info(vars, 'df', capsys, True)
     verify_dataframe_info(vars, 'se', capsys, True)
-    verify_dataframe_info(vars, 'np', capsys, True)
+    verify_dataframe_info(vars, 'np1', capsys, True)
     verify_dataframe_info(vars, 'ls', capsys, True)
+    verify_dataframe_info(vars, 'np2', capsys, True)
     verify_dataframe_info(vars, 'obj', capsys, False)
 
 def verify_dataframe_info(vars, name, capsys, hasInfo):
@@ -96,6 +99,27 @@ def test_dataframe_rows(capsys):
     rows = get_data_frame_rows(info, 100, 200, capsys)
     assert rows
     assert rows['data'][0]['+h2'] == 'Fy3 W[pMT['
+    get_ipython().run_cell('''
+import pandas as pd
+import numpy as np
+ls = list([10, 20, 30, 40])
+df = pd.DataFrame(ls)
+se = pd.Series(ls)
+np1 = np.array(ls)
+np2 = np.array([[1, 2, 3], [4, 5, 6]])
+obj = {}
+''')
+    vars = get_variables(capsys)
+    np2 = get_variable_value(vars, 'np2', capsys)
+    assert np2
+    info = get_data_frame_info(vars, 'np2', capsys)
+    assert 'rowCount' in info
+    assert info['rowCount'] == 2
+    rows = get_data_frame_rows(info, 0, 2, capsys)
+    assert rows
+    assert rows['data'][0]
+
+
 
 
 

src/client/common/utils/localize.ts

@@ -160,7 +160,8 @@ export namespace DataScience {
     export const pythonInteractiveCreateFailed = localize('DataScience.pythonInteractiveCreateFailed', 'Failure to create a \'Python Interactive\' window. Try reinstalling the Python extension.');
     export const jupyterGetVariablesExecutionError = localize('DataScience.jupyterGetVariablesExecutionError', 'Failure during variable extraction: \r\n{0}');
     export const loadingMessage = localize('DataScience.loadingMessage', 'loading ...');
-    export const noRowsInDataViewer = localize('DataScience.noRowsInDataViewer', 'Fetching data ...');
+    export const fetchingDataViewer = localize('DataScience.fetchingDataViewer', 'Fetching data ...');
+    export const noRowsInDataViewer = localize('DataScience.noRowsInDataViewer', 'No rows match current filter');
     export const pandasTooOldForViewingFormat = localize('DataScience.pandasTooOldForViewingFormat', 'Python package \'pandas\' is version {0}. Version 0.20 or greater is required for viewing data.');
     export const pandasRequiredForViewing = localize('DataScience.pandasRequiredForViewing', 'Python package \'pandas\' is required for viewing data.');
     export const valuesColumn = localize('DataScience.valuesColumn', 'values');

src/client/datascience/editor-integration/decorator.ts

@@ -13,24 +13,16 @@ import { generateCellRanges } from '../cellFactory';
 @injectable()
 export class Decorator implements IExtensionActivationService, IDisposable {
 
-    private activeCellType: vscode.TextEditorDecorationType;
-    private cellSeparatorType: vscode.TextEditorDecorationType;
+    private activeCellTop: vscode.TextEditorDecorationType | undefined;
+    private activeCellBottom: vscode.TextEditorDecorationType | undefined;
+    private cellSeparatorType: vscode.TextEditorDecorationType | undefined;
     private timer: NodeJS.Timer | undefined;
 
     constructor(@inject(IDocumentManager) private documentManager: IDocumentManager,
                 @inject(IDisposableRegistry) disposables: IDisposableRegistry,
                 @inject(IConfigurationService) private configuration: IConfigurationService)
     {
-        this.activeCellType = this.documentManager.createTextEditorDecorationType({
-            backgroundColor: new vscode.ThemeColor('peekViewEditor.background'),
-            isWholeLine: true
-        });
-        this.cellSeparatorType = this.documentManager.createTextEditorDecorationType({
-            borderColor: new vscode.ThemeColor('peekViewEditor.background'),
-            borderWidth: '1px 0px 0px 0px',
-            borderStyle: 'solid',
-            isWholeLine: true
-        });
+        this.computeDecorations();
         disposables.push(this);
         disposables.push(this.configuration.getSettings().onDidChange(this.settingsChanged, this));
         disposables.push(this.documentManager.onDidChangeActiveTextEditor(this.changedEditor, this));
@@ -80,22 +72,48 @@ export class Decorator implements IExtensionActivationService, IDisposable {
         this.timer = setTimeout(() => this.update(editor), 100);
     }
 
+    private computeDecorations() {
+        this.activeCellTop = this.documentManager.createTextEditorDecorationType({
+            borderColor: new vscode.ThemeColor('peekView.border'),
+            borderWidth: '2px 0px 0px 0px',
+            borderStyle: 'solid',
+            isWholeLine: true
+        });
+        this.activeCellBottom = this.documentManager.createTextEditorDecorationType({
+            borderColor: new vscode.ThemeColor('peekView.border'),
+            borderWidth: '0px 0px 1px 0px',
+            borderStyle: 'solid',
+            isWholeLine: true
+        });
+        this.cellSeparatorType = this.documentManager.createTextEditorDecorationType({
+            borderColor: new vscode.ThemeColor('editor.lineHighlightBorder'),
+            borderWidth: '1px 0px 0px 0px',
+            borderStyle: 'solid',
+            isWholeLine: true
+        });
+    }
+
     private update(editor: vscode.TextEditor | undefined) {
-        if (editor && editor.document && editor.document.languageId === PYTHON_LANGUAGE) {
+        if (editor && editor.document && editor.document.languageId === PYTHON_LANGUAGE &&
+            this.activeCellTop && this.cellSeparatorType && this.activeCellBottom) {
             const settings = this.configuration.getSettings().datascience;
             if (settings.decorateCells && settings.enabled) {
                 // Find all of the cells
                 const cells = generateCellRanges(editor.document, this.configuration.getSettings().datascience);
 
                 // Find the range for our active cell.
-                const activeRanges = cells.map(c => c.range).filter(r => r.contains(editor.selection.anchor));
-                editor.setDecorations(this.activeCellType, activeRanges);
+                const currentRange = cells.map(c => c.range).filter(r => r.contains(editor.selection.anchor));
+                const rangeTop = currentRange.length > 0 ? [new vscode.Range(currentRange[0].start, currentRange[0].start)] : [];
+                const rangeBottom = currentRange.length > 0 ? [new vscode.Range(currentRange[0].end, currentRange[0].end)] : [];
+                editor.setDecorations(this.activeCellTop, rangeTop);
+                editor.setDecorations(this.activeCellBottom, rangeBottom);
 
                 // Find the start range for the rest
                 const startRanges = cells.map(c => new vscode.Range(c.range.start, c.range.start));
                 editor.setDecorations(this.cellSeparatorType, startRanges);
             } else {
-                editor.setDecorations(this.activeCellType, []);
+                editor.setDecorations(this.activeCellTop, []);
+                editor.setDecorations(this.activeCellBottom, []);
                 editor.setDecorations(this.cellSeparatorType, []);
             }
         }

src/datascience-ui/data-explorer/emptyRowsView.css

@@ -1,9 +0,0 @@
-.progress-bar {
-    margin:2px;
-    text-align: center;
-}
-
-.progress-container {
-    padding: 20px;
-    text-align:center;
-}

src/datascience-ui/data-explorer/emptyRowsView.tsx

@@ -7,22 +7,14 @@ import * as React from 'react';
 import { getLocString } from '../react-common/locReactSide';
 
 export interface IEmptyRowsProps {
-    total: number;
-    current: number;
 }
 
-export const EmptyRowsView = (props: IEmptyRowsProps) => {
-    const percent = props.current / props.total * 100;
-    const percentText = `${Math.round(percent)}%`;
-    const style: React.CSSProperties = {
-        width: percentText
-    };
-    const message = getLocString('DataScience.noRowsInDataViewer', 'Fetching data ...');
+export const EmptyRows = (_props: IEmptyRowsProps) => {
+    const message = getLocString('DataScience.noRowsInDataViewer', 'No rows match current filter');
 
     return (
-        <div className='progress-container'>
+        <div className='container'>
             {message}
-            <div className='progress-bar' style={style}>{percentText}</div>
         </div>
     );
 };