Merge fixes into July release (#12889)

Co-authored-by: Timothy Ruscica <[email protected]>

Author: DonJayamanne

build/ci/vscode-python-pr-validation.yaml

@@ -56,6 +56,7 @@ stages:
             'DataScience':
               TestsToRun: 'testDataScience'
               NeedsPythonTestReqs: true
+              NeedsPythonFunctionalReqs: true
             'Smoke':
               TestsToRun: 'testSmoke'
               NeedsPythonTestReqs: true

gulpfile.js

@@ -177,6 +177,7 @@ gulp.task('webpack', async () => {
     await buildWebPackForDevOrProduction('./build/webpack/webpack.datascience-ui-notebooks.config.js', 'production');
     await buildWebPackForDevOrProduction('./build/webpack/webpack.datascience-ui-viewers.config.js', 'production');
     await buildWebPackForDevOrProduction('./build/webpack/webpack.extension.config.js', 'extension');
+    await buildWebPackForDevOrProduction('./build/webpack/webpack.datascience-ui-renderers.config.js', 'production');
 });
 
 gulp.task('updateBuildNumber', async () => {

news/1 Enhancements/10496.md

@@ -0,0 +1,4 @@
+Opening notebooks in the preview Notebook editor for [Visual Studio Code Insiders](https://code.visualstudio.com/insiders/).
+* Install Python extension in the latest [Visual Studio Code Insiders](https://code.visualstudio.com/insiders/).
+* Wait for `Python Extension` to get activated (e.g. open a `Python` file).
+* Right click on an `*.ipynb (Jupyter Notebook)` file and select `Open in preview Notebook Editor`.

news/3 Code Health/12844.md

@@ -0,0 +1 @@
+Update categories in `package.json`.

package.json

@@ -8,7 +8,7 @@
     },
     "languageServerVersion": "0.5.30",
     "publisher": "ms-python",
-    "enableProposedApi": false,
+    "enableProposedApi": true,
     "author": {
         "name": "Microsoft Corporation"
     },
@@ -28,7 +28,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.46.0"
+        "vscode": "^1.47.0"
     },
     "keywords": [
         "python",
@@ -43,7 +43,10 @@
         "Snippets",
         "Formatters",
         "Other",
-        "Extension Packs"
+        "Extension Packs",
+        "Data Science",
+        "Machine Learning",
+        "Notebooks"
     ],
     "activationEvents": [
         "onLanguage:python",
@@ -60,6 +63,7 @@
         "onCommand:python.viewTestOutput",
         "onCommand:python.viewOutput",
         "onCommand:python.datascience.viewJupyterOutput",
+        "onCOmmand:python.datascience.export",
         "onCommand:python.datascience.exportAsPythonScript",
         "onCommand:python.datascience.exportToHTML",
         "onCommand:python.datascience.exportToPDF",
@@ -358,6 +362,15 @@
                 "title": "%python.command.python.datascience.viewJupyterOutput.title%",
                 "category": "Python"
             },
+            {
+                "command": "python.datascience.export",
+                "title": "%DataScience.notebookExportAs%",
+                "category": "Python",
+                "icon": {
+                    "light": "resources/light/export_to_python.svg",
+                    "dark": "resources/dark/export_to_python.svg"
+                }
+            },
             {
                 "command": "python.datascience.exportAsPythonScript",
                 "title": "%python.command.python.datascience.exportAsPythonScript.title%",
@@ -681,6 +694,25 @@
                 },
                 "enablement": "python.datascience.notebookeditor.canrestartNotebookkernel"
             },
+            {
+                "command": "python.datascience.notebookeditor.trust",
+                "title": "%DataScience.trustNotebookCommandTitle%",
+                "category": "Python",
+                "icon": {
+                    "light": "resources/light/un-trusted.svg",
+                    "dark": "resources/dark/un-trusted.svg"
+                },
+                "enablement": "notebookEditorFocused && !python.datascience.isnotebooktrusted && python.datascience.trustfeatureenabled"
+            },
+            {
+                "command": "python.datascience.notebookeditor.trusted",
+                "title": "%DataScience.notebookIsTrusted%",
+                "category": "Python",
+                "icon": {
+                    "light": "resources/light/trusted.svg",
+                    "dark": "resources/dark/trusted.svg"
+                }
+            },
             {
                 "command": "python.datascience.notebookeditor.runallcells",
                 "title": "%python.command.python.datascience.notebookeditor.runallcells.title%",
@@ -846,6 +878,24 @@
                     "title": "%python.command.python.datascience.restartkernel.title%",
                     "group": "navigation",
                     "when": "notebookEditorFocused"
+                },
+                {
+                    "command": "python.datascience.notebookeditor.trust",
+                    "title": "%DataScience.trustNotebookCommandTitle%",
+                    "group": "navigation@1",
+                    "when": "notebookEditorFocused && !python.datascience.isnotebooktrusted && python.datascience.trustfeatureenabled"
+                },
+                {
+                    "command": "python.datascience.notebookeditor.trusted",
+                    "title": "%DataScience.notebookIsTrusted%",
+                    "group": "navigation@1",
+                    "when": "notebookEditorFocused && python.datascience.isnotebooktrusted && python.datascience.trustfeatureenabled"
+                },
+                {
+                    "command": "python.datascience.export",
+                    "title": "%DataScience.notebookExportAs%",
+                    "group": "navigation",
+                    "when": "notebookEditorFocused"
                 }
             ],
             "explorer/context": [
@@ -1119,6 +1169,18 @@
                     "category": "Python",
                     "when": "python.datascience.isnativeactive && python.datascience.featureenabled && python.datascience.isnotebooktrusted"
                 },
+                {
+                    "command": "python.datascience.notebookeditor.trust",
+                    "title": "%DataScience.trustNotebookCommandTitle%",
+                    "category": "Python",
+                    "when": "python.datascience.featureenabled && notebookEditorFocused && !python.datascience.isnotebooktrusted && python.datascience.trustfeatureenabled"
+                },
+                {
+                    "command": "python.datascience.notebookeditor.trusted",
+                    "title": "%DataScience.notebookIsTrusted%",
+                    "category": "Python",
+                    "when": "config.noExists"
+                },
                 {
                     "command": "python.datascience.notebookeditor.runallcells",
                     "title": "%python.command.python.datascience.notebookeditor.runallcells.title%",
@@ -1233,6 +1295,12 @@
                     "title": "%DataScience.gatherQuality%",
                     "category": "Python",
                     "when": "false"
+                },
+                {
+                    "command": "python.datascience.export",
+                    "title": "%DataScience.notebookExportAs%",
+                    "category": "Python",
+                    "when": "false"
                 }
             ],
             "view/title": [
@@ -3085,7 +3153,43 @@
                     "when": "testsDiscovered"
                 }
             ]
