Merge branch 'master' of github.com:microsoft/vscode

build/.webignore

@@ -12,18 +12,6 @@ jschardet/index.js
 jschardet/src/**
 jschardet/dist/jschardet.js
 
-vscode-oniguruma/LICENSE.txt
-vscode-oniguruma/main.d.ts
-vscode-oniguruma/NOTICES.txt
-vscode-oniguruma/package.json
-vscode-oniguruma/README.md
-
-vscode-textmate/release/*.ts
-vscode-textmate/release/*.js.map
-vscode-textmate/typings/**
-vscode-textmate/LICENSE.md
-vscode-textmate/package.json
-vscode-textmate/README.md
 vscode-textmate/webpack.config.js
 
 xterm/src/**

src/vs/workbench/api/common/extHost.api.impl.ts

@@ -135,7 +135,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostComment = rpcProtocol.set(ExtHostContext.ExtHostComments, new ExtHostComments(rpcProtocol, extHostCommands, extHostDocuments));
 	const extHostProgress = rpcProtocol.set(ExtHostContext.ExtHostProgress, new ExtHostProgress(rpcProtocol.getProxy(MainContext.MainThreadProgress)));
 	const extHostLabelService = rpcProtocol.set(ExtHostContext.ExtHosLabelService, new ExtHostLabelService(rpcProtocol));
-	const extHostNotebook = rpcProtocol.set(ExtHostContext.ExtHostNotebook, new ExtHostNotebookController(rpcProtocol, extHostCommands, extHostDocumentsAndEditors, initData.environment, extensionStoragePaths));
+	const extHostNotebook = rpcProtocol.set(ExtHostContext.ExtHostNotebook, initData.uiKind === UIKind.Web ? new ExtHostNotebookController(rpcProtocol, extHostCommands, extHostDocumentsAndEditors, initData.environment) : new ExtHostNotebookController(rpcProtocol, extHostCommands, extHostDocumentsAndEditors, initData.environment, extensionStoragePaths));
 	const extHostTheming = rpcProtocol.set(ExtHostContext.ExtHostTheming, new ExtHostTheming(rpcProtocol));
 	const extHostAuthentication = rpcProtocol.set(ExtHostContext.ExtHostAuthentication, new ExtHostAuthentication(rpcProtocol));
 	const extHostTimeline = rpcProtocol.set(ExtHostContext.ExtHostTimeline, new ExtHostTimeline(rpcProtocol, extHostCommands));