Merge branch 'master' into ds/ipyWidgets

* master:
  Fix merge issue
  Move redux logging to a different file (#10605)
  Disable custom editor API (#10604)
  Ensure local host only if connection not available (#10600)
  Delegate management of notebooks (creation and disposing) to I… (#10568)
  Refactor to accommodate upstream VSCode API changes (#10569)
  Use a single notebook beetween multiple native editors (#10514)
  Add support for synchronising edits between two nb editors of… (#10189)
  Fix tests in ds/custom_editor branch (#10512)
  Fix linter
  Reimplement custom editor using new API

Author: DonJayamanne

.vscode/launch.json

@@ -234,7 +234,7 @@
                 "--ui=tdd",
                 "--recursive",
                 "--colors",
-                //"--grep", "<suite name>",
+                //"--grep", "<suite>",
                 "--timeout=300000"
             ],
             "env": {
@@ -243,7 +243,7 @@
                 // Remove 'X' to turn on all logging in the debug output
                 "XVSC_PYTHON_FORCE_LOGGING": "1",
                 // Remove `X` prefix and update path to test with real python interpreter (for DS functional tests).
-                "XCI_PYTHON_PATH": "<Python Path>"
+                "XCI_PYTHON_PATH": "<Python Path>",
             },
             "outFiles": [
                 "${workspaceFolder}/out/**/*.js"

build/ci/templates/globals.yml

@@ -6,6 +6,7 @@ variables:
   MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter).
   VSC_PYTHON_FORCE_LOGGING: true # Enable this to turn on console output for the logger
   VSC_PYTHON_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc.log'
+  VSC_PYTHON_WEBVIEW_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc_webview.log'
   CI_BRANCH_NAME: ${Build.SourceBranchName}
   npm_config_cache: $(Pipeline.Workspace)/.npm
   vmImageMacOS: 'macOS-10.15'

build/webpack/webpack.datascience-ui.config.builder.js

@@ -198,6 +198,7 @@ function buildConfiguration(isNotebook) {
             }),
             ...getPlugins(isNotebook)
         ],
+        externals: ['log4js'],
         resolve: {
             // Add '.ts' and '.tsx' as resolvable extensions.
             extensions: ['.ts', '.tsx', '.js', '.json', '.svg']

gulpfile.js

@@ -279,7 +279,9 @@ function getAllowedWarningsForWebPack(buildConfig) {
                 'WARNING in ./node_modules/ws/lib/validation.js',
                 'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/buffer-util.js',
                 'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/validation.js',
-                'WARNING in ./node_modules/any-promise/register.js'
+                'WARNING in ./node_modules/any-promise/register.js',
+                'WARNING in ./node_modules/log4js/lib/appenders/index.js',
+                'WARNING in ./node_modules/log4js/lib/clustering.js'
             ];
         case 'extension':
             return [

news/2 Fixes/10597.md

@@ -0,0 +1 @@
+Ensure default `host` is not set, if `connect` or `listen` settings are available.

package-lock.json

@@ -172,7 +172,6 @@
     "remark-parse",
     "repeat-string",
     "roughjs-es5",
-    "rxjs",
     "scheduler",
     "semiotic-mark",
     "semiotic",

package.datascience-ui.dependencies.json

@@ -5,6 +5,7 @@
     "version": "2020.4.0-dev",
     "languageServerVersion": "0.5.30",
     "publisher": "ms-python",
+    "enableProposedApi": false,
     "author": {
         "name": "Microsoft Corporation"
     },
@@ -24,7 +25,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.42.0"
+        "vscode": "^1.43.0"
     },
     "keywords": [
         "python",
@@ -83,7 +84,8 @@
         "onCommand:python.datascience.exportfileandoutputasnotebook",
         "onCommand:python.datascience.selectJupyterInterpreter",
         "onCommand:python.datascience.selectjupytercommandline",
-        "onCommand:python.enableSourceMapSupport"
+        "onCommand:python.enableSourceMapSupport",
+        "onCustomEditor:NativeEditorProvider.ipynb"
     ],
     "main": "./out/client/extension",
     "contributes": {
@@ -2928,6 +2930,7 @@
         "koa-logger": "^3.2.1",
         "line-by-line": "^0.1.6",
         "lodash": "^4.17.15",
+        "log4js": "^6.1.2",
         "md5": "^2.2.1",
         "minimatch": "^3.0.4",
         "named-js-regexp": "^1.3.3",

package.json

@@ -6,7 +6,7 @@ import * as vscode from 'vscode';
 
 import { UseCustomEditorApi } from '../constants';
 import { noop } from '../utils/misc';
-import { ICommandManager, ICustomEditorService, WebviewCustomEditorProvider } from './types';
+import { CustomEditorProvider, ICommandManager, ICustomEditorService } from './types';
 
 @injectable()
 export class CustomEditorService implements ICustomEditorService {
@@ -15,14 +15,14 @@ export class CustomEditorService implements ICustomEditorService {
         @inject(UseCustomEditorApi) private readonly useCustomEditorApi: boolean
     ) {}
 
-    public registerWebviewCustomEditorProvider(
+    public registerCustomEditorProvider(
         viewType: string,
-        provider: WebviewCustomEditorProvider,
+        provider: CustomEditorProvider,
         options?: vscode.WebviewPanelOptions
     ): vscode.Disposable {
         if (this.useCustomEditorApi) {
             // tslint:disable-next-line: no-any
-            return (vscode.window as any).registerWebviewCustomEditorProvider(viewType, provider, options);
+            return (vscode.window as any).registerCustomEditorProvider(viewType, provider, options);
         } else {
             return { dispose: noop };
         }