-        }
+        },
+        "notebookOutputRenderer": [
+            {
+                "viewType": "jupyter-notebook-renderer",
+                "displayName": "Jupyter Notebook Renderer",
+                "mimeTypes": [
+                    "application/geo+json",
+                    "application/vdom.v1+json",
+                    "application/vnd.dataresource+json",
+                    "application/vnd.plotly.v1+json",
+                    "application/vnd.vega.v2+json",
+                    "application/vnd.vega.v3+json",
+                    "application/vnd.vega.v4+json",
+                    "application/vnd.vega.v5+json",
+                    "application/vnd.vegalite.v1+json",
+                    "application/vnd.vegalite.v2+json",
+                    "application/vnd.vegalite.v3+json",
+                    "application/vnd.vegalite.v4+json",
+                    "application/x-nteract-model-debug+json",
+                    "image/gif",
+                    "text/latex",
+                    "text/vnd.plotly.v1+html"
+                ]
+            }
+        ],
+        "notebookProvider": [
+            {
+                "viewType": "jupyter-notebook",
+                "displayName": "Jupyter Notebook (preview)",
+                "selector": [
+                    {
+                        "filenamePattern": "*.ipynb"
+                    }
+                ],
+                "priority": "option"
+            }
+        ]
     },
     "scripts": {
         "package": "gulp clean && gulp prePublishBundle && vsce package -o ms-python-insiders.vsix",

package.nls.json

@@ -23,7 +23,7 @@
     "DataScience.checkingIfImportIsSupported": "Checking if import is supported",
     "DataScience.installingMissingDependencies": "Installing missing dependencies",
     "DataScience.exportNotebookToPython": "Exporting Notebook to Python",
-    "DataScience.performingExport": "Performing export",
+    "DataScience.performingExport": "Performing Export",
     "DataScience.convertingToPDF": "Converting to PDF",
     "DataScience.exportHTMLQuickPickLabel": "HTML",
     "DataScience.exportPDFQuickPickLabel": "PDF",
@@ -370,6 +370,7 @@
     "DataScience.fetchingDataViewer": "Fetching data ...",
     "DataScience.noRowsInDataViewer": "No rows match current filter",
     "DataScience.jupyterServer": "Jupyter Server",
+    "DataScience.trustNotebookCommandTitle": "Trust notebook",
     "DataScience.notebookIsTrusted": "Trusted",
     "DataScience.notebookIsNotTrusted": "Not Trusted",
     "DataScience.noKernel": "No Kernel",
@@ -543,7 +544,7 @@
     "DataScience.reloadCustomEditor": "Please reload VS Code to use the custom editor API",
     "DataScience.reloadVSCodeNotebookEditor": "Please reload VS Code to use the Notebook Editor",
     "DataScience.step": "Run next line (F10)",
-    "DataScience.usingPreviewNotebookWithOtherNotebookWarning": "Using the Preview Notebook Editor along with the stable Notebook Editor is not recommended. Doing so could result in data loss or corruption of notebooks.",
+    "DataScience.usingPreviewNotebookWithOtherNotebookWarning": "Opening the same file in the Preview Notebook Editor and stable Notebook Editor is not recommended. Doing so could result in data loss or corruption of notebooks.",
     "DataScience.previewNotebookOnlySupportedInVSCInsiders": "The Preview Notebook Editor is supported only in the Insiders version of Visual Studio Code.",
     "DataScienceNotebookSurveyBanner.bannerMessage": "Can you please take 2 minutes to tell us how the Preview Notebook Editor is working for you?",
     "DataScience.unknownServerUri": "Server URI cannot be used. Did you uninstall an extension that provided a Jupyter server connection?",

resources/dark/export_to_python.svg

@@ -173,14 +173,16 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
     [DSCommands.ScrollToCell]: [string, string];
     [DSCommands.ViewJupyterOutput]: [];
     [DSCommands.ExportAsPythonScript]: [INotebookModel];
-    [DSCommands.ExportToHTML]: [INotebookModel];
-    [DSCommands.ExportToPDF]: [INotebookModel];
-    [DSCommands.Export]: [INotebookModel];
+    [DSCommands.ExportToHTML]: [INotebookModel, string | undefined];
+    [DSCommands.ExportToPDF]: [INotebookModel, string | undefined];
+    [DSCommands.Export]: [Uri | INotebookModel, string | undefined];
     [DSCommands.SwitchJupyterKernel]: [INotebook | undefined, 'raw' | 'jupyter'];
     [DSCommands.SelectJupyterCommandLine]: [undefined | Uri];
     [DSCommands.SaveNotebookNonCustomEditor]: [Uri];
     [DSCommands.SaveAsNotebookNonCustomEditor]: [Uri, Uri];
     [DSCommands.OpenNotebookNonCustomEditor]: [Uri];
     [DSCommands.GatherQuality]: [string];
     [DSCommands.EnableLoadingWidgetsFrom3rdPartySource]: [undefined | never];
+    [DSCommands.TrustNotebook]: [undefined | never | Uri];
+    [DSCommands.TrustedNotebook]: [undefined | never];
 }