Skip to content

Commit 40e0bda

Browse files
DonJayamanneDonJayamanne
committed
Merge branch 'master' into ds/ipyWidgets
* master: Fix merge issue Move redux logging to a different file (microsoft#10605) Disable custom editor API (microsoft#10604) Ensure local host only if connection not available (microsoft#10600) Delegate management of notebooks (creation and disposing) to I… (microsoft#10568) Refactor to accommodate upstream VSCode API changes (microsoft#10569) Use a single notebook beetween multiple native editors (microsoft#10514) Add support for synchronising edits between two nb editors of… (microsoft#10189) Fix tests in ds/custom_editor branch (microsoft#10512) Fix linter Reimplement custom editor using new API
2 parents 3c6f009 + 7ae360e commit 40e0bda

53 files changed

Lines changed: 1058 additions & 377 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
"--ui=tdd",
235235
"--recursive",
236236
"--colors",
237-
//"--grep", "<suite name>",
237+
//"--grep", "<suite>",
238238
"--timeout=300000"
239239
],
240240
"env": {
@@ -243,7 +243,7 @@
243243
// Remove 'X' to turn on all logging in the debug output
244244
"XVSC_PYTHON_FORCE_LOGGING": "1",
245245
// Remove `X` prefix and update path to test with real python interpreter (for DS functional tests).
246-
"XCI_PYTHON_PATH": "<Python Path>"
246+
"XCI_PYTHON_PATH": "<Python Path>",
247247
},
248248
"outFiles": [
249249
"${workspaceFolder}/out/**/*.js"

‎build/ci/templates/globals.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ variables:
66
MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter).
77
VSC_PYTHON_FORCE_LOGGING: true # Enable this to turn on console output for the logger
88
VSC_PYTHON_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc.log'
9+
VSC_PYTHON_WEBVIEW_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc_webview.log'
910
CI_BRANCH_NAME: ${Build.SourceBranchName}
1011
npm_config_cache: $(Pipeline.Workspace)/.npm
1112
vmImageMacOS: 'macOS-10.15'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ function buildConfiguration(isNotebook) {
198198
}),
199199
...getPlugins(isNotebook)
200200
],
201+
externals: ['log4js'],
201202
resolve: {
202203
// Add '.ts' and '.tsx' as resolvable extensions.
203204
extensions: ['.ts', '.tsx', '.js', '.json', '.svg']

‎gulpfile.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,9 @@ function getAllowedWarningsForWebPack(buildConfig) {
279279
'WARNING in ./node_modules/ws/lib/validation.js',
280280
'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/buffer-util.js',
281281
'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/validation.js',
282-
'WARNING in ./node_modules/any-promise/register.js'
282+
'WARNING in ./node_modules/any-promise/register.js',
283+
'WARNING in ./node_modules/log4js/lib/appenders/index.js',
284+
'WARNING in ./node_modules/log4js/lib/clustering.js'
283285
];
284286
case 'extension':
285287
return [

‎news/2 Fixes/10597.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Ensure default `host` is not set, if `connect` or `listen` settings are available.

‎package-lock.json‎

Lines changed: 72 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.datascience-ui.dependencies.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@
172172
"remark-parse",
173173
"repeat-string",
174174
"roughjs-es5",
175-
"rxjs",
176175
"scheduler",
177176
"semiotic-mark",
178177
"semiotic",

‎package.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"version": "2020.4.0-dev",
66
"languageServerVersion": "0.5.30",
77
"publisher": "ms-python",
8+
"enableProposedApi": false,
89
"author": {
910
"name": "Microsoft Corporation"
1011
},
@@ -24,7 +25,7 @@
2425
"theme": "dark"
2526
},
2627
"engines": {
27-
"vscode": "^1.42.0"
28+
"vscode": "^1.43.0"
2829
},
2930
"keywords": [
3031
"python",
@@ -83,7 +84,8 @@
8384
"onCommand:python.datascience.exportfileandoutputasnotebook",
8485
"onCommand:python.datascience.selectJupyterInterpreter",
8586
"onCommand:python.datascience.selectjupytercommandline",
86-
"onCommand:python.enableSourceMapSupport"
87+
"onCommand:python.enableSourceMapSupport",
88+
"onCustomEditor:NativeEditorProvider.ipynb"
8789
],
8890
"main": "./out/client/extension",
8991
"contributes": {
@@ -2928,6 +2930,7 @@
29282930
"koa-logger": "^3.2.1",
29292931
"line-by-line": "^0.1.6",
29302932
"lodash": "^4.17.15",
2933+
"log4js": "^6.1.2",
29312934
"md5": "^2.2.1",
29322935
"minimatch": "^3.0.4",
29332936
"named-js-regexp": "^1.3.3",

‎src/client/common/application/customEditorService.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as vscode from 'vscode';
66

77
import { UseCustomEditorApi } from '../constants';
88
import { noop } from '../utils/misc';
9-
import { ICommandManager, ICustomEditorService, WebviewCustomEditorProvider } from './types';
9+
import { CustomEditorProvider, ICommandManager, ICustomEditorService } from './types';
1010

1111
@injectable()
1212
export class CustomEditorService implements ICustomEditorService {
@@ -15,14 +15,14 @@ export class CustomEditorService implements ICustomEditorService {
1515
@inject(UseCustomEditorApi) private readonly useCustomEditorApi: boolean
1616
) {}
1717

18-
public registerWebviewCustomEditorProvider(
18+
public registerCustomEditorProvider(
1919
viewType: string,
20-
provider: WebviewCustomEditorProvider,
20+
provider: CustomEditorProvider,
2121
options?: vscode.WebviewPanelOptions
2222
): vscode.Disposable {
2323
if (this.useCustomEditorApi) {
2424
// tslint:disable-next-line: no-any
25-
return (vscode.window as any).registerWebviewCustomEditorProvider(viewType, provider, options);
25+
return (vscode.window as any).registerCustomEditorProvider(viewType, provider, options);
2626
} else {
2727
return { dispose: noop };
2828
}

0 commit comments

Comments
 (0)