Merge branch 'electron-4.0.x' into misolori/icons-e4

build/.nativeignore

@@ -1,5 +1,8 @@
 # cleanup rules for native node modules, .gitignore style
 
+nan/**
+*/node_modules/nan/**
+
 fsevents/binding.gyp
 fsevents/fsevents.cc
 fsevents/build/**
@@ -83,6 +86,7 @@ node-pty/binding.gyp
 node-pty/build/**
 node-pty/src/**
 node-pty/tools/**
+node-pty/deps/**
 !node-pty/build/Release/*.exe
 !node-pty/build/Release/*.dll
 !node-pty/build/Release/*.node

build/gulpfile.vscode.js

@@ -397,6 +397,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 				.pipe(replace('@@VERSION@@', version))
 				.pipe(replace('@@COMMIT@@', commit))
 				.pipe(replace('@@APPNAME@@', product.applicationName))
+				.pipe(replace('@@DATAFOLDER@@', product.dataFolderName))
 				.pipe(replace('@@QUALITY@@', quality))
 				.pipe(rename(function (f) { f.basename = product.applicationName; f.extname = ''; })));
 

cgmanifest.json

@@ -98,11 +98,11 @@
 				"git": {
 					"name": "vscode-octicons-font",
 					"repositoryUrl": "https://github.com/Microsoft/vscode-octicons-font",
-					"commitHash": "ca261ea7e041b1b01bc68755d0031e823cae3abd"
+					"commitHash": "d9b9724beb850c6d038afe1cc1d46ba89a6a10ac"
 				}
 			},
 			"license": "MIT",
-			"version": "1.2.0"
+			"version": "1.3.0"
 		},
 		{
 			"component": {

extensions/css-language-features/server/package.json

@@ -9,7 +9,7 @@
   },
   "main": "./out/cssServerMain",
   "dependencies": {
-    "vscode-css-languageservice": "^4.0.2-next.3",
+    "vscode-css-languageservice": "^4.0.2-next.4",
     "vscode-languageserver": "^5.3.0-next.2"
   },
   "devDependencies": {

extensions/css-language-features/server/yarn.lock

@@ -229,10 +229,10 @@ supports-color@5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
-vscode-css-languageservice@^4.0.2-next.3:
-  version "4.0.2-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.0.2-next.3.tgz#f81925d6037f05724d1c1fe00e8fb7fcbece72ff"
-  integrity sha512-Th6ESBGTdNo4CbZEeKNVBKi4DwGjafS1+05kuoH3hO5mFCKr6ttdvu4GxMHca7nGN1efv5tiZ6slO8PCN1bLNA==
+vscode-css-languageservice@^4.0.2-next.4:
+  version "4.0.2-next.4"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.0.2-next.4.tgz#84930967c4b3f63206491ededb18112227eb64a3"
+  integrity sha512-k8sRcmzu58Muusx0IkIYWuFaG4VBQsxy6nM+Cken0sY/bemS5cvX2l4g5zRIJTzUHr85sxqkLmUk0n6Ef/asFA==
   dependencies:
     vscode-languageserver-types "^3.14.0"
     vscode-nls "^4.0.0"

extensions/markdown-language-features/media/markdown.css

@@ -135,7 +135,6 @@ h3 code,
 h4 code,
 h5 code,
 h6 code {
-	font-size: inherit;
 	line-height: auto;
 }
 
@@ -168,8 +167,8 @@ blockquote {
 
 code {
 	font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
-	font-size: 1rem;
-	line-height: 1.357rem;
+	font-size: 1em;
+	line-height: 1.357em;
 }
 
 body.wordWrap pre {

extensions/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "3.5.0-dev.20190525"
+    "typescript": "3.5.1"
   },
   "scripts": {
     "postinstall": "node ./postinstall"

extensions/typescript-language-features/src/features/refactor.ts

@@ -116,6 +116,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
 
 	private static readonly extractFunctionKind = vscode.CodeActionKind.RefactorExtract.append('function');
 	private static readonly extractConstantKind = vscode.CodeActionKind.RefactorExtract.append('constant');
+	private static readonly extractTypeKind = vscode.CodeActionKind.RefactorExtract.append('type');
 	private static readonly moveKind = vscode.CodeActionKind.Refactor.append('move');
 
 	constructor(
@@ -217,6 +218,8 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
 			return TypeScriptRefactorProvider.extractConstantKind;
 		} else if (refactor.name.startsWith('Move')) {
 			return TypeScriptRefactorProvider.moveKind;
+		} else if (refactor.name.includes('Extract to type alias')) {
+			return TypeScriptRefactorProvider.extractTypeKind;
 		}
 		return vscode.CodeActionKind.Refactor;
 	}
@@ -227,6 +230,9 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
 		if (action.name.startsWith('constant_')) {
 			return action.name.endsWith('scope_0');
 		}
+		if (action.name.includes('Extract to type alias')) {
+			return true;
+		}
 		return false;
 	}
 }

extensions/vscode-test-resolver/src/extension.ts

@@ -84,10 +84,6 @@ export function activate(context: vscode.ExtensionContext) {
 				outputChannel.appendLine(`Using node at ${nodePath}`);
 
 				const env = getNewEnv();
-				env['PATH'] = path.join(vscodePath, 'resources', 'server', 'bin') + path.delimiter + env['PATH']; // allow calling code-dev.sh
-
-				outputChannel.appendLine(env['PATH'] || '');
-
 				extHostProcess = cp.spawn(nodePath, [path.join('out', 'remoteExtensionHostAgent'), '--port=0'], { cwd: vscodePath, env });
 			} else {
 				const serverBin = path.resolve(os.homedir(), '.vscode-remote', 'bin');

extensions/yarn.lock

@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-typescript@3.5.0-dev.20190525:
-  version "3.5.0-dev.20190525"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.0-dev.20190525.tgz#1f3cd0e35be886b2a837d7efeebdf2fff727ee44"
-  integrity sha512-+EhVvwjYE3bLN3yc5kZHylvyqRB86oqWpO2XrYImi89ErqddhNx28ms50Gt8r3dzK4LUpEUWR9p/bL1I4L8sfw==
+typescript@3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202"
+  integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.35.0",
-  "distro": "22c61a9bf68b1aca53f01d3de0a195c5ea9ca2c4",
+  "distro": "78b820fcfbca46e0a1387efef3b8216e04100f45",
   "author": {
     "name": "Microsoft Corporation"
   },

resources/win32/bin/code.sh

@@ -6,6 +6,7 @@ COMMIT="@@COMMIT@@"
 APP_NAME="@@APPNAME@@"
 QUALITY="@@QUALITY@@"
 NAME="@@NAME@@"
+DATAFOLDER="@@DATAFOLDER@@"
 VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
 ELECTRON="$VSCODE_PATH/$NAME.exe"
 if grep -qi Microsoft /proc/version; then
@@ -26,7 +27,7 @@ if grep -qi Microsoft /proc/version; then
 			# replace \r\n with \n in WSL_EXT_WLOC
 			WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
 			WIN_CODE_CMD=$(wslpath -w "$VSCODE_PATH/bin/$APP_NAME.cmd")
-			"$WSL_CODE" $COMMIT $QUALITY "$WIN_CODE_CMD" "$APP_NAME" "$@"
+			"$WSL_CODE" "$COMMIT" "$QUALITY" "$WIN_CODE_CMD" "$APP_NAME" "$DATAFOLDER" "$@"
 			exit $?
 		else
 			CLI=$(wslpath -m "$VSCODE_PATH/resources/app/out/cli.js")

src/vs/base/browser/ui/contextview/contextview.ts

@@ -260,12 +260,13 @@ export class ContextView extends Disposable {
 	}
 
 	hide(data?: any): void {
-		if (this.delegate && this.delegate.onHide) {
-			this.delegate.onHide(data);
-		}
-
+		const delegate = this.delegate;
 		this.delegate = null;
 
+		if (delegate && delegate.onHide) {
+			delegate.onHide(data);
+		}
+
 		if (this.toDisposeOnClean) {
 			this.toDisposeOnClean.dispose();
 			this.toDisposeOnClean = null;

src/vs/base/browser/ui/inputbox/inputBox.ts

@@ -93,7 +93,7 @@ export class InputBox extends Widget {
 	private placeholder: string;
 	private ariaLabel: string;
 	private validation?: IInputValidator;
-	private state: string | null = 'idle';
+	private state: 'idle' | 'open' | 'closed' = 'idle';
 	private cachedHeight: number | null;
 
 	private inputBackground?: Color;
@@ -421,18 +421,23 @@ export class InputBox extends Widget {
 
 				return null;
 			},
+			onHide: () => {
+				this.state = 'closed';
+			},
 			layout: layout
 		});
 	}
 
 	private _hideMessage(): void {
-		if (!this.contextViewProvider || this.state !== 'open') {
+		if (!this.contextViewProvider) {
 			return;
 		}
 
-		this.state = 'idle';
+		if (this.state === 'open') {
+			this.contextViewProvider.hideContextView();
+		}
 
-		this.contextViewProvider.hideContextView();
+		this.state = 'idle';
 	}
 
 	private onValueChange(): void {
@@ -522,7 +527,7 @@ export class InputBox extends Widget {
 		this.contextViewProvider = undefined;
 		this.message = null;
 		this.validation = undefined;
-		this.state = null;
+		this.state = null!; // StrictNullOverride: nulling out ok in dispose
 		this.actionbar = undefined;
 
 		super.dispose();

src/vs/base/browser/ui/octiconLabel/octicons/octicons.css

@@ -1,7 +1,7 @@
 @font-face {
     font-family: "octicons";
-    src: url("./octicons.ttf?dfb57cc8cb38865560532de9049096c2") format("truetype"),
-url("./octicons.svg?dfb57cc8cb38865560532de9049096c2#octicons") format("svg");
+    src: url("./octicons.ttf?f6919d21f641711143d5590f9de474df") format("truetype"),
+url("./octicons.svg?f6919d21f641711143d5590f9de474df#octicons") format("svg");
 }
 
 .octicon, .mega-octicon {
@@ -235,15 +235,14 @@ url("./octicons.svg?dfb57cc8cb38865560532de9049096c2#octicons") format("svg");
 .octicon-zap:before { content: "\26a1" }
 .octicon-archive:before { content: "\f101" }
 .octicon-arrow-both:before { content: "\f102" }
-.octicon-configure:before { content: "\f103" }
-.octicon-error:before { content: "\f104" }
-.octicon-eye-closed:before { content: "\f105" }
-.octicon-fold-down:before { content: "\f106" }
-.octicon-fold-up:before { content: "\f107" }
-.octicon-github-action:before { content: "\f108" }
+.octicon-error:before { content: "\f103" }
+.octicon-eye-closed:before { content: "\f104" }
+.octicon-fold-down:before { content: "\f105" }
+.octicon-fold-up:before { content: "\f106" }
+.octicon-github-action:before { content: "\f107" }
+.octicon-info-outline:before { content: "\f108" }
 .octicon-play:before { content: "\f109" }
 .octicon-remote:before { content: "\f10a" }
 .octicon-request-changes:before { content: "\f10b" }
-.octicon-smile:before { content: "\f10c" }
-.octicon-tasks:before { content: "\f10d" }
-.octicon-warning:before { content: "\f10e" }
+.octicon-smiley-outline:before { content: "\f10c" }
+.octicon-warning:before { content: "\f10d" }