diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index ed3a8f5d260..afba093b25c 100644
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -5,6 +5,8 @@
 
 declare namespace monaco {
 
+	// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.
+
 	export type Thenable<T> = PromiseLike<T>;
 
 	export interface IDisposable {
diff --git a/build/package.json b/build/package.json
index d217cae2443..e292f7a7e41 100644
--- a/build/package.json
+++ b/build/package.json
@@ -20,7 +20,7 @@
     "@types/minimatch": "^3.0.3",
     "@types/minimist": "^1.2.0",
     "@types/mocha": "2.2.39",
-    "@types/node": "8.0.33",
+    "@types/node": "^10.14.8",
     "@types/pump": "^1.0.1",
     "@types/request": "^2.47.0",
     "@types/rimraf": "^2.0.2",
@@ -29,7 +29,7 @@
     "@types/uglify-es": "^3.0.0",
     "@types/underscore": "^1.8.9",
     "@types/xml2js": "0.0.33",
-    "applicationinsights": "1.0.6",
+    "applicationinsights": "1.0.8",
     "azure-storage": "^2.1.0",
     "documentdb": "1.13.0",
     "github-releases": "^0.4.1",
diff --git a/build/yarn.lock b/build/yarn.lock
index 02f533c9ce5..8f675d1fef0 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -195,10 +195,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
   integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==
 
-"@types/node@8.0.33":
-  version "8.0.33"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
-  integrity sha512-vmCdO8Bm1ExT+FWfC9sd9r4jwqM7o97gGy2WBshkkXbf/2nLAJQUrZfIhw27yVOtLUev6kSZc4cav/46KbDd8A==
+"@types/node@^10.14.8":
+  version "10.14.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.13.tgz#ac786d623860adf39a3f51d629480aacd6a6eec7"
+  integrity sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==
 
 "@types/pump@^1.0.1":
   version "1.0.1"
@@ -357,10 +357,10 @@ ansi-wrap@0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
-applicationinsights@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.6.tgz#bc201810de91cea910dab34e8ad35ecde488edeb"
-  integrity sha512-VQT3kBpJVPw5fCO5n+WUeSx0VHjxFtD7znYbILBlVgOS9/cMDuGFmV2Br3ObzFyZUDGNbEfW36fD1y2/vAiCKw==
+applicationinsights@1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
+  integrity sha512-KzOOGdphOS/lXWMFZe5440LUdFbrLpMvh2SaRxn7BmiI550KAoSb2gIhiq6kJZ9Ir3AxRRztjhzif+e5P5IXIg==
   dependencies:
     diagnostic-channel "0.2.0"
     diagnostic-channel-publishers "0.2.1"
@@ -2309,9 +2309,9 @@ vsce@1.48.0:
     yazl "^2.2.2"
 
 vscode-ripgrep@^1.4.0:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.4.tgz#dae1c3eef350513299341cdf96e622c00b548eff"
-  integrity sha512-Bs8SvFAkR0QHf09J46VgNo19yRikOtj/f0zHzK3AM3ICjCGNN/BNoG9of6zGVHUTO+6Mk1RbKglyOHLKr8D1lg==
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.5.tgz#24c0e9cb356cf889c98e15ecb58f9cf654a1d961"
+  integrity sha512-OrPrAmcun4+uZAuNcQvE6CCPskh+5AsjANod/Q3zRcJcGNxgoOSGlQN9RPtatkUNmkN8Nn8mZBnS1jMylu/dKg==
 
 vscode-telemetry-extractor@1.4.3:
   version "1.4.3"
diff --git a/extensions/debug-server-ready/src/extension.ts b/extensions/debug-server-ready/src/extension.ts
index d6e122f9624..64c4ccffea6 100644
--- a/extensions/debug-server-ready/src/extension.ts
+++ b/extensions/debug-server-ready/src/extension.ts
@@ -137,8 +137,7 @@ class ServerReadyDetector extends vscode.Disposable {
 				break;
 			case 'debugWithChrome':
 
-				const chrome = vscode.extensions.getExtension('msjsdiag.debugger-for-chrome');
-				if (chrome) {
+				if (vscode.env.remoteName === 'wsl' || !!vscode.extensions.getExtension('msjsdiag.debugger-for-chrome')) {
 					vscode.debug.startDebugging(session.workspaceFolder, {
 						type: 'chrome',
 						name: 'Chrome Debug',
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index a9b53103702..d75e6f9bc45 100755
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -1115,7 +1115,7 @@ export class CommandCenter {
 
 		if (scmResources.length === 1) {
 			if (untrackedCount > 0) {
-				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
+				message = localize('confirm delete', "Are you sure you want to DELETE {0}?\nThis is IRREVERSIBLE!\nThis file will be FOREVER LOST.", path.basename(scmResources[0].resourceUri.fsPath));
 				yes = localize('delete file', "Delete file");
 			} else {
 				if (scmResources[0].type === Status.DELETED) {
@@ -1134,7 +1134,7 @@ export class CommandCenter {
 			}
 
 			if (untrackedCount > 0) {
-				message = `${message}\n\n${localize('warn untracked', "This will DELETE {0} untracked files!", untrackedCount)}`;
+				message = `${message}\n\n${localize('warn untracked', "This will DELETE {0} untracked files!\nThis is IRREVERSIBLE!\nThese files will be FOREVER LOST.", untrackedCount)}`;
 			}
 		}
 
@@ -1175,7 +1175,7 @@ export class CommandCenter {
 			await repository.clean(resources.map(r => r.resourceUri));
 			return;
 		} else if (resources.length === 1) {
-			const message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(resources[0].resourceUri.fsPath));
+			const message = localize('confirm delete', "Are you sure you want to DELETE {0}?\nThis is IRREVERSIBLE!\nThis file will be FOREVER LOST.", path.basename(resources[0].resourceUri.fsPath));
 			const yes = localize('delete file', "Delete file");
 			const pick = await window.showWarningMessage(message, { modal: true }, yes);
 
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index 71cf0a91c20..a90d452bddf 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/f698a9826cad8235e92b7c298a5f8c9c298d8ada",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/cf7b1ec2c20b5fe28695249596128ff514e1a659",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js",
 	"patterns": [
@@ -426,7 +426,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js entity.name.function.js"
@@ -484,7 +484,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js variable.other.constant.js entity.name.function.js"
@@ -868,7 +868,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -1108,7 +1108,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "meta.definition.property.js entity.name.function.js"
@@ -1431,7 +1431,7 @@
 				},
 				{
 					"name": "meta.arrow.js",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js"
@@ -2604,7 +2604,7 @@
 				},
 				{
 					"name": "meta.object.member.js",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.js"
@@ -2749,6 +2749,9 @@
 								}
 							]
 						},
+						{
+							"include": "#possibly-arrow-return-type"
+						},
 						{
 							"include": "#expression"
 						}
@@ -2953,7 +2956,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -3172,6 +3175,20 @@
 					"name": "keyword.operator.arithmetic.js",
 					"match": "%|\\*|/|-|\\+"
 				},
+				{
+					"begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(/)(?![/*]))",
+					"end": "(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)",
+					"endCaptures": {
+						"1": {
+							"name": "keyword.operator.arithmetic.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						}
+					]
+				},
 				{
 					"match": "(?<=[_$[:alnum:])\\]])\\s*(/)(?![/*])",
 					"captures": {
@@ -3541,7 +3558,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js"
@@ -3753,7 +3770,7 @@
 			]
 		},
 		"possibly-arrow-return-type": {
-			"begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+			"begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.arrow.js meta.return.type.arrow.js keyword.operator.type.annotation.js"
@@ -5297,7 +5314,7 @@
 			]
 		},
 		"jsx-tag-without-attributes-in-expression": {
-			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"patterns": [
 				{
@@ -5357,7 +5374,7 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"patterns": [
 				{
diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
index 2f830d70beb..067eda2d5e6 100644
--- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/f698a9826cad8235e92b7c298a5f8c9c298d8ada",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/cf7b1ec2c20b5fe28695249596128ff514e1a659",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js.jsx",
 	"patterns": [
@@ -426,7 +426,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js.jsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js.jsx entity.name.function.js.jsx"
@@ -484,7 +484,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js.jsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js.jsx variable.other.constant.js.jsx entity.name.function.js.jsx"
@@ -868,7 +868,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -1108,7 +1108,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "meta.definition.property.js.jsx entity.name.function.js.jsx"
@@ -1431,7 +1431,7 @@
 				},
 				{
 					"name": "meta.arrow.js.jsx",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js.jsx"
@@ -2604,7 +2604,7 @@
 				},
 				{
 					"name": "meta.object.member.js.jsx",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.js.jsx"
@@ -2749,6 +2749,9 @@
 								}
 							]
 						},
+						{
+							"include": "#possibly-arrow-return-type"
+						},
 						{
 							"include": "#expression"
 						}
@@ -2953,7 +2956,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -3172,6 +3175,20 @@
 					"name": "keyword.operator.arithmetic.js.jsx",
 					"match": "%|\\*|/|-|\\+"
 				},
+				{
+					"begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(/)(?![/*]))",
+					"end": "(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)",
+					"endCaptures": {
+						"1": {
+							"name": "keyword.operator.arithmetic.js.jsx"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						}
+					]
+				},
 				{
 					"match": "(?<=[_$[:alnum:])\\]])\\s*(/)(?![/*])",
 					"captures": {
@@ -3541,7 +3558,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js.jsx"
@@ -3753,7 +3770,7 @@
 			]
 		},
 		"possibly-arrow-return-type": {
-			"begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+			"begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.arrow.js.jsx meta.return.type.arrow.js.jsx keyword.operator.type.annotation.js.jsx"
@@ -5297,7 +5314,7 @@
 			]
 		},
 		"jsx-tag-without-attributes-in-expression": {
-			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"patterns": [
 				{
@@ -5357,7 +5374,7 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"patterns": [
 				{
diff --git a/extensions/json-language-features/server/.npmignore b/extensions/json-language-features/server/.npmignore
index a6661ddb7fc..3032fe8b26f 100644
--- a/extensions/json-language-features/server/.npmignore
+++ b/extensions/json-language-features/server/.npmignore
@@ -4,4 +4,7 @@ out/**/*.js.map
 src/
 test/
 tsconfig.json
-.gitignore
\ No newline at end of file
+.gitignore
+yarn.lock
+extension.webpack.config.js
+vscode-json-languageserver-*.tgz
\ No newline at end of file
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index c07dca1e441..061cb69249a 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vscode-json-languageserver",
   "description": "JSON language server",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": "Microsoft Corporation",
   "license": "MIT",
   "engines": {
@@ -24,10 +24,9 @@
     "@types/node": "^10.14.8"
   },
   "scripts": {
-    "prepublishOnly": "npm run clean && npm run test",
-    "preversion": "npm test",
-    "compile": "gulp compile-extension:json-language-features-server",
-    "watch": "gulp watch-extension:json-language-features-server",
+    "prepublishOnly": "npm run clean && npm run compile",
+    "compile": "npx gulp compile-extension:json-language-features-server",
+    "watch": "npx gulp watch-extension:json-language-features-server",
     "clean": "../../../node_modules/.bin/rimraf out",
     "install-service-next": "yarn add vscode-json-languageservice@next",
     "install-service-local": "yarn link vscode-json-languageservice",
diff --git a/extensions/markdown-language-features/media/markdown.css b/extensions/markdown-language-features/media/markdown.css
index dc12cfca001..273dc40f917 100644
--- a/extensions/markdown-language-features/media/markdown.css
+++ b/extensions/markdown-language-features/media/markdown.css
@@ -186,6 +186,7 @@ pre.hljs code > div {
 
 pre code {
 	color: var(--vscode-editor-foreground);
+	tab-size: 4;
 }
 
 
diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts
index 654812aefd8..c874f5791ed 100644
--- a/extensions/markdown-language-features/src/features/preview.ts
+++ b/extensions/markdown-language-features/src/features/preview.ts
@@ -75,7 +75,7 @@ export class PreviewDocumentVersion {
 
 export class MarkdownPreview extends Disposable {
 
-	public static viewType = 'markdown.preview';
+	public static readonly viewType = 'markdown.preview';
 
 	private _resource: vscode.Uri;
 	private _locked: boolean;
diff --git a/extensions/npm/resources/dark/continue.svg b/extensions/npm/resources/dark/continue.svg
index e6eb6041129..8b0a58eca9b 100644
--- a/extensions/npm/resources/dark/continue.svg
+++ b/extensions/npm/resources/dark/continue.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#ffffff;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14.334,8,3.667,16H3V0h.667Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M4,1.5v13L12.667,8,4,1.5Z"/></g></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2V14.4805L12.9146 8.24024L4 2ZM11.1809 8.24024L4.995 12.5684V3.91209L11.1809 8.24024Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/npm/resources/dark/debug.svg b/extensions/npm/resources/dark/debug.svg
index e211df43ef6..e4c1b7a927b 100644
--- a/extensions/npm/resources/dark/debug.svg
+++ b/extensions/npm/resources/dark/debug.svg
@@ -1,7 +1,5 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="12" height="12" style="fill:#C5C5C5;fill-opacity:1;" viewBox="0 0 512 512">
-<title></title>
-<g id="icomoon-ignore">
-</g>
-<path d="M512 288v-32h-96.645c-2.931-36.343-15.893-69.513-35.835-96.125h80.972l35.030-140.12-31.045-7.761-28.97 115.88h-87.34c-0.446-0.347-0.898-0.687-1.349-1.028 3.355-9.751 5.181-20.211 5.181-31.097 0.001-52.88-42.979-95.749-95.999-95.749s-96 42.869-96 95.75c0 10.886 1.825 21.346 5.181 31.097-0.45 0.342-0.902 0.681-1.349 1.028h-87.34l-28.97-115.88-31.045 7.761 35.030 140.12h80.972c-19.942 26.611-32.903 59.781-35.834 96.124h-96.645v32h96.685c1.901 22.832 7.754 44.406 16.819 63.875h-61.996l-35.030 140.119 31.045 7.762 28.97-115.881h56.177c29.346 39.016 73.698 63.875 123.33 63.875s93.983-24.859 123.331-63.875h56.177l28.97 115.881 31.045-7.762-35.030-140.119h-61.996c9.065-19.469 14.918-41.043 16.818-63.875h96.685z"></path>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.01996 8.50166L3.01725 8.46085C3.01812 8.47446 3.01903 8.48807 3.01996 8.50166Z" fill="#C5C5C5"/>
+<path d="M7.2577 8.90466L5.4876 7.12558L6.07922 6.53397L7.95097 8.41518L9.79605 6.57011L10.3877 7.16171L8.61769 8.93167L10.3878 10.7108L9.79619 11.3024L7.92445 9.42114L6.07936 11.2662L5.48775 10.6746L7.2577 8.90466Z" fill="#C5C5C5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.8775 3.91833V4.5H11.6624L13.3203 2.8421L13.9119 3.43371L12.3421 5.00354L12.361 5.05303C12.6914 5.91515 12.8775 6.88815 12.8775 7.91833C12.8775 8.11403 12.8708 8.30766 12.8576 8.49886L12.8546 8.5425H14.92V9.37916H12.7495L12.7434 9.41265C12.567 10.3771 12.2239 11.2564 11.7565 11.9964L11.7218 12.0515L13.7182 14.058L13.1251 14.6481L11.2153 12.7287L11.1576 12.7932C10.2949 13.7582 9.17697 14.3367 7.95917 14.3367C6.72251 14.3367 5.58881 13.7401 4.72075 12.748L4.66326 12.6823L2.79157 14.554L2.19995 13.9624L4.16317 11.9992L4.12918 11.9442C3.6785 11.2152 3.34718 10.3545 3.17494 9.41265L3.16882 9.37916H1V8.5425H3.0637L3.0607 8.49886C3.04755 8.30766 3.04084 8.11403 3.04084 7.91833C3.04084 6.90159 3.22212 5.94055 3.54446 5.08683L3.56303 5.03764L1.95216 3.41862L2.54527 2.8285L4.20835 4.5H5.04084V3.91833C5.04084 2.30658 6.34742 1 7.95917 1C9.57092 1 10.8775 2.30658 10.8775 3.91833ZM5.87751 3.91833V4.5H10.0408V3.91833C10.0408 2.76866 9.10884 1.83667 7.95917 1.83667C6.8095 1.83667 5.87751 2.76866 5.87751 3.91833ZM11.5938 5.38957L11.5739 5.33667H4.34441L4.32451 5.38957C4.0411 6.1427 3.8775 7.00011 3.8775 7.91833C3.8775 9.52826 4.38048 10.9522 5.15153 11.9546C5.9219 12.9561 6.9225 13.5 7.95917 13.5C8.99584 13.5 9.99644 12.9561 10.7668 11.9546C11.5379 10.9522 12.0408 9.52826 12.0408 7.91833C12.0408 7.00011 11.8772 6.14269 11.5938 5.38957Z" fill="#C5C5C5"/>
 </svg>
diff --git a/extensions/npm/resources/dark/prepostscript.svg b/extensions/npm/resources/dark/prepostscript.svg
index cc9bcee715a..a8c87f2d8f6 100644
--- a/extensions/npm/resources/dark/prepostscript.svg
+++ b/extensions/npm/resources/dark/prepostscript.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-bg{fill:#696969}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 5.5a5.5 5.5 0 0 1-5.5 5.5c-.275 0-.543-.027-.807-.066l-.079-.012a5.429 5.429 0 0 1-.81-.192l-4.537 4.537c-.472.473-1.1.733-1.767.733s-1.295-.26-1.768-.732a2.502 2.502 0 0 1 0-3.535l4.537-4.537a5.452 5.452 0 0 1-.191-.812c-.005-.025-.008-.051-.012-.077A5.503 5.503 0 0 1 5 5.5a5.5 5.5 0 1 1 11 0z" id="outline"/><path class="icon-vs-bg" d="M15 5.5a4.5 4.5 0 0 1-4.5 4.5c-.693 0-1.342-.17-1.929-.45l-5.01 5.01c-.293.294-.677.44-1.061.44s-.768-.146-1.061-.439a1.5 1.5 0 0 1 0-2.121l5.01-5.01A4.483 4.483 0 0 1 6 5.5 4.5 4.5 0 0 1 10.5 1c.693 0 1.342.17 1.929.45L9.636 4.243l2.121 2.121 2.793-2.793c.28.587.45 1.236.45 1.929z" id="iconBg"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.5">
+<path d="M2.80723 14.9754C2.57119 14.9721 2.33826 14.9211 2.12247 14.8254C1.90667 14.7297 1.71248 14.5913 1.55158 14.4186C1.2385 14.1334 1.04433 13.7408 1.00775 13.3189C0.966225 12.8828 1.09269 12.4473 1.36133 12.1013C2.56779 10.8289 4.9473 8.4494 6.67811 6.75479C6.30983 5.75887 6.32704 4.66127 6.72637 3.67739C7.05474 2.85876 7.63869 2.16805 8.39129 1.70807C8.9817 1.31706 9.66031 1.07944 10.3657 1.01673C11.0711 0.954022 11.7809 1.06819 12.4311 1.34892L13.0482 1.6162L10.1824 4.56738L11.4371 5.82582L14.3809 2.94887L14.6482 3.56788C14.8735 4.08976 14.993 4.65119 14.9997 5.21961C15.0064 5.78802 14.9002 6.35211 14.6872 6.87915C14.476 7.40029 14.1623 7.87368 13.7647 8.27122C13.5394 8.49169 13.2904 8.68653 13.0222 8.85218C12.4673 9.22275 11.8324 9.45636 11.1697 9.5338C10.5069 9.61124 9.83521 9.5303 9.20982 9.29764C8.11194 10.4113 5.37142 13.1704 3.89119 14.5522C3.59426 14.8219 3.20832 14.9726 2.80723 14.9754ZM10.7448 1.92802C10.087 1.92637 9.44359 2.12018 8.89614 2.48485C8.68265 2.6152 8.48437 2.76897 8.30498 2.9433C7.82789 3.42423 7.50926 4.03953 7.39182 4.70669C7.27437 5.37385 7.36374 6.06098 7.64792 6.67591L7.78342 6.97288L7.55048 7.20025C5.81224 8.89672 3.28146 11.4201 2.06479 12.7045C1.95646 12.8658 1.91012 13.0608 1.93435 13.2535C1.95857 13.4463 2.05171 13.6238 2.19657 13.7532C2.28005 13.8462 2.38177 13.9211 2.49541 13.9731C2.59557 14.0184 2.70383 14.043 2.81373 14.0455C2.98064 14.0413 3.14044 13.977 3.26383 13.8646C4.83687 12.3964 7.87622 9.32641 8.76807 8.42435L8.9973 8.19326L9.29242 8.32783C9.80618 8.56732 10.3731 8.66985 10.9382 8.62545C11.5033 8.58106 12.0473 8.39125 12.5174 8.07447C12.7313 7.9426 12.9296 7.78694 13.1085 7.61045C13.4183 7.30153 13.6631 6.93374 13.8286 6.52874C13.994 6.12375 14.0767 5.68974 14.0719 5.25228C14.0719 5.03662 14.0505 4.82148 14.0078 4.61007L11.4306 7.12508L8.87944 4.57759L11.3944 1.98834C11.1804 1.94674 10.9628 1.92653 10.7448 1.92802Z" fill="#C5C5C5"/>
+</g>
+</svg>
diff --git a/extensions/npm/resources/dark/refresh.svg b/extensions/npm/resources/dark/refresh.svg
index d79fdaa4e8e..ec0c43f0bc3 100644
--- a/extensions/npm/resources/dark/refresh.svg
+++ b/extensions/npm/resources/dark/refresh.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#2D2D30"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#C5C5C5"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.56253 2.51574C3.46348 3.45007 2 5.55411 2 7.99996C2 11.3137 4.68629 14 8 14C11.3137 14 14 11.3137 14 7.99996C14 5.32516 12.2497 3.05916 9.83199 2.28479L9.52968 3.23829C11.5429 3.88451 13 5.77207 13 7.99996C13 10.7614 10.7614 13 8 13C5.23858 13 3 10.7614 3 7.99996C3 6.31101 3.83742 4.81764 5.11969 3.91242L5.56253 2.51574Z" fill="#C5C5C5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 3H2V2H5.5L6 2.5V6H5V3Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/npm/resources/dark/script.svg b/extensions/npm/resources/dark/script.svg
index f90781897a7..7137a9d7bb5 100644
--- a/extensions/npm/resources/dark/script.svg
+++ b/extensions/npm/resources/dark/script.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-bg{fill:#c5c5c5}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 5.5a5.5 5.5 0 0 1-5.5 5.5c-.275 0-.543-.027-.807-.066l-.079-.012a5.429 5.429 0 0 1-.81-.192l-4.537 4.537c-.472.473-1.1.733-1.767.733s-1.295-.26-1.768-.732a2.502 2.502 0 0 1 0-3.535l4.537-4.537a5.452 5.452 0 0 1-.191-.812c-.005-.025-.008-.051-.012-.077A5.503 5.503 0 0 1 5 5.5a5.5 5.5 0 1 1 11 0z" id="outline"/><path class="icon-vs-bg" d="M15 5.5a4.5 4.5 0 0 1-4.5 4.5c-.693 0-1.342-.17-1.929-.45l-5.01 5.01c-.293.294-.677.44-1.061.44s-.768-.146-1.061-.439a1.5 1.5 0 0 1 0-2.121l5.01-5.01A4.483 4.483 0 0 1 6 5.5 4.5 4.5 0 0 1 10.5 1c.693 0 1.342.17 1.929.45L9.636 4.243l2.121 2.121 2.793-2.793c.28.587.45 1.236.45 1.929z" id="iconBg"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.80723 14.9754C2.57119 14.9721 2.33826 14.9211 2.12247 14.8254C1.90667 14.7297 1.71248 14.5913 1.55158 14.4186C1.2385 14.1334 1.04433 13.7408 1.00775 13.3189C0.966225 12.8828 1.09269 12.4473 1.36133 12.1013C2.56779 10.8289 4.9473 8.4494 6.67811 6.75479C6.30983 5.75887 6.32704 4.66127 6.72637 3.67739C7.05474 2.85876 7.63869 2.16805 8.39129 1.70807C8.9817 1.31706 9.66031 1.07944 10.3657 1.01673C11.0711 0.954022 11.7809 1.06819 12.4311 1.34892L13.0482 1.6162L10.1824 4.56738L11.4371 5.82582L14.3809 2.94887L14.6482 3.56788C14.8735 4.08976 14.993 4.65119 14.9997 5.21961C15.0064 5.78802 14.9002 6.35211 14.6872 6.87915C14.476 7.40029 14.1623 7.87368 13.7647 8.27122C13.5394 8.49169 13.2904 8.68653 13.0222 8.85218C12.4673 9.22275 11.8324 9.45636 11.1697 9.5338C10.5069 9.61124 9.83521 9.5303 9.20982 9.29764C8.11194 10.4113 5.37142 13.1704 3.89119 14.5522C3.59426 14.8219 3.20832 14.9726 2.80723 14.9754ZM10.7448 1.92802C10.087 1.92637 9.44359 2.12018 8.89614 2.48485C8.68265 2.6152 8.48437 2.76897 8.30498 2.9433C7.82789 3.42423 7.50926 4.03953 7.39182 4.70669C7.27438 5.37385 7.36374 6.06098 7.64792 6.67591L7.78342 6.97288L7.55048 7.20025C5.81224 8.89672 3.28146 11.4201 2.06479 12.7045C1.95646 12.8658 1.91012 13.0608 1.93435 13.2535C1.95857 13.4463 2.05171 13.6238 2.19657 13.7532C2.28005 13.8462 2.38177 13.9211 2.49541 13.9731C2.59557 14.0184 2.70383 14.043 2.81373 14.0455C2.98064 14.0413 3.14044 13.977 3.26383 13.8646C4.83687 12.3964 7.87622 9.32641 8.76807 8.42435L8.9973 8.19326L9.29242 8.32783C9.80617 8.56732 10.3731 8.66985 10.9382 8.62545C11.5033 8.58106 12.0473 8.39125 12.5174 8.07447C12.7313 7.9426 12.9296 7.78694 13.1085 7.61045C13.4183 7.30153 13.6631 6.93374 13.8286 6.52874C13.994 6.12375 14.0767 5.68974 14.0719 5.25228C14.0719 5.03662 14.0505 4.82148 14.0078 4.61007L11.4306 7.12508L8.87944 4.57759L11.3944 1.98834C11.1804 1.94674 10.9628 1.92653 10.7448 1.92802Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/npm/resources/light/continue.svg b/extensions/npm/resources/light/continue.svg
index a4dd1cd3ca8..2563bfa114b 100644
--- a/extensions/npm/resources/light/continue.svg
+++ b/extensions/npm/resources/light/continue.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#000000;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14.334,8,3.667,16H3V0h.667Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M4,1.5v13L12.667,8,4,1.5Z"/></g></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2V14.4805L12.9146 8.24024L4 2ZM11.1809 8.24024L4.995 12.5684V3.91209L11.1809 8.24024Z" fill="#424242"/>
+</svg>
diff --git a/extensions/npm/resources/light/debug.svg b/extensions/npm/resources/light/debug.svg
index b8efb1c8f77..81a5ffb6b11 100644
--- a/extensions/npm/resources/light/debug.svg
+++ b/extensions/npm/resources/light/debug.svg
@@ -1,7 +1,5 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="12" height="12" style="fill:#464D46;fill-opacity:1;" viewBox="0 0 512 512">
-<title></title>
-<g id="icomoon-ignore">
-</g>
-<path d="M512 288v-32h-96.645c-2.931-36.343-15.893-69.513-35.835-96.125h80.972l35.030-140.12-31.045-7.761-28.97 115.88h-87.34c-0.446-0.347-0.898-0.687-1.349-1.028 3.355-9.751 5.181-20.211 5.181-31.097 0.001-52.88-42.979-95.749-95.999-95.749s-96 42.869-96 95.75c0 10.886 1.825 21.346 5.181 31.097-0.45 0.342-0.902 0.681-1.349 1.028h-87.34l-28.97-115.88-31.045 7.761 35.030 140.12h80.972c-19.942 26.611-32.903 59.781-35.834 96.124h-96.645v32h96.685c1.901 22.832 7.754 44.406 16.819 63.875h-61.996l-35.030 140.119 31.045 7.762 28.97-115.881h56.177c29.346 39.016 73.698 63.875 123.33 63.875s93.983-24.859 123.331-63.875h56.177l28.97 115.881 31.045-7.762-35.030-140.119h-61.996c9.065-19.469 14.918-41.043 16.818-63.875h96.685z"></path>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.01996 8.50166L3.01725 8.46085C3.01812 8.47446 3.01903 8.48807 3.01996 8.50166Z" fill="#424242"/>
+<path d="M7.2577 8.90466L5.4876 7.12558L6.07922 6.53397L7.95097 8.41518L9.79605 6.57011L10.3877 7.16171L8.61769 8.93167L10.3878 10.7108L9.79619 11.3024L7.92445 9.42114L6.07936 11.2662L5.48775 10.6746L7.2577 8.90466Z" fill="#424242"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.8775 3.91833V4.5H11.6624L13.3203 2.8421L13.9119 3.43371L12.3421 5.00354L12.361 5.05303C12.6914 5.91515 12.8775 6.88815 12.8775 7.91833C12.8775 8.11403 12.8708 8.30766 12.8576 8.49886L12.8546 8.5425H14.92V9.37916H12.7495L12.7434 9.41265C12.567 10.3771 12.2239 11.2564 11.7565 11.9964L11.7218 12.0515L13.7182 14.058L13.1251 14.6481L11.2153 12.7287L11.1576 12.7932C10.2949 13.7582 9.17697 14.3367 7.95917 14.3367C6.72251 14.3367 5.58881 13.7401 4.72075 12.748L4.66326 12.6823L2.79157 14.554L2.19995 13.9624L4.16317 11.9992L4.12918 11.9442C3.6785 11.2152 3.34718 10.3545 3.17494 9.41265L3.16882 9.37916H1V8.5425H3.0637L3.0607 8.49886C3.04755 8.30766 3.04084 8.11403 3.04084 7.91833C3.04084 6.90159 3.22212 5.94055 3.54446 5.08683L3.56303 5.03764L1.95216 3.41862L2.54527 2.8285L4.20835 4.5H5.04084V3.91833C5.04084 2.30658 6.34742 1 7.95917 1C9.57092 1 10.8775 2.30658 10.8775 3.91833ZM5.87751 3.91833V4.5H10.0408V3.91833C10.0408 2.76866 9.10884 1.83667 7.95917 1.83667C6.8095 1.83667 5.87751 2.76866 5.87751 3.91833ZM11.5938 5.38957L11.5739 5.33667H4.34441L4.32451 5.38957C4.0411 6.1427 3.8775 7.00011 3.8775 7.91833C3.8775 9.52826 4.38048 10.9522 5.15153 11.9546C5.9219 12.9561 6.9225 13.5 7.95917 13.5C8.99584 13.5 9.99644 12.9561 10.7668 11.9546C11.5379 10.9522 12.0408 9.52826 12.0408 7.91833C12.0408 7.00011 11.8772 6.14269 11.5938 5.38957Z" fill="#424242"/>
 </svg>
diff --git a/extensions/npm/resources/light/prepostscript.svg b/extensions/npm/resources/light/prepostscript.svg
index e59d80cd323..87eb59e12a6 100644
--- a/extensions/npm/resources/light/prepostscript.svg
+++ b/extensions/npm/resources/light/prepostscript.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#D3D3D3}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 5.5a5.5 5.5 0 0 1-5.5 5.5c-.275 0-.543-.027-.807-.066l-.079-.012a5.429 5.429 0 0 1-.81-.192l-4.537 4.537c-.472.473-1.1.733-1.767.733s-1.295-.26-1.768-.732a2.502 2.502 0 0 1 0-3.535l4.537-4.537a5.452 5.452 0 0 1-.191-.812c-.005-.025-.008-.051-.012-.077A5.503 5.503 0 0 1 5 5.5a5.5 5.5 0 1 1 11 0z" id="outline"/><path class="icon-vs-bg" d="M15 5.5a4.5 4.5 0 0 1-4.5 4.5c-.693 0-1.342-.17-1.929-.45l-5.01 5.01c-.293.294-.677.44-1.061.44s-.768-.146-1.061-.439a1.5 1.5 0 0 1 0-2.121l5.01-5.01A4.483 4.483 0 0 1 6 5.5 4.5 4.5 0 0 1 10.5 1c.693 0 1.342.17 1.929.45L9.636 4.243l2.121 2.121 2.793-2.793c.28.587.45 1.236.45 1.929z" id="iconBg"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.5">
+<path d="M2.80723 14.9754C2.57119 14.9721 2.33826 14.9211 2.12247 14.8254C1.90667 14.7297 1.71248 14.5913 1.55158 14.4186C1.2385 14.1334 1.04433 13.7408 1.00775 13.3189C0.966225 12.8828 1.09269 12.4473 1.36133 12.1013C2.56779 10.8289 4.9473 8.4494 6.67811 6.75479C6.30983 5.75887 6.32704 4.66127 6.72637 3.67739C7.05474 2.85876 7.63869 2.16805 8.39129 1.70807C8.9817 1.31706 9.66031 1.07944 10.3657 1.01673C11.0711 0.954022 11.7809 1.06819 12.4311 1.34892L13.0482 1.6162L10.1824 4.56738L11.4371 5.82582L14.3809 2.94887L14.6482 3.56788C14.8735 4.08976 14.993 4.65119 14.9997 5.21961C15.0064 5.78802 14.9002 6.35211 14.6872 6.87915C14.476 7.40029 14.1623 7.87368 13.7647 8.27122C13.5394 8.49169 13.2904 8.68653 13.0222 8.85218C12.4673 9.22275 11.8324 9.45636 11.1697 9.5338C10.5069 9.61124 9.83521 9.5303 9.20982 9.29764C8.11194 10.4113 5.37142 13.1704 3.89119 14.5522C3.59426 14.8219 3.20832 14.9726 2.80723 14.9754ZM10.7448 1.92802C10.087 1.92637 9.44359 2.12018 8.89614 2.48485C8.68265 2.6152 8.48437 2.76897 8.30498 2.9433C7.82789 3.42423 7.50926 4.03953 7.39182 4.70669C7.27437 5.37385 7.36374 6.06098 7.64792 6.67591L7.78342 6.97288L7.55048 7.20025C5.81224 8.89672 3.28146 11.4201 2.06479 12.7045C1.95646 12.8658 1.91012 13.0608 1.93435 13.2535C1.95857 13.4463 2.05171 13.6238 2.19657 13.7532C2.28005 13.8462 2.38177 13.9211 2.49541 13.9731C2.59557 14.0184 2.70383 14.043 2.81373 14.0455C2.98064 14.0413 3.14044 13.977 3.26383 13.8646C4.83687 12.3964 7.87622 9.32641 8.76807 8.42435L8.9973 8.19326L9.29242 8.32783C9.80618 8.56732 10.3731 8.66985 10.9382 8.62545C11.5033 8.58106 12.0473 8.39125 12.5174 8.07447C12.7313 7.9426 12.9296 7.78694 13.1085 7.61045C13.4183 7.30153 13.6631 6.93374 13.8286 6.52874C13.994 6.12375 14.0767 5.68974 14.0719 5.25228C14.0719 5.03662 14.0505 4.82148 14.0078 4.61007L11.4306 7.12508L8.87944 4.57759L11.3944 1.98834C11.1804 1.94674 10.9628 1.92653 10.7448 1.92802Z" fill="#424242"/>
+</g>
+</svg>
diff --git a/extensions/npm/resources/light/refresh.svg b/extensions/npm/resources/light/refresh.svg
index e0345748192..a5b88123a0e 100644
--- a/extensions/npm/resources/light/refresh.svg
+++ b/extensions/npm/resources/light/refresh.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#F6F6F6"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#424242"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.56253 2.51574C3.46348 3.45007 2 5.55411 2 7.99996C2 11.3137 4.68629 14 8 14C11.3137 14 14 11.3137 14 7.99996C14 5.32516 12.2497 3.05916 9.83199 2.28479L9.52968 3.23829C11.5429 3.88451 13 5.77207 13 7.99996C13 10.7614 10.7614 13 8 13C5.23858 13 3 10.7614 3 7.99996C3 6.31101 3.83742 4.81764 5.11969 3.91242L5.56253 2.51574Z" fill="#424242"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 3H2V2H5.5L6 2.5V6H5V3Z" fill="#424242"/>
+</svg>
diff --git a/extensions/npm/resources/light/script.svg b/extensions/npm/resources/light/script.svg
index fb1c74cf773..60f77501db7 100644
--- a/extensions/npm/resources/light/script.svg
+++ b/extensions/npm/resources/light/script.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 5.5a5.5 5.5 0 0 1-5.5 5.5c-.275 0-.543-.027-.807-.066l-.079-.012a5.429 5.429 0 0 1-.81-.192l-4.537 4.537c-.472.473-1.1.733-1.767.733s-1.295-.26-1.768-.732a2.502 2.502 0 0 1 0-3.535l4.537-4.537a5.452 5.452 0 0 1-.191-.812c-.005-.025-.008-.051-.012-.077A5.503 5.503 0 0 1 5 5.5a5.5 5.5 0 1 1 11 0z" id="outline"/><path class="icon-vs-bg" d="M15 5.5a4.5 4.5 0 0 1-4.5 4.5c-.693 0-1.342-.17-1.929-.45l-5.01 5.01c-.293.294-.677.44-1.061.44s-.768-.146-1.061-.439a1.5 1.5 0 0 1 0-2.121l5.01-5.01A4.483 4.483 0 0 1 6 5.5 4.5 4.5 0 0 1 10.5 1c.693 0 1.342.17 1.929.45L9.636 4.243l2.121 2.121 2.793-2.793c.28.587.45 1.236.45 1.929z" id="iconBg"/></svg>
\ No newline at end of file
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.80723 14.9754C2.57119 14.9721 2.33826 14.9211 2.12247 14.8254C1.90667 14.7297 1.71248 14.5913 1.55158 14.4186C1.2385 14.1334 1.04433 13.7408 1.00775 13.3189C0.966225 12.8828 1.09269 12.4473 1.36133 12.1013C2.56779 10.8289 4.9473 8.4494 6.67811 6.75479C6.30983 5.75887 6.32704 4.66127 6.72637 3.67739C7.05474 2.85876 7.63869 2.16805 8.39129 1.70807C8.9817 1.31706 9.66031 1.07944 10.3657 1.01673C11.0711 0.954022 11.7809 1.06819 12.4311 1.34892L13.0482 1.6162L10.1824 4.56738L11.4371 5.82582L14.3809 2.94887L14.6482 3.56788C14.8735 4.08976 14.993 4.65119 14.9997 5.21961C15.0064 5.78802 14.9002 6.35211 14.6872 6.87915C14.476 7.40029 14.1623 7.87368 13.7647 8.27122C13.5394 8.49169 13.2904 8.68653 13.0222 8.85218C12.4673 9.22275 11.8324 9.45636 11.1697 9.5338C10.5069 9.61124 9.83521 9.5303 9.20982 9.29764C8.11194 10.4113 5.37142 13.1704 3.89119 14.5522C3.59426 14.8219 3.20832 14.9726 2.80723 14.9754ZM10.7448 1.92802C10.087 1.92637 9.44359 2.12018 8.89614 2.48485C8.68265 2.6152 8.48437 2.76897 8.30498 2.9433C7.82789 3.42423 7.50926 4.03953 7.39182 4.70669C7.27438 5.37385 7.36374 6.06098 7.64792 6.67591L7.78342 6.97288L7.55048 7.20025C5.81224 8.89672 3.28146 11.4201 2.06479 12.7045C1.95646 12.8658 1.91012 13.0608 1.93435 13.2535C1.95857 13.4463 2.05171 13.6238 2.19657 13.7532C2.28005 13.8462 2.38177 13.9211 2.49541 13.9731C2.59557 14.0184 2.70383 14.043 2.81373 14.0455C2.98064 14.0413 3.14044 13.977 3.26383 13.8646C4.83687 12.3964 7.87622 9.32641 8.76807 8.42435L8.9973 8.19326L9.29242 8.32783C9.80617 8.56732 10.3731 8.66985 10.9382 8.62545C11.5033 8.58106 12.0473 8.39125 12.5174 8.07447C12.7313 7.9426 12.9296 7.78694 13.1085 7.61045C13.4183 7.30153 13.6631 6.93374 13.8286 6.52874C13.994 6.12375 14.0767 5.68974 14.0719 5.25228C14.0719 5.03662 14.0505 4.82148 14.0078 4.61007L11.4306 7.12508L8.87944 4.57759L11.3944 1.98834C11.1804 1.94674 10.9628 1.92653 10.7448 1.92802Z" fill="#424242"/>
+</svg>
diff --git a/extensions/theme-seti/build/update-icon-theme.js b/extensions/theme-seti/build/update-icon-theme.js
index c60de74fe2c..6819e853339 100644
--- a/extensions/theme-seti/build/update-icon-theme.js
+++ b/extensions/theme-seti/build/update-icon-theme.js
@@ -10,7 +10,7 @@ let fs = require('fs');
 let https = require('https');
 let url = require('url');
 
-// list of languagesIs not shipped with VSCode. The information is used to associate an icon with a langauge association
+// list of languagesIs not shipped with VSCode. The information is used to associate an icon with a language association
 let nonBuiltInLanguages = { // { fileNames, extensions }
 	"r": { extensions: ['r', 'rhistory', 'rprofile', 'rt'] },
 	"argdown": { extensions: ['ad', 'adown', 'argdown', 'argdn'] },
@@ -35,7 +35,7 @@ let nonBuiltInLanguages = { // { fileNames, extensions }
 	"todo": { fileNames: ['todo'] }
 };
 
-let FROM_DISK = false; // set to true to take content from a repo checkedout next to the vscode repo
+let FROM_DISK = true; // set to true to take content from a repo checked out next to the vscode repo
 
 let font, fontMappingsFile, fileAssociationFile, colorsFile;
 if (!FROM_DISK) {
diff --git a/extensions/theme-seti/cgmanifest.json b/extensions/theme-seti/cgmanifest.json
index 2b449830f50..c742c019ea3 100644
--- a/extensions/theme-seti/cgmanifest.json
+++ b/extensions/theme-seti/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "seti-ui",
 					"repositoryUrl": "https://github.com/jesseweed/seti-ui",
-					"commitHash": "89175d7f9e0c70cd325b80a18a3c77fc8eb7c798"
+					"commitHash": "904c16acced1134a81b31d71d60293288c31334b"
 				}
 			},
 			"version": "0.1.0"
diff --git a/extensions/theme-seti/icons/seti.woff b/extensions/theme-seti/icons/seti.woff
index e590d77f684..b85727d01e4 100644
Binary files a/extensions/theme-seti/icons/seti.woff and b/extensions/theme-seti/icons/seti.woff differ
diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json
index 4aec2074092..2b5d276a515 100644
--- a/extensions/theme-seti/icons/vs-seti-icon-theme.json
+++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json
@@ -206,6 +206,14 @@
 			"fontCharacter": "\\E017",
 			"fontColor": "#a074c4"
 		},
+		"_cpp_2_light": {
+			"fontCharacter": "\\E017",
+			"fontColor": "#b7b73b"
+		},
+		"_cpp_2": {
+			"fontCharacter": "\\E017",
+			"fontColor": "#cbcb41"
+		},
 		"_crystal_light": {
 			"fontCharacter": "\\E018",
 			"fontColor": "#bfc2c1"
@@ -246,999 +254,1103 @@
 			"fontCharacter": "\\E01C",
 			"fontColor": "#cc3e44"
 		},
-		"_db_light": {
+		"_dart_light": {
 			"fontCharacter": "\\E01D",
+			"fontColor": "#498ba7"
+		},
+		"_dart": {
+			"fontCharacter": "\\E01D",
+			"fontColor": "#519aba"
+		},
+		"_db_light": {
+			"fontCharacter": "\\E01E",
 			"fontColor": "#dd4b78"
 		},
 		"_db": {
-			"fontCharacter": "\\E01D",
+			"fontCharacter": "\\E01E",
 			"fontColor": "#f55385"
 		},
 		"_default_light": {
-			"fontCharacter": "\\E01E",
+			"fontCharacter": "\\E01F",
 			"fontColor": "#bfc2c1"
 		},
 		"_default": {
-			"fontCharacter": "\\E01E",
+			"fontCharacter": "\\E01F",
 			"fontColor": "#d4d7d6"
 		},
 		"_docker_light": {
-			"fontCharacter": "\\E020",
+			"fontCharacter": "\\E021",
 			"fontColor": "#498ba7"
 		},
 		"_docker": {
-			"fontCharacter": "\\E020",
+			"fontCharacter": "\\E021",
 			"fontColor": "#519aba"
 		},
 		"_docker_1_light": {
-			"fontCharacter": "\\E020",
+			"fontCharacter": "\\E021",
 			"fontColor": "#455155"
 		},
 		"_docker_1": {
-			"fontCharacter": "\\E020",
+			"fontCharacter": "\\E021",
 			"fontColor": "#4d5a5e"
 		},
 		"_docker_2_light": {
-			"fontCharacter": "\\E020",
+			"fontCharacter": "\\E021",
 			"fontColor": "#7fae42"
 		},
 		"_docker_2": {
-			"fontCharacter": "\\E020",
+			"fontCharacter": "\\E021",
 			"fontColor": "#8dc149"
 		},
 		"_docker_3_light": {
-			"fontCharacter": "\\E020",
+			"fontCharacter": "\\E021",
 			"fontColor": "#dd4b78"
 		},
 		"_docker_3": {
-			"fontCharacter": "\\E020",
+			"fontCharacter": "\\E021",
 			"fontColor": "#f55385"
 		},
 		"_ejs_light": {
-			"fontCharacter": "\\E022",
+			"fontCharacter": "\\E023",
 			"fontColor": "#b7b73b"
 		},
 		"_ejs": {
-			"fontCharacter": "\\E022",
+			"fontCharacter": "\\E023",
 			"fontColor": "#cbcb41"
 		},
 		"_elixir_light": {
-			"fontCharacter": "\\E023",
+			"fontCharacter": "\\E024",
 			"fontColor": "#9068b0"
 		},
 		"_elixir": {
-			"fontCharacter": "\\E023",
+			"fontCharacter": "\\E024",
 			"fontColor": "#a074c4"
 		},
 		"_elixir_script_light": {
-			"fontCharacter": "\\E024",
+			"fontCharacter": "\\E025",
 			"fontColor": "#9068b0"
 		},
 		"_elixir_script": {
-			"fontCharacter": "\\E024",
+			"fontCharacter": "\\E025",
 			"fontColor": "#a074c4"
 		},
 		"_elm_light": {
-			"fontCharacter": "\\E025",
+			"fontCharacter": "\\E026",
 			"fontColor": "#498ba7"
 		},
 		"_elm": {
-			"fontCharacter": "\\E025",
+			"fontCharacter": "\\E026",
 			"fontColor": "#519aba"
 		},
 		"_eslint_light": {
-			"fontCharacter": "\\E027",
+			"fontCharacter": "\\E028",
 			"fontColor": "#9068b0"
 		},
 		"_eslint": {
-			"fontCharacter": "\\E027",
+			"fontCharacter": "\\E028",
 			"fontColor": "#a074c4"
 		},
 		"_eslint_1_light": {
-			"fontCharacter": "\\E027",
+			"fontCharacter": "\\E028",
 			"fontColor": "#455155"
 		},
 		"_eslint_1": {
-			"fontCharacter": "\\E027",
+			"fontCharacter": "\\E028",
 			"fontColor": "#4d5a5e"
 		},
 		"_ethereum_light": {
-			"fontCharacter": "\\E028",
+			"fontCharacter": "\\E029",
 			"fontColor": "#498ba7"
 		},
 		"_ethereum": {
-			"fontCharacter": "\\E028",
+			"fontCharacter": "\\E029",
 			"fontColor": "#519aba"
 		},
 		"_f-sharp_light": {
-			"fontCharacter": "\\E029",
+			"fontCharacter": "\\E02A",
 			"fontColor": "#498ba7"
 		},
 		"_f-sharp": {
-			"fontCharacter": "\\E029",
+			"fontCharacter": "\\E02A",
 			"fontColor": "#519aba"
 		},
 		"_favicon_light": {
-			"fontCharacter": "\\E02A",
+			"fontCharacter": "\\E02B",
 			"fontColor": "#b7b73b"
 		},
 		"_favicon": {
-			"fontCharacter": "\\E02A",
+			"fontCharacter": "\\E02B",
 			"fontColor": "#cbcb41"
 		},
 		"_firebase_light": {
-			"fontCharacter": "\\E02B",
+			"fontCharacter": "\\E02C",
 			"fontColor": "#cc6d2e"
 		},
 		"_firebase": {
-			"fontCharacter": "\\E02B",
+			"fontCharacter": "\\E02C",
 			"fontColor": "#e37933"
 		},
 		"_firefox_light": {
-			"fontCharacter": "\\E02C",
+			"fontCharacter": "\\E02D",
 			"fontColor": "#cc6d2e"
 		},
 		"_firefox": {
-			"fontCharacter": "\\E02C",
+			"fontCharacter": "\\E02D",
 			"fontColor": "#e37933"
 		},
 		"_font_light": {
-			"fontCharacter": "\\E02E",
+			"fontCharacter": "\\E02F",
 			"fontColor": "#b8383d"
 		},
 		"_font": {
-			"fontCharacter": "\\E02E",
+			"fontCharacter": "\\E02F",
 			"fontColor": "#cc3e44"
 		},
 		"_git_light": {
-			"fontCharacter": "\\E02F",
+			"fontCharacter": "\\E030",
 			"fontColor": "#3b4b52"
 		},
 		"_git": {
-			"fontCharacter": "\\E02F",
+			"fontCharacter": "\\E030",
 			"fontColor": "#41535b"
 		},
 		"_go_light": {
-			"fontCharacter": "\\E033",
+			"fontCharacter": "\\E034",
 			"fontColor": "#498ba7"
 		},
 		"_go": {
-			"fontCharacter": "\\E033",
+			"fontCharacter": "\\E034",
 			"fontColor": "#519aba"
 		},
 		"_go2_light": {
-			"fontCharacter": "\\E034",
+			"fontCharacter": "\\E035",
 			"fontColor": "#498ba7"
 		},
 		"_go2": {
-			"fontCharacter": "\\E034",
+			"fontCharacter": "\\E035",
 			"fontColor": "#519aba"
 		},
 		"_gradle_light": {
-			"fontCharacter": "\\E035",
+			"fontCharacter": "\\E036",
 			"fontColor": "#7fae42"
 		},
 		"_gradle": {
-			"fontCharacter": "\\E035",
+			"fontCharacter": "\\E036",
 			"fontColor": "#8dc149"
 		},
 		"_grails_light": {
-			"fontCharacter": "\\E036",
+			"fontCharacter": "\\E037",
 			"fontColor": "#7fae42"
 		},
 		"_grails": {
-			"fontCharacter": "\\E036",
+			"fontCharacter": "\\E037",
 			"fontColor": "#8dc149"
 		},
+		"_graphql_light": {
+			"fontCharacter": "\\E038",
+			"fontColor": "#dd4b78"
+		},
+		"_graphql": {
+			"fontCharacter": "\\E038",
+			"fontColor": "#f55385"
+		},
 		"_grunt_light": {
-			"fontCharacter": "\\E037",
+			"fontCharacter": "\\E039",
 			"fontColor": "#cc6d2e"
 		},
 		"_grunt": {
-			"fontCharacter": "\\E037",
+			"fontCharacter": "\\E039",
 			"fontColor": "#e37933"
 		},
 		"_gulp_light": {
-			"fontCharacter": "\\E038",
+			"fontCharacter": "\\E03A",
 			"fontColor": "#b8383d"
 		},
 		"_gulp": {
-			"fontCharacter": "\\E038",
+			"fontCharacter": "\\E03A",
 			"fontColor": "#cc3e44"
 		},
 		"_haml_light": {
-			"fontCharacter": "\\E03A",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#b8383d"
 		},
 		"_haml": {
-			"fontCharacter": "\\E03A",
+			"fontCharacter": "\\E03C",
 			"fontColor": "#cc3e44"
 		},
+		"_happenings_light": {
+			"fontCharacter": "\\E03D",
+			"fontColor": "#498ba7"
+		},
+		"_happenings": {
+			"fontCharacter": "\\E03D",
+			"fontColor": "#519aba"
+		},
 		"_haskell_light": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03E",
 			"fontColor": "#9068b0"
 		},
 		"_haskell": {
-			"fontCharacter": "\\E03B",
+			"fontCharacter": "\\E03E",
 			"fontColor": "#a074c4"
 		},
 		"_haxe_light": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#cc6d2e"
 		},
 		"_haxe": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#e37933"
 		},
 		"_haxe_1_light": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#b7b73b"
 		},
 		"_haxe_1": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#cbcb41"
 		},
 		"_haxe_2_light": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#498ba7"
 		},
 		"_haxe_2": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#519aba"
 		},
 		"_haxe_3_light": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#9068b0"
 		},
 		"_haxe_3": {
-			"fontCharacter": "\\E03C",
+			"fontCharacter": "\\E03F",
 			"fontColor": "#a074c4"
 		},
 		"_heroku_light": {
-			"fontCharacter": "\\E03D",
+			"fontCharacter": "\\E040",
 			"fontColor": "#9068b0"
 		},
 		"_heroku": {
-			"fontCharacter": "\\E03D",
+			"fontCharacter": "\\E040",
 			"fontColor": "#a074c4"
 		},
 		"_hex_light": {
-			"fontCharacter": "\\E03E",
+			"fontCharacter": "\\E041",
 			"fontColor": "#b8383d"
 		},
 		"_hex": {
-			"fontCharacter": "\\E03E",
+			"fontCharacter": "\\E041",
 			"fontColor": "#cc3e44"
 		},
 		"_html_light": {
-			"fontCharacter": "\\E03F",
-			"fontColor": "#cc6d2e"
+			"fontCharacter": "\\E042",
+			"fontColor": "#498ba7"
 		},
 		"_html": {
-			"fontCharacter": "\\E03F",
+			"fontCharacter": "\\E042",
+			"fontColor": "#519aba"
+		},
+		"_html_1_light": {
+			"fontCharacter": "\\E042",
+			"fontColor": "#7fae42"
+		},
+		"_html_1": {
+			"fontCharacter": "\\E042",
+			"fontColor": "#8dc149"
+		},
+		"_html_2_light": {
+			"fontCharacter": "\\E042",
+			"fontColor": "#b7b73b"
+		},
+		"_html_2": {
+			"fontCharacter": "\\E042",
+			"fontColor": "#cbcb41"
+		},
+		"_html_3_light": {
+			"fontCharacter": "\\E042",
+			"fontColor": "#cc6d2e"
+		},
+		"_html_3": {
+			"fontCharacter": "\\E042",
 			"fontColor": "#e37933"
 		},
 		"_html_erb_light": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E043",
 			"fontColor": "#b8383d"
 		},
 		"_html_erb": {
-			"fontCharacter": "\\E040",
+			"fontCharacter": "\\E043",
 			"fontColor": "#cc3e44"
 		},
 		"_ignored_light": {
-			"fontCharacter": "\\E041",
+			"fontCharacter": "\\E044",
 			"fontColor": "#3b4b52"
 		},
 		"_ignored": {
-			"fontCharacter": "\\E041",
+			"fontCharacter": "\\E044",
 			"fontColor": "#41535b"
 		},
 		"_illustrator_light": {
-			"fontCharacter": "\\E042",
+			"fontCharacter": "\\E045",
 			"fontColor": "#b7b73b"
 		},
 		"_illustrator": {
-			"fontCharacter": "\\E042",
+			"fontCharacter": "\\E045",
 			"fontColor": "#cbcb41"
 		},
 		"_image_light": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E046",
 			"fontColor": "#9068b0"
 		},
 		"_image": {
-			"fontCharacter": "\\E043",
+			"fontCharacter": "\\E046",
 			"fontColor": "#a074c4"
 		},
 		"_info_light": {
-			"fontCharacter": "\\E044",
+			"fontCharacter": "\\E047",
 			"fontColor": "#498ba7"
 		},
 		"_info": {
-			"fontCharacter": "\\E044",
+			"fontCharacter": "\\E047",
 			"fontColor": "#519aba"
 		},
 		"_ionic_light": {
-			"fontCharacter": "\\E045",
+			"fontCharacter": "\\E048",
 			"fontColor": "#498ba7"
 		},
 		"_ionic": {
-			"fontCharacter": "\\E045",
+			"fontCharacter": "\\E048",
 			"fontColor": "#519aba"
 		},
 		"_jade_light": {
-			"fontCharacter": "\\E046",
+			"fontCharacter": "\\E049",
 			"fontColor": "#b8383d"
 		},
 		"_jade": {
-			"fontCharacter": "\\E046",
+			"fontCharacter": "\\E049",
 			"fontColor": "#cc3e44"
 		},
 		"_java_light": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E04A",
 			"fontColor": "#b8383d"
 		},
 		"_java": {
-			"fontCharacter": "\\E047",
+			"fontCharacter": "\\E04A",
 			"fontColor": "#cc3e44"
 		},
 		"_javascript_light": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E04B",
 			"fontColor": "#b7b73b"
 		},
 		"_javascript": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E04B",
 			"fontColor": "#cbcb41"
 		},
 		"_javascript_1_light": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E04B",
 			"fontColor": "#cc6d2e"
 		},
 		"_javascript_1": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E04B",
 			"fontColor": "#e37933"
 		},
 		"_javascript_2_light": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E04B",
 			"fontColor": "#498ba7"
 		},
 		"_javascript_2": {
-			"fontCharacter": "\\E048",
+			"fontCharacter": "\\E04B",
 			"fontColor": "#519aba"
 		},
 		"_jenkins_light": {
-			"fontCharacter": "\\E049",
+			"fontCharacter": "\\E04C",
 			"fontColor": "#b8383d"
 		},
 		"_jenkins": {
-			"fontCharacter": "\\E049",
+			"fontCharacter": "\\E04C",
 			"fontColor": "#cc3e44"
 		},
 		"_jinja_light": {
-			"fontCharacter": "\\E04A",
+			"fontCharacter": "\\E04D",
 			"fontColor": "#b8383d"
 		},
 		"_jinja": {
-			"fontCharacter": "\\E04A",
+			"fontCharacter": "\\E04D",
 			"fontColor": "#cc3e44"
 		},
 		"_json_light": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04F",
 			"fontColor": "#b7b73b"
 		},
 		"_json": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04F",
 			"fontColor": "#cbcb41"
 		},
 		"_json_1_light": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04F",
 			"fontColor": "#7fae42"
 		},
 		"_json_1": {
-			"fontCharacter": "\\E04C",
+			"fontCharacter": "\\E04F",
 			"fontColor": "#8dc149"
 		},
 		"_julia_light": {
-			"fontCharacter": "\\E04D",
+			"fontCharacter": "\\E050",
 			"fontColor": "#9068b0"
 		},
 		"_julia": {
-			"fontCharacter": "\\E04D",
+			"fontCharacter": "\\E050",
 			"fontColor": "#a074c4"
 		},
 		"_karma_light": {
-			"fontCharacter": "\\E04E",
+			"fontCharacter": "\\E051",
 			"fontColor": "#7fae42"
 		},
 		"_karma": {
-			"fontCharacter": "\\E04E",
+			"fontCharacter": "\\E051",
 			"fontColor": "#8dc149"
 		},
 		"_kotlin_light": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E052",
 			"fontColor": "#cc6d2e"
 		},
 		"_kotlin": {
-			"fontCharacter": "\\E04F",
+			"fontCharacter": "\\E052",
 			"fontColor": "#e37933"
 		},
 		"_less_light": {
-			"fontCharacter": "\\E050",
+			"fontCharacter": "\\E053",
 			"fontColor": "#498ba7"
 		},
 		"_less": {
-			"fontCharacter": "\\E050",
+			"fontCharacter": "\\E053",
 			"fontColor": "#519aba"
 		},
 		"_license_light": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E054",
 			"fontColor": "#b7b73b"
 		},
 		"_license": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E054",
 			"fontColor": "#cbcb41"
 		},
 		"_license_1_light": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E054",
 			"fontColor": "#cc6d2e"
 		},
 		"_license_1": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E054",
 			"fontColor": "#e37933"
 		},
 		"_license_2_light": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E054",
 			"fontColor": "#b8383d"
 		},
 		"_license_2": {
-			"fontCharacter": "\\E051",
+			"fontCharacter": "\\E054",
 			"fontColor": "#cc3e44"
 		},
 		"_liquid_light": {
-			"fontCharacter": "\\E052",
+			"fontCharacter": "\\E055",
 			"fontColor": "#7fae42"
 		},
 		"_liquid": {
-			"fontCharacter": "\\E052",
+			"fontCharacter": "\\E055",
 			"fontColor": "#8dc149"
 		},
 		"_livescript_light": {
-			"fontCharacter": "\\E053",
+			"fontCharacter": "\\E056",
 			"fontColor": "#498ba7"
 		},
 		"_livescript": {
-			"fontCharacter": "\\E053",
+			"fontCharacter": "\\E056",
 			"fontColor": "#519aba"
 		},
 		"_lock_light": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E057",
 			"fontColor": "#7fae42"
 		},
 		"_lock": {
-			"fontCharacter": "\\E054",
+			"fontCharacter": "\\E057",
 			"fontColor": "#8dc149"
 		},
 		"_lua_light": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E058",
 			"fontColor": "#498ba7"
 		},
 		"_lua": {
-			"fontCharacter": "\\E055",
+			"fontCharacter": "\\E058",
 			"fontColor": "#519aba"
 		},
 		"_makefile_light": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E059",
 			"fontColor": "#cc6d2e"
 		},
 		"_makefile": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E059",
 			"fontColor": "#e37933"
 		},
 		"_makefile_1_light": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E059",
 			"fontColor": "#9068b0"
 		},
 		"_makefile_1": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E059",
 			"fontColor": "#a074c4"
 		},
 		"_makefile_2_light": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E059",
 			"fontColor": "#627379"
 		},
 		"_makefile_2": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E059",
 			"fontColor": "#6d8086"
 		},
 		"_makefile_3_light": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E059",
 			"fontColor": "#498ba7"
 		},
 		"_makefile_3": {
-			"fontCharacter": "\\E056",
+			"fontCharacter": "\\E059",
 			"fontColor": "#519aba"
 		},
 		"_markdown_light": {
-			"fontCharacter": "\\E057",
+			"fontCharacter": "\\E05A",
 			"fontColor": "#498ba7"
 		},
 		"_markdown": {
-			"fontCharacter": "\\E057",
+			"fontCharacter": "\\E05A",
 			"fontColor": "#519aba"
 		},
 		"_maven_light": {
-			"fontCharacter": "\\E058",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#b8383d"
 		},
 		"_maven": {
-			"fontCharacter": "\\E058",
+			"fontCharacter": "\\E05B",
 			"fontColor": "#cc3e44"
 		},
 		"_mdo_light": {
-			"fontCharacter": "\\E059",
+			"fontCharacter": "\\E05C",
 			"fontColor": "#b8383d"
 		},
 		"_mdo": {
-			"fontCharacter": "\\E059",
+			"fontCharacter": "\\E05C",
 			"fontColor": "#cc3e44"
 		},
 		"_mustache_light": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05D",
 			"fontColor": "#cc6d2e"
 		},
 		"_mustache": {
-			"fontCharacter": "\\E05A",
+			"fontCharacter": "\\E05D",
 			"fontColor": "#e37933"
 		},
 		"_npm_light": {
-			"fontCharacter": "\\E05C",
+			"fontCharacter": "\\E05F",
 			"fontColor": "#3b4b52"
 		},
 		"_npm": {
-			"fontCharacter": "\\E05C",
+			"fontCharacter": "\\E05F",
 			"fontColor": "#41535b"
 		},
 		"_npm_1_light": {
-			"fontCharacter": "\\E05C",
+			"fontCharacter": "\\E05F",
 			"fontColor": "#b8383d"
 		},
 		"_npm_1": {
-			"fontCharacter": "\\E05C",
+			"fontCharacter": "\\E05F",
 			"fontColor": "#cc3e44"
 		},
 		"_npm_ignored_light": {
-			"fontCharacter": "\\E05D",
+			"fontCharacter": "\\E060",
 			"fontColor": "#3b4b52"
 		},
 		"_npm_ignored": {
-			"fontCharacter": "\\E05D",
+			"fontCharacter": "\\E060",
 			"fontColor": "#41535b"
 		},
 		"_nunjucks_light": {
-			"fontCharacter": "\\E05E",
+			"fontCharacter": "\\E061",
 			"fontColor": "#7fae42"
 		},
 		"_nunjucks": {
-			"fontCharacter": "\\E05E",
+			"fontCharacter": "\\E061",
 			"fontColor": "#8dc149"
 		},
 		"_ocaml_light": {
-			"fontCharacter": "\\E05F",
+			"fontCharacter": "\\E062",
 			"fontColor": "#cc6d2e"
 		},
 		"_ocaml": {
-			"fontCharacter": "\\E05F",
+			"fontCharacter": "\\E062",
 			"fontColor": "#e37933"
 		},
 		"_odata_light": {
-			"fontCharacter": "\\E060",
+			"fontCharacter": "\\E063",
 			"fontColor": "#cc6d2e"
 		},
 		"_odata": {
-			"fontCharacter": "\\E060",
+			"fontCharacter": "\\E063",
 			"fontColor": "#e37933"
 		},
+		"_pddl_light": {
+			"fontCharacter": "\\E064",
+			"fontColor": "#9068b0"
+		},
+		"_pddl": {
+			"fontCharacter": "\\E064",
+			"fontColor": "#a074c4"
+		},
 		"_pdf_light": {
-			"fontCharacter": "\\E061",
+			"fontCharacter": "\\E065",
 			"fontColor": "#b8383d"
 		},
 		"_pdf": {
-			"fontCharacter": "\\E061",
+			"fontCharacter": "\\E065",
 			"fontColor": "#cc3e44"
 		},
 		"_perl_light": {
-			"fontCharacter": "\\E062",
+			"fontCharacter": "\\E066",
 			"fontColor": "#498ba7"
 		},
 		"_perl": {
-			"fontCharacter": "\\E062",
+			"fontCharacter": "\\E066",
 			"fontColor": "#519aba"
 		},
 		"_photoshop_light": {
-			"fontCharacter": "\\E063",
+			"fontCharacter": "\\E067",
 			"fontColor": "#498ba7"
 		},
 		"_photoshop": {
-			"fontCharacter": "\\E063",
+			"fontCharacter": "\\E067",
 			"fontColor": "#519aba"
 		},
 		"_php_light": {
-			"fontCharacter": "\\E064",
+			"fontCharacter": "\\E068",
 			"fontColor": "#9068b0"
 		},
 		"_php": {
-			"fontCharacter": "\\E064",
+			"fontCharacter": "\\E068",
 			"fontColor": "#a074c4"
 		},
+		"_plan_light": {
+			"fontCharacter": "\\E069",
+			"fontColor": "#7fae42"
+		},
+		"_plan": {
+			"fontCharacter": "\\E069",
+			"fontColor": "#8dc149"
+		},
+		"_platformio_light": {
+			"fontCharacter": "\\E06A",
+			"fontColor": "#cc6d2e"
+		},
+		"_platformio": {
+			"fontCharacter": "\\E06A",
+			"fontColor": "#e37933"
+		},
 		"_powershell_light": {
-			"fontCharacter": "\\E065",
+			"fontCharacter": "\\E06B",
 			"fontColor": "#498ba7"
 		},
 		"_powershell": {
-			"fontCharacter": "\\E065",
+			"fontCharacter": "\\E06B",
 			"fontColor": "#519aba"
 		},
 		"_pug_light": {
-			"fontCharacter": "\\E067",
+			"fontCharacter": "\\E06D",
 			"fontColor": "#b8383d"
 		},
 		"_pug": {
-			"fontCharacter": "\\E067",
+			"fontCharacter": "\\E06D",
 			"fontColor": "#cc3e44"
 		},
 		"_puppet_light": {
-			"fontCharacter": "\\E068",
+			"fontCharacter": "\\E06E",
 			"fontColor": "#b7b73b"
 		},
 		"_puppet": {
-			"fontCharacter": "\\E068",
+			"fontCharacter": "\\E06E",
 			"fontColor": "#cbcb41"
 		},
 		"_python_light": {
-			"fontCharacter": "\\E069",
+			"fontCharacter": "\\E06F",
 			"fontColor": "#498ba7"
 		},
 		"_python": {
-			"fontCharacter": "\\E069",
+			"fontCharacter": "\\E06F",
 			"fontColor": "#519aba"
 		},
 		"_react_light": {
-			"fontCharacter": "\\E06B",
+			"fontCharacter": "\\E071",
 			"fontColor": "#498ba7"
 		},
 		"_react": {
-			"fontCharacter": "\\E06B",
+			"fontCharacter": "\\E071",
 			"fontColor": "#519aba"
 		},
+		"_react_1_light": {
+			"fontCharacter": "\\E071",
+			"fontColor": "#cc6d2e"
+		},
+		"_react_1": {
+			"fontCharacter": "\\E071",
+			"fontColor": "#e37933"
+		},
+		"_react_2_light": {
+			"fontCharacter": "\\E071",
+			"fontColor": "#b7b73b"
+		},
+		"_react_2": {
+			"fontCharacter": "\\E071",
+			"fontColor": "#cbcb41"
+		},
+		"_reasonml_light": {
+			"fontCharacter": "\\E072",
+			"fontColor": "#b8383d"
+		},
+		"_reasonml": {
+			"fontCharacter": "\\E072",
+			"fontColor": "#cc3e44"
+		},
 		"_rollup_light": {
-			"fontCharacter": "\\E06C",
+			"fontCharacter": "\\E073",
 			"fontColor": "#b8383d"
 		},
 		"_rollup": {
-			"fontCharacter": "\\E06C",
+			"fontCharacter": "\\E073",
 			"fontColor": "#cc3e44"
 		},
 		"_ruby_light": {
-			"fontCharacter": "\\E06D",
+			"fontCharacter": "\\E074",
 			"fontColor": "#b8383d"
 		},
 		"_ruby": {
-			"fontCharacter": "\\E06D",
+			"fontCharacter": "\\E074",
 			"fontColor": "#cc3e44"
 		},
 		"_rust_light": {
-			"fontCharacter": "\\E06E",
+			"fontCharacter": "\\E075",
 			"fontColor": "#627379"
 		},
 		"_rust": {
-			"fontCharacter": "\\E06E",
+			"fontCharacter": "\\E075",
 			"fontColor": "#6d8086"
 		},
 		"_salesforce_light": {
-			"fontCharacter": "\\E06F",
+			"fontCharacter": "\\E076",
 			"fontColor": "#498ba7"
 		},
 		"_salesforce": {
-			"fontCharacter": "\\E06F",
+			"fontCharacter": "\\E076",
 			"fontColor": "#519aba"
 		},
 		"_sass_light": {
-			"fontCharacter": "\\E070",
+			"fontCharacter": "\\E077",
 			"fontColor": "#dd4b78"
 		},
 		"_sass": {
-			"fontCharacter": "\\E070",
+			"fontCharacter": "\\E077",
 			"fontColor": "#f55385"
 		},
 		"_sbt_light": {
-			"fontCharacter": "\\E071",
+			"fontCharacter": "\\E078",
 			"fontColor": "#498ba7"
 		},
 		"_sbt": {
-			"fontCharacter": "\\E071",
+			"fontCharacter": "\\E078",
 			"fontColor": "#519aba"
 		},
 		"_scala_light": {
-			"fontCharacter": "\\E072",
+			"fontCharacter": "\\E079",
 			"fontColor": "#b8383d"
 		},
 		"_scala": {
-			"fontCharacter": "\\E072",
+			"fontCharacter": "\\E079",
 			"fontColor": "#cc3e44"
 		},
 		"_shell_light": {
-			"fontCharacter": "\\E075",
+			"fontCharacter": "\\E07C",
 			"fontColor": "#455155"
 		},
 		"_shell": {
-			"fontCharacter": "\\E075",
+			"fontCharacter": "\\E07C",
 			"fontColor": "#4d5a5e"
 		},
 		"_slim_light": {
-			"fontCharacter": "\\E076",
+			"fontCharacter": "\\E07D",
 			"fontColor": "#cc6d2e"
 		},
 		"_slim": {
-			"fontCharacter": "\\E076",
+			"fontCharacter": "\\E07D",
 			"fontColor": "#e37933"
 		},
 		"_smarty_light": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E07E",
 			"fontColor": "#b7b73b"
 		},
 		"_smarty": {
-			"fontCharacter": "\\E077",
+			"fontCharacter": "\\E07E",
 			"fontColor": "#cbcb41"
 		},
 		"_spring_light": {
-			"fontCharacter": "\\E078",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#7fae42"
 		},
 		"_spring": {
-			"fontCharacter": "\\E078",
+			"fontCharacter": "\\E07F",
 			"fontColor": "#8dc149"
 		},
 		"_stylelint_light": {
-			"fontCharacter": "\\E079",
+			"fontCharacter": "\\E080",
 			"fontColor": "#bfc2c1"
 		},
 		"_stylelint": {
-			"fontCharacter": "\\E079",
+			"fontCharacter": "\\E080",
 			"fontColor": "#d4d7d6"
 		},
 		"_stylelint_1_light": {
-			"fontCharacter": "\\E079",
+			"fontCharacter": "\\E080",
 			"fontColor": "#455155"
 		},
 		"_stylelint_1": {
-			"fontCharacter": "\\E079",
+			"fontCharacter": "\\E080",
 			"fontColor": "#4d5a5e"
 		},
 		"_stylus_light": {
-			"fontCharacter": "\\E07A",
+			"fontCharacter": "\\E081",
 			"fontColor": "#7fae42"
 		},
 		"_stylus": {
-			"fontCharacter": "\\E07A",
+			"fontCharacter": "\\E081",
 			"fontColor": "#8dc149"
 		},
 		"_sublime_light": {
-			"fontCharacter": "\\E07B",
+			"fontCharacter": "\\E082",
 			"fontColor": "#cc6d2e"
 		},
 		"_sublime": {
-			"fontCharacter": "\\E07B",
+			"fontCharacter": "\\E082",
 			"fontColor": "#e37933"
 		},
 		"_svg_light": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E083",
 			"fontColor": "#9068b0"
 		},
 		"_svg": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E083",
 			"fontColor": "#a074c4"
 		},
 		"_svg_1_light": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E083",
 			"fontColor": "#498ba7"
 		},
 		"_svg_1": {
-			"fontCharacter": "\\E07C",
+			"fontCharacter": "\\E083",
 			"fontColor": "#519aba"
 		},
 		"_swift_light": {
-			"fontCharacter": "\\E07D",
+			"fontCharacter": "\\E084",
 			"fontColor": "#cc6d2e"
 		},
 		"_swift": {
-			"fontCharacter": "\\E07D",
+			"fontCharacter": "\\E084",
 			"fontColor": "#e37933"
 		},
 		"_terraform_light": {
-			"fontCharacter": "\\E07E",
+			"fontCharacter": "\\E085",
 			"fontColor": "#9068b0"
 		},
 		"_terraform": {
-			"fontCharacter": "\\E07E",
+			"fontCharacter": "\\E085",
 			"fontColor": "#a074c4"
 		},
 		"_tex_light": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E086",
 			"fontColor": "#498ba7"
 		},
 		"_tex": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E086",
 			"fontColor": "#519aba"
 		},
 		"_tex_1_light": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E086",
 			"fontColor": "#b7b73b"
 		},
 		"_tex_1": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E086",
 			"fontColor": "#cbcb41"
 		},
 		"_tex_2_light": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E086",
 			"fontColor": "#cc6d2e"
 		},
 		"_tex_2": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E086",
 			"fontColor": "#e37933"
 		},
 		"_tex_3_light": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E086",
 			"fontColor": "#bfc2c1"
 		},
 		"_tex_3": {
-			"fontCharacter": "\\E07F",
+			"fontCharacter": "\\E086",
 			"fontColor": "#d4d7d6"
 		},
 		"_todo": {
-			"fontCharacter": "\\E081"
+			"fontCharacter": "\\E088"
+		},
+		"_tsconfig_light": {
+			"fontCharacter": "\\E089",
+			"fontColor": "#498ba7"
+		},
+		"_tsconfig": {
+			"fontCharacter": "\\E089",
+			"fontColor": "#519aba"
 		},
 		"_twig_light": {
-			"fontCharacter": "\\E082",
+			"fontCharacter": "\\E08A",
 			"fontColor": "#7fae42"
 		},
 		"_twig": {
-			"fontCharacter": "\\E082",
+			"fontCharacter": "\\E08A",
 			"fontColor": "#8dc149"
 		},
 		"_typescript_light": {
-			"fontCharacter": "\\E083",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#498ba7"
 		},
 		"_typescript": {
-			"fontCharacter": "\\E083",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#519aba"
 		},
 		"_typescript_1_light": {
-			"fontCharacter": "\\E083",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#b7b73b"
 		},
 		"_typescript_1": {
-			"fontCharacter": "\\E083",
+			"fontCharacter": "\\E08B",
 			"fontColor": "#cbcb41"
 		},
 		"_vala_light": {
-			"fontCharacter": "\\E084",
+			"fontCharacter": "\\E08C",
 			"fontColor": "#627379"
 		},
 		"_vala": {
-			"fontCharacter": "\\E084",
+			"fontCharacter": "\\E08C",
 			"fontColor": "#6d8086"
 		},
 		"_video_light": {
-			"fontCharacter": "\\E085",
+			"fontCharacter": "\\E08D",
 			"fontColor": "#dd4b78"
 		},
 		"_video": {
-			"fontCharacter": "\\E085",
+			"fontCharacter": "\\E08D",
 			"fontColor": "#f55385"
 		},
 		"_vue_light": {
-			"fontCharacter": "\\E086",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#7fae42"
 		},
 		"_vue": {
-			"fontCharacter": "\\E086",
+			"fontCharacter": "\\E08E",
 			"fontColor": "#8dc149"
 		},
 		"_wasm_light": {
-			"fontCharacter": "\\E087",
+			"fontCharacter": "\\E08F",
 			"fontColor": "#9068b0"
 		},
 		"_wasm": {
-			"fontCharacter": "\\E087",
+			"fontCharacter": "\\E08F",
 			"fontColor": "#a074c4"
 		},
 		"_wat_light": {
-			"fontCharacter": "\\E088",
+			"fontCharacter": "\\E090",
 			"fontColor": "#9068b0"
 		},
 		"_wat": {
-			"fontCharacter": "\\E088",
+			"fontCharacter": "\\E090",
 			"fontColor": "#a074c4"
 		},
 		"_webpack_light": {
-			"fontCharacter": "\\E089",
+			"fontCharacter": "\\E091",
 			"fontColor": "#498ba7"
 		},
 		"_webpack": {
-			"fontCharacter": "\\E089",
+			"fontCharacter": "\\E091",
 			"fontColor": "#519aba"
 		},
 		"_wgt_light": {
-			"fontCharacter": "\\E08A",
+			"fontCharacter": "\\E092",
 			"fontColor": "#498ba7"
 		},
 		"_wgt": {
-			"fontCharacter": "\\E08A",
+			"fontCharacter": "\\E092",
 			"fontColor": "#519aba"
 		},
 		"_windows_light": {
-			"fontCharacter": "\\E08B",
+			"fontCharacter": "\\E093",
 			"fontColor": "#498ba7"
 		},
 		"_windows": {
-			"fontCharacter": "\\E08B",
+			"fontCharacter": "\\E093",
 			"fontColor": "#519aba"
 		},
 		"_word_light": {
-			"fontCharacter": "\\E08C",
+			"fontCharacter": "\\E094",
 			"fontColor": "#498ba7"
 		},
 		"_word": {
-			"fontCharacter": "\\E08C",
+			"fontCharacter": "\\E094",
 			"fontColor": "#519aba"
 		},
 		"_xls_light": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E095",
 			"fontColor": "#7fae42"
 		},
 		"_xls": {
-			"fontCharacter": "\\E08D",
+			"fontCharacter": "\\E095",
 			"fontColor": "#8dc149"
 		},
 		"_xml_light": {
-			"fontCharacter": "\\E08E",
+			"fontCharacter": "\\E096",
 			"fontColor": "#cc6d2e"
 		},
 		"_xml": {
-			"fontCharacter": "\\E08E",
+			"fontCharacter": "\\E096",
 			"fontColor": "#e37933"
 		},
 		"_yarn_light": {
-			"fontCharacter": "\\E08F",
+			"fontCharacter": "\\E097",
 			"fontColor": "#498ba7"
 		},
 		"_yarn": {
-			"fontCharacter": "\\E08F",
+			"fontCharacter": "\\E097",
 			"fontColor": "#519aba"
 		},
 		"_yml_light": {
-			"fontCharacter": "\\E090",
+			"fontCharacter": "\\E098",
 			"fontColor": "#9068b0"
 		},
 		"_yml": {
-			"fontCharacter": "\\E090",
+			"fontCharacter": "\\E098",
 			"fontColor": "#a074c4"
 		},
 		"_zip_light": {
-			"fontCharacter": "\\E091",
+			"fontCharacter": "\\E099",
 			"fontColor": "#b8383d"
 		},
 		"_zip": {
-			"fontCharacter": "\\E091",
+			"fontCharacter": "\\E099",
 			"fontColor": "#cc3e44"
 		},
 		"_zip_1_light": {
-			"fontCharacter": "\\E091",
+			"fontCharacter": "\\E099",
 			"fontColor": "#627379"
 		},
 		"_zip_1": {
-			"fontCharacter": "\\E091",
+			"fontCharacter": "\\E099",
 			"fontColor": "#6d8086"
 		}
 	},
@@ -1249,6 +1361,10 @@
 		"asm": "_asm",
 		"s": "_asm",
 		"h": "_c_1",
+		"aspx": "_html",
+		"ascx": "_html_1",
+		"asax": "_html_2",
+		"master": "_html_2",
 		"hh": "_cpp_1",
 		"hpp": "_cpp_1",
 		"hxx": "_cpp_1",
@@ -1286,6 +1402,8 @@
 		"article": "_go",
 		"gradle": "_gradle",
 		"gsp": "_grails",
+		"gql": "_graphql",
+		"graphql": "_graphql",
 		"haml": "_haml",
 		"hs": "_haskell",
 		"lhs": "_haskell",
@@ -1297,6 +1415,7 @@
 		"classpath": "_java",
 		"js.map": "_javascript",
 		"spec.js": "_javascript_1",
+		"test.js": "_javascript_1",
 		"es": "_javascript",
 		"es5": "_javascript",
 		"es7": "_javascript",
@@ -1305,6 +1424,7 @@
 		"jl": "_julia",
 		"kt": "_kotlin",
 		"kts": "_kotlin",
+		"dart": "_dart",
 		"liquid": "_liquid",
 		"ls": "_livescript",
 		"argdown": "_argdown",
@@ -1326,10 +1446,18 @@
 		"cmxa": "_ocaml",
 		"odata": "_odata",
 		"php.inc": "_php",
+		"pddl": "_pddl",
+		"plan": "_plan",
+		"happenings": "_happenings",
 		"pug": "_pug",
 		"pp": "_puppet",
 		"epp": "_puppet",
+		"spec.jsx": "_react_1",
+		"test.jsx": "_react_1",
 		"cjsx": "_react",
+		"spec.tsx": "_react_2",
+		"test.tsx": "_react_2",
+		"re": "_reasonml",
 		"r": "_R",
 		"erb": "_html_erb",
 		"erb.html": "_html_erb",
@@ -1352,6 +1480,7 @@
 		"toml": "_config",
 		"twig": "_twig",
 		"spec.ts": "_typescript_1",
+		"test.ts": "_typescript_1",
 		"vala": "_vala",
 		"vapi": "_vala",
 		"vue": "_vue",
@@ -1452,6 +1581,7 @@
 		"gulpfile": "_gulp",
 		"ionic.config.json": "_ionic",
 		"ionic.project": "_ionic",
+		"platformio.ini": "_platformio",
 		"rollup.config.js": "_rollup",
 		"sass-lint.yml": "_sass",
 		"stylelint.config.js": "_stylelint",
@@ -1459,6 +1589,9 @@
 		"yarn.lock": "_yarn",
 		"webpack.config.js": "_webpack",
 		"webpack.config.build.js": "_webpack",
+		"webpack.common.js": "_webpack",
+		"webpack.dev.js": "_webpack",
+		"webpack.prod.js": "_webpack",
 		"license": "_license",
 		"licence": "_license",
 		"copying": "_license",
@@ -1475,6 +1608,7 @@
 		"bat": "_windows",
 		"clojure": "_clojure",
 		"coffeescript": "_coffee",
+		"jsonc": "_tsconfig",
 		"c": "_c",
 		"cpp": "_cpp",
 		"csharp": "_c-sharp",
@@ -1484,7 +1618,7 @@
 		"go": "_go2",
 		"groovy": "_grails",
 		"handlebars": "_mustache",
-		"html": "_html",
+		"html": "_html_3",
 		"properties": "_java",
 		"java": "_java",
 		"javascriptreact": "_react",
@@ -1495,12 +1629,14 @@
 		"makefile": "_makefile",
 		"markdown": "_markdown",
 		"objective-c": "_c_2",
+		"objective-cpp": "_cpp_2",
 		"perl": "_perl",
 		"php": "_php",
 		"powershell": "_powershell",
 		"jade": "_jade",
 		"python": "_python",
 		"r": "_R",
+		"razor": "_html",
 		"ruby": "_ruby",
 		"rust": "_rust",
 		"scss": "_sass",
@@ -1539,6 +1675,10 @@
 			"asm": "_asm_light",
 			"s": "_asm_light",
 			"h": "_c_1_light",
+			"aspx": "_html_light",
+			"ascx": "_html_1_light",
+			"asax": "_html_2_light",
+			"master": "_html_2_light",
 			"hh": "_cpp_1_light",
 			"hpp": "_cpp_1_light",
 			"hxx": "_cpp_1_light",
@@ -1576,6 +1716,8 @@
 			"article": "_go_light",
 			"gradle": "_gradle_light",
 			"gsp": "_grails_light",
+			"gql": "_graphql_light",
+			"graphql": "_graphql_light",
 			"haml": "_haml_light",
 			"hs": "_haskell_light",
 			"lhs": "_haskell_light",
@@ -1587,6 +1729,7 @@
 			"classpath": "_java_light",
 			"js.map": "_javascript_light",
 			"spec.js": "_javascript_1_light",
+			"test.js": "_javascript_1_light",
 			"es": "_javascript_light",
 			"es5": "_javascript_light",
 			"es7": "_javascript_light",
@@ -1595,6 +1738,7 @@
 			"jl": "_julia_light",
 			"kt": "_kotlin_light",
 			"kts": "_kotlin_light",
+			"dart": "_dart_light",
 			"liquid": "_liquid_light",
 			"ls": "_livescript_light",
 			"argdown": "_argdown_light",
@@ -1616,10 +1760,18 @@
 			"cmxa": "_ocaml_light",
 			"odata": "_odata_light",
 			"php.inc": "_php_light",
+			"pddl": "_pddl_light",
+			"plan": "_plan_light",
+			"happenings": "_happenings_light",
 			"pug": "_pug_light",
 			"pp": "_puppet_light",
 			"epp": "_puppet_light",
+			"spec.jsx": "_react_1_light",
+			"test.jsx": "_react_1_light",
 			"cjsx": "_react_light",
+			"spec.tsx": "_react_2_light",
+			"test.tsx": "_react_2_light",
+			"re": "_reasonml_light",
 			"r": "_R_light",
 			"erb": "_html_erb_light",
 			"erb.html": "_html_erb_light",
@@ -1642,6 +1794,7 @@
 			"toml": "_config_light",
 			"twig": "_twig_light",
 			"spec.ts": "_typescript_1_light",
+			"test.ts": "_typescript_1_light",
 			"vala": "_vala_light",
 			"vapi": "_vala_light",
 			"vue": "_vue_light",
@@ -1718,6 +1871,7 @@
 			"bat": "_windows_light",
 			"clojure": "_clojure_light",
 			"coffeescript": "_coffee_light",
+			"jsonc": "_tsconfig_light",
 			"c": "_c_light",
 			"cpp": "_cpp_light",
 			"csharp": "_c-sharp_light",
@@ -1727,7 +1881,7 @@
 			"go": "_go2_light",
 			"groovy": "_grails_light",
 			"handlebars": "_mustache_light",
-			"html": "_html_light",
+			"html": "_html_3_light",
 			"properties": "_java_light",
 			"java": "_java_light",
 			"javascriptreact": "_react_light",
@@ -1738,12 +1892,14 @@
 			"makefile": "_makefile_light",
 			"markdown": "_markdown_light",
 			"objective-c": "_c_2_light",
+			"objective-cpp": "_cpp_2_light",
 			"perl": "_perl_light",
 			"php": "_php_light",
 			"powershell": "_powershell_light",
 			"jade": "_jade_light",
 			"python": "_python_light",
 			"r": "_R_light",
+			"razor": "_html_light",
 			"ruby": "_ruby_light",
 			"rust": "_rust_light",
 			"scss": "_sass_light",
@@ -1801,6 +1957,7 @@
 			"gulpfile": "_gulp_light",
 			"ionic.config.json": "_ionic_light",
 			"ionic.project": "_ionic_light",
+			"platformio.ini": "_platformio_light",
 			"rollup.config.js": "_rollup_light",
 			"sass-lint.yml": "_sass_light",
 			"stylelint.config.js": "_stylelint_light",
@@ -1808,6 +1965,9 @@
 			"yarn.lock": "_yarn_light",
 			"webpack.config.js": "_webpack_light",
 			"webpack.config.build.js": "_webpack_light",
+			"webpack.common.js": "_webpack_light",
+			"webpack.dev.js": "_webpack_light",
+			"webpack.prod.js": "_webpack_light",
 			"license": "_license_light",
 			"licence": "_license_light",
 			"copying": "_license_light",
@@ -1820,5 +1980,5 @@
 			"npm-debug.log": "_npm_ignored_light"
 		}
 	},
-	"version": "https://github.com/jesseweed/seti-ui/commit/89175d7f9e0c70cd325b80a18a3c77fc8eb7c798"
+	"version": "https://github.com/jesseweed/seti-ui/commit/904c16acced1134a81b31d71d60293288c31334b"
 }
\ No newline at end of file
diff --git a/extensions/typescript-basics/cgmanifest.json b/extensions/typescript-basics/cgmanifest.json
index 0f20c256fda..cd8c1071a82 100644
--- a/extensions/typescript-basics/cgmanifest.json
+++ b/extensions/typescript-basics/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "TypeScript-TmLanguage",
 					"repositoryUrl": "https://github.com/Microsoft/TypeScript-TmLanguage",
-					"commitHash": "f698a9826cad8235e92b7c298a5f8c9c298d8ada"
+					"commitHash": "cf7b1ec2c20b5fe28695249596128ff514e1a659"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index 0f5c3ba241e..ce5a34d5f9a 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/f698a9826cad8235e92b7c298a5f8c9c298d8ada",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/11b1a4f8dc3a3eaa4df71e8cc1ad6f01a688961d",
 	"name": "TypeScript",
 	"scopeName": "source.ts",
 	"patterns": [
@@ -423,7 +423,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.ts",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.ts entity.name.function.ts"
@@ -481,7 +481,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.ts",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.ts variable.other.constant.ts entity.name.function.ts"
@@ -865,7 +865,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -1105,7 +1105,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "meta.definition.property.ts entity.name.function.ts"
@@ -1428,7 +1428,7 @@
 				},
 				{
 					"name": "meta.arrow.ts",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.ts"
@@ -2601,7 +2601,7 @@
 				},
 				{
 					"name": "meta.object.member.ts",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.ts"
@@ -2746,6 +2746,9 @@
 								}
 							]
 						},
+						{
+							"include": "#possibly-arrow-return-type"
+						},
 						{
 							"include": "#expression"
 						}
@@ -2950,7 +2953,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -3221,6 +3224,20 @@
 					"name": "keyword.operator.arithmetic.ts",
 					"match": "%|\\*|/|-|\\+"
 				},
+				{
+					"begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(/)(?![/*]))",
+					"end": "(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)",
+					"endCaptures": {
+						"1": {
+							"name": "keyword.operator.arithmetic.ts"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						}
+					]
+				},
 				{
 					"match": "(?<=[_$[:alnum:])\\]])\\s*(/)(?![/*])",
 					"captures": {
@@ -3590,7 +3607,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.ts"
@@ -3802,7 +3819,7 @@
 			]
 		},
 		"possibly-arrow-return-type": {
-			"begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+			"begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts"
diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
index 59f4e80a93c..68776811480 100644
--- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/f698a9826cad8235e92b7c298a5f8c9c298d8ada",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/cf7b1ec2c20b5fe28695249596128ff514e1a659",
 	"name": "TypeScriptReact",
 	"scopeName": "source.tsx",
 	"patterns": [
@@ -426,7 +426,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.tsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.tsx entity.name.function.tsx"
@@ -484,7 +484,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.tsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.tsx variable.other.constant.tsx entity.name.function.tsx"
@@ -868,7 +868,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -1108,7 +1108,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "meta.definition.property.tsx entity.name.function.tsx"
@@ -1431,7 +1431,7 @@
 				},
 				{
 					"name": "meta.arrow.tsx",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.tsx"
@@ -2604,7 +2604,7 @@
 				},
 				{
 					"name": "meta.object.member.tsx",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.tsx"
@@ -2749,6 +2749,9 @@
 								}
 							]
 						},
+						{
+							"include": "#possibly-arrow-return-type"
+						},
 						{
 							"include": "#expression"
 						}
@@ -2953,7 +2956,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -3172,6 +3175,20 @@
 					"name": "keyword.operator.arithmetic.tsx",
 					"match": "%|\\*|/|-|\\+"
 				},
+				{
+					"begin": "(?<=[_$[:alnum:])\\]])\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)+(/)(?![/*]))",
+					"end": "(/)(?!\\*([^\\*]|(\\*[^\\/]))*\\*\\/)",
+					"endCaptures": {
+						"1": {
+							"name": "keyword.operator.arithmetic.tsx"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						}
+					]
+				},
 				{
 					"match": "(?<=[_$[:alnum:])\\]])\\s*(/)(?![/*])",
 					"captures": {
@@ -3541,7 +3558,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*([\\{\\[]\\s*)?$)) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.tsx"
@@ -3753,7 +3770,7 @@
 			]
 		},
 		"possibly-arrow-return-type": {
-			"begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<[^<>]+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
+			"begin": "(?<=\\)|^)\\s*(:)(?=\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<[^<>]+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*=>)",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.arrow.tsx meta.return.type.arrow.tsx keyword.operator.type.annotation.tsx"
@@ -5297,7 +5314,7 @@
 			]
 		},
 		"jsx-tag-without-attributes-in-expression": {
-			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
+			"begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))?\\s*(>))",
 			"patterns": [
 				{
@@ -5357,7 +5374,7 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*\\/|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^yield|[^\\._$[:alnum:]]yield|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\\.|-))(?=((<\\s*)|(\\s+))(?!\\?)|\\/?>))",
 			"patterns": [
 				{
diff --git a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
index 25ffb4c81bd..f662cb21af6 100644
--- a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
+++ b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
@@ -34,6 +34,27 @@ function mode2ScriptKind(mode: string): 'TS' | 'TSX' | 'JS' | 'JSX' | undefined
 	return undefined;
 }
 
+class CloseOperation {
+	readonly type = 'close';
+	constructor(
+		public readonly args: string
+	) { }
+}
+
+class OpenOperation {
+	readonly type = 'open';
+	constructor(
+		public readonly args: Proto.OpenRequestArgs
+	) { }
+}
+
+class ChangeOperation {
+	readonly type = 'change';
+	constructor(
+		public readonly args: Proto.FileCodeEdits
+	) { }
+}
+
 /**
  * Manages synchronization of buffers with the TS server.
  *
@@ -41,8 +62,7 @@ function mode2ScriptKind(mode: string): 'TS' | 'TSX' | 'JS' | 'JSX' | undefined
  */
 class BufferSynchronizer {
 
-	private _pending: Proto.UpdateOpenRequestArgs = {};
-	private _pendingFiles = new Set<string>();
+	private readonly _pending = new Map<string, CloseOperation | OpenOperation | ChangeOperation>();
 
 	constructor(
 		private readonly client: ITypeScriptServiceClient
@@ -51,10 +71,7 @@ class BufferSynchronizer {
 	public open(args: Proto.OpenRequestArgs) {
 		if (this.supportsBatching) {
 			this.updatePending(args.file, pending => {
-				if (!pending.openFiles) {
-					pending.openFiles = [];
-				}
-				pending.openFiles.push(args);
+				pending.set(args.file, new OpenOperation(args));
 			});
 		} else {
 			this.client.executeWithoutWaitingForResponse('open', args);
@@ -64,10 +81,7 @@ class BufferSynchronizer {
 	public close(filepath: string) {
 		if (this.supportsBatching) {
 			this.updatePending(filepath, pending => {
-				if (!pending.closedFiles) {
-					pending.closedFiles = [];
-				}
-				pending.closedFiles.push(filepath);
+				pending.set(filepath, new CloseOperation(filepath));
 			});
 		} else {
 			const args: Proto.FileRequestArgs = { file: filepath };
@@ -82,18 +96,14 @@ class BufferSynchronizer {
 
 		if (this.supportsBatching) {
 			this.updatePending(filepath, pending => {
-				if (!pending.changedFiles) {
-					pending.changedFiles = [];
-				}
-
-				pending.changedFiles.push({
+				pending.set(filepath, new ChangeOperation({
 					fileName: filepath,
 					textChanges: events.map((change): Proto.CodeEdit => ({
 						newText: change.text,
 						start: typeConverters.Position.toLocation(change.range.start),
 						end: typeConverters.Position.toLocation(change.range.end),
 					})).reverse(), // Send the edits end-of-document to start-of-document order
-				});
+				}));
 			});
 		} else {
 			for (const { range, text } of events) {
@@ -117,13 +127,23 @@ class BufferSynchronizer {
 	private flush() {
 		if (!this.supportsBatching) {
 			// We've already eagerly synchronized
+			this._pending.clear();
 			return;
 		}
 
-		if (this._pending.changedFiles || this._pending.closedFiles || this._pending.openFiles) {
-			this.client.executeWithoutWaitingForResponse('updateOpen', this._pending);
-			this._pending = {};
-			this._pendingFiles.clear();
+		if (this._pending.size > 0) {
+			const closedFiles: string[] = [];
+			const openFiles: Proto.OpenRequestArgs[] = [];
+			const changedFiles: Proto.FileCodeEdits[] = [];
+			for (const change of this._pending.values()) {
+				switch (change.type) {
+					case 'change': changedFiles.push(change.args); break;
+					case 'open': openFiles.push(change.args); break;
+					case 'close': closedFiles.push(change.args); break;
+				}
+			}
+			this.client.executeWithoutWaitingForResponse('updateOpen', { changedFiles, closedFiles, openFiles });
+			this._pending.clear();
 		}
 	}
 
@@ -131,15 +151,12 @@ class BufferSynchronizer {
 		return this.client.apiVersion.gte(API.v340) && vscode.workspace.getConfiguration('typescript', null).get<boolean>('useBatchedBufferSync', true);
 	}
 
-	private updatePending(filepath: string, f: (pending: Proto.UpdateOpenRequestArgs) => void): void {
-		if (this.supportsBatching && this._pendingFiles.has(filepath)) {
+	private updatePending(filepath: string, f: (pending: Map<string, CloseOperation | OpenOperation | ChangeOperation>) => void): void {
+		if (this._pending.has(filepath)) {
+			// we saw this file before, make sure we flush before working with it again
 			this.flush();
-			this._pendingFiles.clear();
-			f(this._pending);
-			this._pendingFiles.add(filepath);
-		} else {
-			f(this._pending);
 		}
+		f(this._pending);
 	}
 }
 
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts
index a3d5690b9b9..9ea76e6a119 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts
@@ -113,4 +113,31 @@ suite('commands namespace tests', () => {
 
 		return Promise.all([a, b, c, d]);
 	});
-});
\ No newline at end of file
+
+	test('onDidExecuteCommand', async function () {
+		let args: any[];
+		let d1 = commands.registerCommand('t1', function () {
+			args = [...arguments];
+		});
+
+
+		const p = new Promise((resolve, reject) => {
+
+			let d2 = commands.onDidExecuteCommand(event => {
+				d2.dispose();
+				d1.dispose();
+
+				try {
+					assert.equal(event.command, 't1');
+					assert.deepEqual(args, event.arguments);
+					resolve();
+				} catch (e) {
+					reject(e);
+				}
+			});
+		});
+
+		await commands.executeCommand('t1', { foo: 1 });
+		await p;
+	});
+});
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
index c0e300439be..13b9666dbfe 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@@ -271,7 +271,7 @@ suite('window namespace tests', () => {
 			});
 
 			test('should fire Terminal.onData on write', (done) => {
-				const reg1 = window.onDidOpenTerminal(term => {
+				const reg1 = window.onDidOpenTerminal(async term => {
 					equal(terminal, term);
 					reg1.dispose();
 					const reg2 = terminal.onDidWriteData(data => {
@@ -283,11 +283,15 @@ suite('window namespace tests', () => {
 						});
 						terminal.dispose();
 					});
+					await startPromise;
 					writeEmitter.fire('bar');
 				});
+				let startResolve: () => void;
+				const startPromise: Promise<void> = new Promise<void>(r => startResolve = r);
 				const writeEmitter = new EventEmitter<string>();
 				const virtualProcess: TerminalVirtualProcess = {
-					onDidWrite: writeEmitter.event
+					onDidWrite: writeEmitter.event,
+					start: () => startResolve()
 				};
 				const terminal = window.createTerminal({ name: 'foo', virtualProcess });
 			});
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
index dc700abdf1b..55af5c4d5ed 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -796,4 +796,29 @@ suite('workspace-namespace', () => {
 		we.deleteFile(docUri, { ignoreIfNotExists: true });
 		assert.ok(await vscode.workspace.applyEdit(we));
 	});
+
+	test('The api workspace.applyEdit drops the TextEdit if there is a RenameFile later #77735', async function () {
+
+		let [f1, f2, f3] = await Promise.all([createRandomFile(), createRandomFile(), createRandomFile()]);
+
+		let we = new vscode.WorkspaceEdit();
+		we.insert(f1, new vscode.Position(0, 0), 'f1');
+		we.insert(f2, new vscode.Position(0, 0), 'f2');
+		we.insert(f3, new vscode.Position(0, 0), 'f3');
+
+		let f1_ = nameWithUnderscore(f1);
+		we.renameFile(f1, f1_);
+
+		assert.ok(await vscode.workspace.applyEdit(we));
+
+		assert.equal((await vscode.workspace.openTextDocument(f3)).getText(), 'f3');
+		assert.equal((await vscode.workspace.openTextDocument(f2)).getText(), 'f2');
+		assert.equal((await vscode.workspace.openTextDocument(f1_)).getText(), 'f1');
+		try {
+			await vscode.workspace.fs.stat(f1);
+			assert.ok(false);
+		} catch {
+			assert.ok(true);
+		}
+	});
 });
diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json
index 167df92db2d..0d93c4ea6d0 100644
--- a/extensions/vscode-test-resolver/package.json
+++ b/extensions/vscode-test-resolver/package.json
@@ -53,17 +53,17 @@
 			"statusBar/windowIndicator": [
 				{
 					"command": "vscode-testresolver.newWindow",
-					"when": "!remoteAuthority",
+					"when": "!remoteName",
 					"group": "9_local_testresolver@2"
 				},
 				{
 					"command": "vscode-testresolver.showLog",
-					"when": "remoteAuthority =~ /^test\\+.*$/",
+					"when": "remoteName == test",
 					"group": "1_remote_testresolver_open@3"
 				},
 				{
 					"command": "vscode-testresolver.newWindow",
-					"when": "remoteAuthority =~ /^test\\+.*$/",
+					"when": "remoteName == test",
 					"group": "1_remote_testresolver_open@1"
 				}
 			]
diff --git a/extensions/xml/xml.language-configuration.json b/extensions/xml/xml.language-configuration.json
index faaa59c1cd3..702b6dc6eb7 100644
--- a/extensions/xml/xml.language-configuration.json
+++ b/extensions/xml/xml.language-configuration.json
@@ -1,31 +1,34 @@
 {
 	"comments": {
-		"lineComment": "",
-		"blockComment": ["<!--", "-->"]
+		"blockComment": [ "<!--", "-->" ]
 	},
 	"brackets": [
-		["<", ">"]
+		["<!--", "-->"],
+		["<", ">"],
+		["{", "}"],
+		["(", ")"]
 	],
 	"autoClosingPairs": [
-		["<", ">"],
-		["'", "'"],
-		["\"", "\""]
+		{ "open": "{", "close": "}"},
+		{ "open": "[", "close": "]"},
+		{ "open": "(", "close": ")" },
+		{ "open": "'", "close": "'" },
+		{ "open": "\"", "close": "\"" },
+		{ "open": "<!--", "close": "-->", "notIn": [ "comment", "string" ]},
+		{ "open": "<![CDATA[", "close": "]]>", "notIn": [ "comment", "string" ]}
 	],
 	"surroundingPairs": [
-		["<", ">"],
-		["'", "'"],
-		["\"", "\""]
-	]
-
-	// enhancedBrackets: [{
-	// 	tokenType: 'tag.tag-$1.xml',
-	// 	openTrigger: '>',
-	// 	open: /<(\w[\w\d]*)([^\/>]*(?!\/)>)[^<>]*$/i,
-	// 	closeComplete: '</$1>',
-	// 	closeTrigger: '>',
-	// 	close: /<\/(\w[\w\d]*)\s*>$/i
-	// }],
-
-	// autoClosingPairs:  [['\'', '\''], ['"', '"'] ]
-
+		{ "open": "'", "close": "'" },
+		{ "open": "\"", "close": "\"" },
+		{ "open": "{", "close": "}"},
+		{ "open": "[", "close": "]"},
+		{ "open": "(", "close": ")" },
+		{ "open": "<", "close": ">" }
+	],
+	"folding": {
+		"markers": {
+			"start": "^\\s*<!--\\s*#region\\b.*-->",
+			"end": "^\\s*<!--\\s*#endregion\\b.*-->"
+		}
+	}
 }
diff --git a/package.json b/package.json
index 6c72aa10cfc..d92d5d06486 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.37.0",
-  "distro": "53215ea1e983c935e01e95875b9ee9ef65777c7d",
+  "distro": "fc3f6c1bc0a7b9880b85e6763559865327718991",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -158,4 +158,4 @@
     "windows-mutex": "0.3.0",
     "windows-process-tree": "0.2.4"
   }
-}
+}
\ No newline at end of file
diff --git a/resources/completions/zsh/_code b/resources/completions/zsh/_code
index 054ab351e91..265c199f62f 100644
--- a/resources/completions/zsh/_code
+++ b/resources/completions/zsh/_code
@@ -17,6 +17,7 @@ arguments=(
 	'(- *)'{--telemetry}'[Shows all telemetry events which VS code collects.]'
 	'--extensions-dir[set the root path for extensions]:root path:_directories'
 	'--list-extensions[list the installed extensions]'
+	'--category[filters instaled extension list by category, when using --list-extension]'
 	'--show-versions[show versions of installed extensions, when using --list-extension]'
 	'--install-extension[install an extension]:id or path:_files -g "*.vsix(-.)"'
 	'--uninstall-extension[uninstall an extension]:id or path:_files -g "*.vsix(-.)"'
diff --git a/resources/win32/bin/code.sh b/resources/win32/bin/code.sh
index 6ae88507877..23a5afe8e71 100644
--- a/resources/win32/bin/code.sh
+++ b/resources/win32/bin/code.sh
@@ -34,7 +34,8 @@ if grep -qi Microsoft /proc/version; then
 		if [ -n "$WSL_EXT_WLOC" ]; then
 			# replace \r\n with \n in WSL_EXT_WLOC
 			WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
-			"$WSL_CODE" "$COMMIT" "$QUALITY" "$ELECTRON" "$APP_NAME" "$DATAFOLDER" "$@"
+			WIN_CODE_CMD=$(wslpath -w "$VSCODE_PATH/bin/$APP_NAME.cmd")
+			"$WSL_CODE" "$COMMIT" "$QUALITY" "$WIN_CODE_CMD" "$APP_NAME" "$DATAFOLDER" "$@"
 			exit $?
 		fi
 	else
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index d7d5621eec4..fa12f629000 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -34,7 +34,7 @@ export function isInDOM(node: Node | null): boolean {
 		if (node === document.body) {
 			return true;
 		}
-		node = node.parentNode;
+		node = node.parentNode || (node as ShadowRoot).host;
 	}
 	return false;
 }
@@ -806,7 +806,8 @@ export function createCSSRule(selector: string, cssText: string, style: HTMLStyl
 	if (!style || !cssText) {
 		return;
 	}
-	style.textContent = `${selector}{${cssText}}\n${style.textContent}`;
+
+	(<CSSStyleSheet>style.sheet).insertRule(selector + '{' + cssText + '}', 0);
 }
 
 export function removeCSSRulesContainingSelector(ruleName: string, style: HTMLStyleElement = getSharedStyleSheet()): void {
@@ -1199,7 +1200,7 @@ export function asDomUri(uri: URI): URI {
 	if (Schemas.vscodeRemote === uri.scheme) {
 		// rewrite vscode-remote-uris to uris of the window location
 		// so that they can be intercepted by the service worker
-		return _location.with({ path: '/vscode-resources/fetch', query: JSON.stringify({ u: uri.toJSON(), i: 1 }) });
+		return _location.with({ path: '/vscode-resources/fetch', query: `u=${JSON.stringify(uri)}` });
 	}
 	return uri;
 }
diff --git a/src/vs/base/browser/ui/checkbox/checkbox.ts b/src/vs/base/browser/ui/checkbox/checkbox.ts
index 40dcdfbb9ab..8ec96513dd2 100644
--- a/src/vs/base/browser/ui/checkbox/checkbox.ts
+++ b/src/vs/base/browser/ui/checkbox/checkbox.ts
@@ -22,10 +22,12 @@ export interface ICheckboxOpts extends ICheckboxStyles {
 
 export interface ICheckboxStyles {
 	inputActiveOptionBorder?: Color;
+	inputActiveOptionBackground?: Color;
 }
 
 const defaultOpts = {
-	inputActiveOptionBorder: Color.fromHex('#007ACC')
+	inputActiveOptionBorder: Color.fromHex('#007ACC00'),
+	inputActiveOptionBackground: Color.fromHex('#0E639C50')
 };
 
 export class CheckboxActionViewItem extends BaseActionViewItem {
@@ -149,12 +151,16 @@ export class Checkbox extends Widget {
 		if (styles.inputActiveOptionBorder) {
 			this._opts.inputActiveOptionBorder = styles.inputActiveOptionBorder;
 		}
+		if (styles.inputActiveOptionBackground) {
+			this._opts.inputActiveOptionBackground = styles.inputActiveOptionBackground;
+		}
 		this.applyStyles();
 	}
 
 	protected applyStyles(): void {
 		if (this.domNode) {
 			this.domNode.style.borderColor = this._checked && this._opts.inputActiveOptionBorder ? this._opts.inputActiveOptionBorder.toString() : 'transparent';
+			this.domNode.style.backgroundColor = this._checked && this._opts.inputActiveOptionBackground ? this._opts.inputActiveOptionBackground.toString() : 'transparent';
 		}
 	}
 
diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts
index 38a5082b141..180e660f3a5 100644
--- a/src/vs/base/browser/ui/findinput/findInput.ts
+++ b/src/vs/base/browser/ui/findinput/findInput.ts
@@ -33,6 +33,7 @@ export interface IFindInputOptions extends IFindInputStyles {
 
 export interface IFindInputStyles extends IInputBoxStyles {
 	inputActiveOptionBorder?: Color;
+	inputActiveOptionBackground?: Color;
 }
 
 const NLS_DEFAULT_LABEL = nls.localize('defaultLabel', "input");
@@ -48,6 +49,7 @@ export class FindInput extends Widget {
 	private fixFocusOnOptionClickEnabled = true;
 
 	private inputActiveOptionBorder?: Color;
+	private inputActiveOptionBackground?: Color;
 	private inputBackground?: Color;
 	private inputForeground?: Color;
 	private inputBorder?: Color;
@@ -97,6 +99,7 @@ export class FindInput extends Widget {
 		this.label = options.label || NLS_DEFAULT_LABEL;
 
 		this.inputActiveOptionBorder = options.inputActiveOptionBorder;
+		this.inputActiveOptionBackground = options.inputActiveOptionBackground;
 		this.inputBackground = options.inputBackground;
 		this.inputForeground = options.inputForeground;
 		this.inputBorder = options.inputBorder;
@@ -173,6 +176,7 @@ export class FindInput extends Widget {
 
 	public style(styles: IFindInputStyles): void {
 		this.inputActiveOptionBorder = styles.inputActiveOptionBorder;
+		this.inputActiveOptionBackground = styles.inputActiveOptionBackground;
 		this.inputBackground = styles.inputBackground;
 		this.inputForeground = styles.inputForeground;
 		this.inputBorder = styles.inputBorder;
@@ -194,6 +198,7 @@ export class FindInput extends Widget {
 		if (this.domNode) {
 			const checkBoxStyles: ICheckboxStyles = {
 				inputActiveOptionBorder: this.inputActiveOptionBorder,
+				inputActiveOptionBackground: this.inputActiveOptionBackground,
 			};
 			this.regex.style(checkBoxStyles);
 			this.wholeWords.style(checkBoxStyles);
@@ -294,7 +299,8 @@ export class FindInput extends Widget {
 		this.regex = this._register(new RegexCheckbox({
 			appendTitle: appendRegexLabel,
 			isChecked: false,
-			inputActiveOptionBorder: this.inputActiveOptionBorder
+			inputActiveOptionBorder: this.inputActiveOptionBorder,
+			inputActiveOptionBackground: this.inputActiveOptionBackground
 		}));
 		this._register(this.regex.onChange(viaKeyboard => {
 			this._onDidOptionChange.fire(viaKeyboard);
@@ -310,7 +316,8 @@ export class FindInput extends Widget {
 		this.wholeWords = this._register(new WholeWordsCheckbox({
 			appendTitle: appendWholeWordsLabel,
 			isChecked: false,
-			inputActiveOptionBorder: this.inputActiveOptionBorder
+			inputActiveOptionBorder: this.inputActiveOptionBorder,
+			inputActiveOptionBackground: this.inputActiveOptionBackground
 		}));
 		this._register(this.wholeWords.onChange(viaKeyboard => {
 			this._onDidOptionChange.fire(viaKeyboard);
@@ -323,7 +330,8 @@ export class FindInput extends Widget {
 		this.caseSensitive = this._register(new CaseSensitiveCheckbox({
 			appendTitle: appendCaseSensitiveLabel,
 			isChecked: false,
-			inputActiveOptionBorder: this.inputActiveOptionBorder
+			inputActiveOptionBorder: this.inputActiveOptionBorder,
+			inputActiveOptionBackground: this.inputActiveOptionBackground
 		}));
 		this._register(this.caseSensitive.onChange(viaKeyboard => {
 			this._onDidOptionChange.fire(viaKeyboard);
diff --git a/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts b/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts
index 62451f1a4b8..effef734a8c 100644
--- a/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts
+++ b/src/vs/base/browser/ui/findinput/findInputCheckboxes.ts
@@ -12,6 +12,7 @@ export interface IFindInputCheckboxOpts {
 	readonly appendTitle: string;
 	readonly isChecked: boolean;
 	readonly inputActiveOptionBorder?: Color;
+	readonly inputActiveOptionBackground?: Color;
 }
 
 const NLS_CASE_SENSITIVE_CHECKBOX_LABEL = nls.localize('caseDescription', "Match Case");
@@ -24,7 +25,8 @@ export class CaseSensitiveCheckbox extends Checkbox {
 			actionClassName: 'monaco-case-sensitive',
 			title: NLS_CASE_SENSITIVE_CHECKBOX_LABEL + opts.appendTitle,
 			isChecked: opts.isChecked,
-			inputActiveOptionBorder: opts.inputActiveOptionBorder
+			inputActiveOptionBorder: opts.inputActiveOptionBorder,
+			inputActiveOptionBackground: opts.inputActiveOptionBackground
 		});
 	}
 }
@@ -35,7 +37,8 @@ export class WholeWordsCheckbox extends Checkbox {
 			actionClassName: 'monaco-whole-word',
 			title: NLS_WHOLE_WORD_CHECKBOX_LABEL + opts.appendTitle,
 			isChecked: opts.isChecked,
-			inputActiveOptionBorder: opts.inputActiveOptionBorder
+			inputActiveOptionBorder: opts.inputActiveOptionBorder,
+			inputActiveOptionBackground: opts.inputActiveOptionBackground
 		});
 	}
 }
@@ -46,7 +49,8 @@ export class RegexCheckbox extends Checkbox {
 			actionClassName: 'monaco-regex',
 			title: NLS_REGEX_CHECKBOX_LABEL + opts.appendTitle,
 			isChecked: opts.isChecked,
-			inputActiveOptionBorder: opts.inputActiveOptionBorder
+			inputActiveOptionBorder: opts.inputActiveOptionBorder,
+			inputActiveOptionBackground: opts.inputActiveOptionBackground
 		});
 	}
 }
diff --git a/src/vs/base/browser/ui/grid/gridview.ts b/src/vs/base/browser/ui/grid/gridview.ts
index bb1d17a1687..8ce22799e56 100644
--- a/src/vs/base/browser/ui/grid/gridview.ts
+++ b/src/vs/base/browser/ui/grid/gridview.ts
@@ -102,6 +102,22 @@ class BranchNode implements ISplitView, IDisposable {
 		return Math.min(...this.children.map(c => c.maximumOrthogonalSize));
 	}
 
+	get priority(): LayoutPriority {
+		if (this.children.length === 0) {
+			return LayoutPriority.Normal;
+		}
+
+		const priorities = this.children.map(c => typeof c.priority === 'undefined' ? LayoutPriority.Normal : c.priority);
+
+		if (priorities.some(p => p === LayoutPriority.High)) {
+			return LayoutPriority.High;
+		} else if (priorities.some(p => p === LayoutPriority.Low)) {
+			return LayoutPriority.Low;
+		}
+
+		return LayoutPriority.Normal;
+	}
+
 	get minimumOrthogonalSize(): number {
 		return this.splitview.minimumSize;
 	}
diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts
index 78f46feb865..7599cc6808d 100644
--- a/src/vs/base/browser/ui/splitview/splitview.ts
+++ b/src/vs/base/browser/ui/splitview/splitview.ts
@@ -325,13 +325,13 @@ export class SplitView extends Disposable {
 
 		container.appendChild(view.element);
 
-		let highPriorityIndex: number | undefined;
+		let highPriorityIndexes: number[] | undefined;
 
 		if (typeof size !== 'number' && size.type === 'split') {
-			highPriorityIndex = size.index;
+			highPriorityIndexes = [size.index];
 		}
 
-		this.relayout(index, highPriorityIndex);
+		this.relayout([index], highPriorityIndexes);
 		this.state = State.Idle;
 
 		if (typeof size !== 'number' && size.type === 'distribute') {
@@ -420,17 +420,6 @@ export class SplitView extends Disposable {
 		this.layoutViews();
 	}
 
-	private relayout(lowPriorityIndex?: number, highPriorityIndex?: number): void {
-		const contentSize = this.viewItems.reduce((r, i) => r + i.size, 0);
-		const lowPriorityIndexes = typeof lowPriorityIndex === 'number' ? [lowPriorityIndex] : undefined;
-		const highPriorityIndexes = typeof highPriorityIndex === 'number' ? [highPriorityIndex] : undefined;
-
-		this.resize(this.viewItems.length - 1, this.size - contentSize, undefined, lowPriorityIndexes, highPriorityIndexes);
-		this.distributeEmptySpace();
-		this.layoutViews();
-		this.saveProportions();
-	}
-
 	layout(size: number): void {
 		const previousSize = Math.max(this.size, this.contentSize);
 		this.size = size;
@@ -582,7 +571,7 @@ export class SplitView extends Disposable {
 			this.layoutViews();
 		} else {
 			item.size = size;
-			this.relayout(index, undefined);
+			this.relayout([index], undefined);
 		}
 	}
 
@@ -597,42 +586,32 @@ export class SplitView extends Disposable {
 			return;
 		}
 
+		const indexes = range(this.viewItems.length).filter(i => i !== index);
+		const lowPriorityIndexes = [...indexes.filter(i => this.viewItems[i].priority === LayoutPriority.Low), index];
+		const highPriorityIndexes = indexes.filter(i => this.viewItems[i].priority === LayoutPriority.High);
+
 		const item = this.viewItems[index];
 		size = Math.round(size);
-		size = clamp(size, item.minimumSize, item.maximumSize);
-		let delta = size - item.size;
+		size = clamp(size, item.minimumSize, Math.min(item.maximumSize, this.size));
 
-		if (delta !== 0 && index < this.viewItems.length - 1) {
-			const downIndexes = range(index + 1, this.viewItems.length);
-			const collapseDown = downIndexes.reduce((r, i) => r + (this.viewItems[i].size - this.viewItems[i].minimumSize), 0);
-			const expandDown = downIndexes.reduce((r, i) => r + (this.viewItems[i].maximumSize - this.viewItems[i].size), 0);
-			const deltaDown = clamp(delta, -expandDown, collapseDown);
-
-			this.resize(index, deltaDown);
-			delta -= deltaDown;
-		}
-
-		if (delta !== 0 && index > 0) {
-			const upIndexes = range(index - 1, -1);
-			const collapseUp = upIndexes.reduce((r, i) => r + (this.viewItems[i].size - this.viewItems[i].minimumSize), 0);
-			const expandUp = upIndexes.reduce((r, i) => r + (this.viewItems[i].maximumSize - this.viewItems[i].size), 0);
-			const deltaUp = clamp(-delta, -collapseUp, expandUp);
-
-			this.resize(index - 1, deltaUp);
-		}
-
-		this.distributeEmptySpace();
-		this.layoutViews();
-		this.saveProportions();
+		item.size = size;
+		this.relayout(lowPriorityIndexes, highPriorityIndexes);
 		this.state = State.Idle;
 	}
 
 	distributeViewSizes(): void {
 		const size = Math.floor(this.size / this.viewItems.length);
 
-		for (let i = 0; i < this.viewItems.length - 1; i++) {
-			this.resizeView(i, size);
+		for (let i = 0; i < this.viewItems.length; i++) {
+			const item = this.viewItems[i];
+			item.size = clamp(size, item.minimumSize, item.maximumSize);
 		}
+
+		const indexes = range(this.viewItems.length);
+		const lowPriorityIndexes = indexes.filter(i => this.viewItems[i].priority === LayoutPriority.Low);
+		const highPriorityIndexes = indexes.filter(i => this.viewItems[i].priority === LayoutPriority.High);
+
+		this.relayout(lowPriorityIndexes, highPriorityIndexes);
 	}
 
 	getViewSize(index: number): number {
@@ -643,6 +622,15 @@ export class SplitView extends Disposable {
 		return this.viewItems[index].size;
 	}
 
+	private relayout(lowPriorityIndexes?: number[], highPriorityIndexes?: number[]): void {
+		const contentSize = this.viewItems.reduce((r, i) => r + i.size, 0);
+
+		this.resize(this.viewItems.length - 1, this.size - contentSize, undefined, lowPriorityIndexes, highPriorityIndexes);
+		this.distributeEmptySpace();
+		this.layoutViews();
+		this.saveProportions();
+	}
+
 	private resize(
 		index: number,
 		delta: number,
@@ -830,18 +818,26 @@ export class SplitView extends Disposable {
 	private findFirstSnapIndex(indexes: number[]): number | undefined {
 		// visible views first
 		for (const index of indexes) {
-			if (!this.viewItems[index].visible) {
+			const viewItem = this.viewItems[index];
+
+			if (!viewItem.visible) {
 				continue;
 			}
 
-			if (this.viewItems[index].snap) {
+			if (viewItem.snap) {
 				return index;
 			}
 		}
 
 		// then, hidden views
 		for (const index of indexes) {
-			if (!this.viewItems[index].visible && this.viewItems[index].snap) {
+			const viewItem = this.viewItems[index];
+
+			if (viewItem.visible && viewItem.maximumSize - viewItem.minimumSize > 0) {
+				return undefined;
+			}
+
+			if (!viewItem.visible && viewItem.snap) {
 				return index;
 			}
 		}
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index a034736f2f5..7624d5b1fbe 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -1183,7 +1183,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 	constructor(
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<any /* TODO@joao */, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, any>[],
 		private _options: IAbstractTreeOptions<T, TFilterData> = {}
 	) {
 		const treeDelegate = new ComposedTreeDelegate<T, ITreeNode<T, TFilterData>>(delegate);
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index e31422edf6a..4421bce8de1 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -320,7 +320,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 	get onDidFocus(): Event<void> { return this.tree.onDidFocus; }
 	get onDidBlur(): Event<void> { return this.tree.onDidBlur; }
 
-	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<IAsyncDataTreeNode<TInput, T>, TFilterData>> { return this.tree.onDidChangeCollapseState; }
+	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<IAsyncDataTreeNode<TInput, T> | null, TFilterData>> { return this.tree.onDidChangeCollapseState; }
 
 	get onDidUpdateOptions(): Event<IAsyncDataTreeOptionsUpdate> { return this.tree.onDidUpdateOptions; }
 
@@ -340,7 +340,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 	constructor(
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<any /* TODO@joao */, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, any>[],
 		private dataSource: IAsyncDataSource<TInput, T>,
 		options: IAsyncDataTreeOptions<T, TFilterData> = {}
 	) {
diff --git a/src/vs/base/browser/ui/tree/compressedObjectTree.ts b/src/vs/base/browser/ui/tree/compressedObjectTree.ts
new file mode 100644
index 00000000000..5d1b80462c5
--- /dev/null
+++ b/src/vs/base/browser/ui/tree/compressedObjectTree.ts
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Iterator, ISequence } from 'vs/base/common/iterator';
+import { AbstractTree, IAbstractTreeOptions } from 'vs/base/browser/ui/tree/abstractTree';
+import { ISpliceable } from 'vs/base/common/sequence';
+import { ITreeNode, ITreeModel, ITreeElement, ITreeRenderer, ITreeSorter, ICollapseStateChangeEvent } from 'vs/base/browser/ui/tree/tree';
+import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
+import { Event } from 'vs/base/common/event';
+import { CompressedTreeModel, ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
+
+export interface IObjectTreeOptions<T, TFilterData = void> extends IAbstractTreeOptions<T, TFilterData> {
+	sorter?: ITreeSorter<T>;
+}
+
+export class CompressedObjectTree<T extends NonNullable<any>, TFilterData = void> extends AbstractTree<ICompressedTreeNode<T> | null, TFilterData, T | null> {
+
+	protected model: CompressedTreeModel<T, TFilterData>;
+
+	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<ICompressedTreeNode<T> | null, TFilterData>> { return this.model.onDidChangeCollapseState; }
+
+	constructor(
+		container: HTMLElement,
+		delegate: IListVirtualDelegate<ICompressedTreeNode<T>>,
+		renderers: ITreeRenderer<ICompressedTreeNode<T>, TFilterData, any>[],
+		options: IObjectTreeOptions<ICompressedTreeNode<T>, TFilterData> = {}
+	) {
+		super(container, delegate, renderers, options);
+	}
+
+	setChildren(
+		element: T | null,
+		children?: ISequence<ITreeElement<T>>
+	): Iterator<ITreeElement<T | null>> {
+		return this.model.setChildren(element, children);
+	}
+
+	rerender(element?: T): void {
+		if (element === undefined) {
+			this.view.rerender();
+			return;
+		}
+
+		this.model.rerender(element);
+	}
+
+	resort(element: T, recursive = true): void {
+		this.model.resort(element, recursive);
+	}
+
+	protected createModel(view: ISpliceable<ITreeNode<ICompressedTreeNode<T>, TFilterData>>, options: IObjectTreeOptions<ICompressedTreeNode<T>, TFilterData>): ITreeModel<ICompressedTreeNode<T> | null, TFilterData, T | null> {
+		return new CompressedTreeModel(view, options);
+	}
+}
diff --git a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
new file mode 100644
index 00000000000..339dfdbbe9e
--- /dev/null
+++ b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
@@ -0,0 +1,418 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ISpliceable } from 'vs/base/common/sequence';
+import { Iterator, ISequence } from 'vs/base/common/iterator';
+import { Event } from 'vs/base/common/event';
+import { ITreeModel, ITreeNode, ITreeElement, ICollapseStateChangeEvent, ITreeModelSpliceEvent } from 'vs/base/browser/ui/tree/tree';
+import { IObjectTreeModelOptions, ObjectTreeModel, IObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
+
+export interface ICompressedTreeElement<T> extends ITreeElement<T> {
+	readonly children?: Iterator<ICompressedTreeElement<T>> | ICompressedTreeElement<T>[];
+	readonly incompressible?: boolean;
+}
+
+export interface ICompressedTreeNode<T> {
+	readonly elements: T[];
+	readonly incompressible: boolean;
+}
+
+export function compress<T>(element: ICompressedTreeElement<T>): ITreeElement<ICompressedTreeNode<T>> {
+	const elements = [element.element];
+	const incompressible = element.incompressible || false;
+
+	let childrenIterator: Iterator<ITreeElement<T>>;
+	let children: ITreeElement<T>[];
+
+	while (true) {
+		childrenIterator = Iterator.from(element.children);
+		children = Iterator.collect(childrenIterator, 2);
+
+		if (children.length !== 1) {
+			break;
+		}
+
+		element = children[0];
+
+		if (element.incompressible) {
+			break;
+		}
+
+		elements.push(element.element);
+	}
+
+	return {
+		element: { elements, incompressible },
+		children: Iterator.map(Iterator.concat(Iterator.fromArray(children), childrenIterator), compress)
+	};
+}
+
+export function _decompress<T>(element: ITreeElement<ICompressedTreeNode<T>>, index = 0): ICompressedTreeElement<T> {
+	let children: Iterator<ICompressedTreeElement<T>>;
+
+	if (index < element.element.elements.length - 1) {
+		children = Iterator.single(_decompress(element, index + 1));
+	} else {
+		children = Iterator.map(Iterator.from(element.children), el => _decompress(el, 0));
+	}
+
+	if (index === 0 && element.element.incompressible) {
+		return { element: element.element.elements[index], children, incompressible: true };
+	}
+
+	return { element: element.element.elements[index], children };
+}
+
+export function decompress<T>(element: ITreeElement<ICompressedTreeNode<T>>): ICompressedTreeElement<T> {
+	return _decompress(element, 0);
+}
+
+export function splice<T>(treeElement: ICompressedTreeElement<T>, element: T, children: Iterator<ICompressedTreeElement<T>>): ICompressedTreeElement<T> {
+	if (treeElement.element === element) {
+		return { element, children };
+	}
+
+	return {
+		...treeElement,
+		children: Iterator.map(Iterator.from(treeElement.children), e => splice(e, element, children))
+	};
+}
+
+export interface ICompressedTreeModelOptions<T, TFilterData> extends IObjectTreeModelOptions<ICompressedTreeNode<T>, TFilterData> { }
+
+export class CompressedTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> implements ITreeModel<ICompressedTreeNode<T> | null, TFilterData, T | null> {
+
+	readonly rootRef = null;
+
+	get onDidSplice(): Event<ITreeModelSpliceEvent<ICompressedTreeNode<T> | null, TFilterData>> { return this.model.onDidSplice; }
+	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<ICompressedTreeNode<T>, TFilterData>> { return this.model.onDidChangeCollapseState; }
+	get onDidChangeRenderNodeCount(): Event<ITreeNode<ICompressedTreeNode<T>, TFilterData>> { return this.model.onDidChangeRenderNodeCount; }
+
+	private model: ObjectTreeModel<ICompressedTreeNode<T>, TFilterData>;
+	private nodes = new Map<T | null, ICompressedTreeNode<T>>();
+
+	get size(): number { return this.nodes.size; }
+
+	constructor(list: ISpliceable<ITreeNode<ICompressedTreeNode<T>, TFilterData>>, options: ICompressedTreeModelOptions<T, TFilterData> = {}) {
+		this.model = new ObjectTreeModel(list, options);
+	}
+
+	setChildren(
+		element: T | null,
+		children: ISequence<ICompressedTreeElement<T>> | undefined,
+		onDidCreateNode?: (node: ITreeNode<ICompressedTreeNode<T>, TFilterData>) => void,
+		onDidDeleteNode?: (node: ITreeNode<ICompressedTreeNode<T>, TFilterData>) => void
+	): Iterator<ITreeElement<T | null>> {
+		const insertedElements = new Set<T | null>();
+		const _onDidCreateNode = (node: ITreeNode<ICompressedTreeNode<T>, TFilterData>) => {
+			for (const element of node.element.elements) {
+				insertedElements.add(element);
+				this.nodes.set(element, node.element);
+			}
+
+			// if (this.identityProvider) {
+			// 	const id = this.identityProvider.getId(node.element).toString();
+			// 	insertedElementIds.add(id);
+			// 	this.nodesByIdentity.set(id, node);
+			// }
+
+			if (onDidCreateNode) {
+				onDidCreateNode(node);
+			}
+		};
+
+		const _onDidDeleteNode = (node: ITreeNode<ICompressedTreeNode<T>, TFilterData>) => {
+			for (const element of node.element.elements) {
+				if (!insertedElements.has(element)) {
+					this.nodes.delete(element);
+				}
+			}
+
+			// if (this.identityProvider) {
+			// 	const id = this.identityProvider.getId(node.element).toString();
+			// 	if (!insertedElementIds.has(id)) {
+			// 		this.nodesByIdentity.delete(id);
+			// 	}
+			// }
+
+			if (onDidDeleteNode) {
+				onDidDeleteNode(node);
+			}
+		};
+
+		if (element === null) {
+			const compressedChildren = Iterator.map(Iterator.from(children), compress);
+			const result = this.model.setChildren(null, compressedChildren, _onDidCreateNode, _onDidDeleteNode);
+			return Iterator.map(result, decompress);
+		}
+
+		const compressedNode = this.nodes.get(element);
+		const node = this.model.getNode(compressedNode) as ITreeNode<ICompressedTreeNode<T>, TFilterData>;
+		const parent = node.parent!;
+
+		const decompressedElement = decompress(node);
+		const splicedElement = splice(decompressedElement, element, Iterator.from(children));
+		const recompressedElement = compress(splicedElement);
+
+		const parentChildren = parent.children
+			.map(child => child === node ? recompressedElement : child);
+
+		this.model.setChildren(parent.element, parentChildren, _onDidCreateNode, _onDidDeleteNode);
+
+		// TODO
+		return Iterator.empty();
+	}
+
+	getListIndex(location: T | null): number {
+		const node = this.getCompressedNode(location);
+		return this.model.getListIndex(node);
+	}
+
+	getListRenderCount(location: T | null): number {
+		const node = this.getCompressedNode(location);
+		return this.model.getListRenderCount(node);
+	}
+
+	getNode(location?: T | null | undefined): ITreeNode<ICompressedTreeNode<T> | null, TFilterData> {
+		if (typeof location === 'undefined') {
+			return this.model.getNode();
+		}
+
+		const node = this.getCompressedNode(location);
+		return this.model.getNode(node);
+	}
+
+	// TODO: review this
+	getNodeLocation(node: ITreeNode<ICompressedTreeNode<T>, TFilterData>): T | null {
+		const compressedNode = this.model.getNodeLocation(node);
+
+		if (compressedNode === null) {
+			return null;
+		}
+
+		return compressedNode.elements[compressedNode.elements.length - 1];
+	}
+
+	// TODO: review this
+	getParentNodeLocation(location: T | null): T | null {
+		const compressedNode = this.getCompressedNode(location);
+		const parentNode = this.model.getParentNodeLocation(compressedNode);
+
+		if (parentNode === null) {
+			return null;
+		}
+
+		return parentNode.elements[parentNode.elements.length - 1];
+	}
+
+	getParentElement(location: T | null): ICompressedTreeNode<T> | null {
+		const compressedNode = this.getCompressedNode(location);
+		return this.model.getParentElement(compressedNode);
+	}
+
+	getFirstElementChild(location: T | null): ICompressedTreeNode<T> | null | undefined {
+		const compressedNode = this.getCompressedNode(location);
+		return this.model.getFirstElementChild(compressedNode);
+	}
+
+	getLastElementAncestor(location?: T | null | undefined): ICompressedTreeNode<T> | null | undefined {
+		const compressedNode = typeof location === 'undefined' ? undefined : this.getCompressedNode(location);
+		return this.model.getLastElementAncestor(compressedNode);
+	}
+
+	isCollapsible(location: T | null): boolean {
+		const compressedNode = this.getCompressedNode(location);
+		return this.model.isCollapsible(compressedNode);
+	}
+
+	isCollapsed(location: T | null): boolean {
+		const compressedNode = this.getCompressedNode(location);
+		return this.model.isCollapsed(compressedNode);
+	}
+
+	setCollapsed(location: T | null, collapsed?: boolean | undefined, recursive?: boolean | undefined): boolean {
+		const compressedNode = this.getCompressedNode(location);
+		return this.model.setCollapsed(compressedNode, collapsed, recursive);
+	}
+
+	expandTo(location: T | null): void {
+		const compressedNode = this.getCompressedNode(location);
+		this.model.expandTo(compressedNode);
+	}
+
+	rerender(location: T | null): void {
+		const compressedNode = this.getCompressedNode(location);
+		this.model.rerender(compressedNode);
+	}
+
+	refilter(): void {
+		this.model.refilter();
+	}
+
+	resort(location: T | null = null, recursive = true): void {
+		const compressedNode = this.getCompressedNode(location);
+		this.model.resort(compressedNode, recursive);
+	}
+
+	private getCompressedNode(element: T | null): ICompressedTreeNode<T> | null {
+		if (element === null) {
+			return null;
+		}
+
+		const node = this.nodes.get(element);
+
+		if (!node) {
+			throw new Error(`Tree element not found: ${element}`);
+		}
+
+		return node;
+	}
+}
+
+export type ElementMapper<T> = (elements: T[]) => T;
+export const DefaultElementMapper: ElementMapper<any> = elements => elements[elements.length - 1];
+
+export type NodeMapper<T, TFilterData> = (node: ITreeNode<ICompressedTreeNode<T> | null, TFilterData>) => ITreeNode<T | null, TFilterData>;
+
+function mapNode<T, TFilterData>(elementMapper: ElementMapper<T>, node: ITreeNode<ICompressedTreeNode<T> | null, TFilterData>): ITreeNode<T | null, TFilterData> {
+	return {
+		...node,
+		element: node.element === null ? null : elementMapper(node.element.elements),
+		children: node.children.map(child => mapNode(elementMapper, child)),
+		parent: typeof node.parent === 'undefined' ? node.parent : mapNode(elementMapper, node.parent)
+	};
+}
+
+function createNodeMapper<T, TFilterData>(elementMapper: ElementMapper<T>): NodeMapper<T, TFilterData> {
+	return node => mapNode(elementMapper, node);
+}
+
+export interface ICompressedObjectTreeModelOptions<T, TFilterData> extends ICompressedTreeModelOptions<T, TFilterData> {
+	readonly elementMapper?: ElementMapper<T>;
+}
+
+export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> implements IObjectTreeModel<T, TFilterData> {
+
+	readonly rootRef = null;
+
+	get onDidSplice(): Event<ITreeModelSpliceEvent<T | null, TFilterData>> {
+		return Event.map(this.model.onDidSplice, ({ insertedNodes, deletedNodes }) => ({
+			insertedNodes: insertedNodes.map(this.mapNode),
+			deletedNodes: deletedNodes.map(this.mapNode),
+		}));
+	}
+
+	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<T | null, TFilterData>> {
+		return Event.map(this.model.onDidChangeCollapseState, ({ node, deep }) => ({
+			node: this.mapNode(node),
+			deep
+		}));
+	}
+
+	get onDidChangeRenderNodeCount(): Event<ITreeNode<T | null, TFilterData>> {
+		return Event.map(this.model.onDidChangeRenderNodeCount, this.mapNode);
+	}
+
+	private mapElement: ElementMapper<T | null>;
+	private mapNode: NodeMapper<T | null, TFilterData>;
+	private model: CompressedTreeModel<T, TFilterData>;
+
+	constructor(
+		list: ISpliceable<ITreeNode<ICompressedTreeNode<T>, TFilterData>>,
+		options: ICompressedObjectTreeModelOptions<T, TFilterData> = {}
+	) {
+		this.mapElement = options.elementMapper || DefaultElementMapper;
+		this.mapNode = createNodeMapper(this.mapElement);
+		this.model = new CompressedTreeModel(list, options);
+	}
+
+	setChildren(
+		element: T | null,
+		children: ISequence<ITreeElement<T>> | undefined
+	): Iterator<ITreeElement<T>> {
+		this.model.setChildren(element, children);
+
+		// TODO
+		return Iterator.empty();
+	}
+
+	getListIndex(location: T | null): number {
+		return this.model.getListIndex(location);
+	}
+
+	getListRenderCount(location: T | null): number {
+		return this.model.getListRenderCount(location);
+	}
+
+	getNode(location?: T | null | undefined): ITreeNode<T | null, any> {
+		return this.mapNode(this.model.getNode(location));
+	}
+
+	getNodeLocation(node: ITreeNode<T | null, any>): T | null {
+		return node.element;
+	}
+
+	getParentNodeLocation(location: T | null): T | null {
+		return this.model.getParentNodeLocation(location);
+	}
+
+	getParentElement(location: T | null): T | null {
+		const result = this.model.getParentElement(location);
+
+		if (result === null) {
+			return result;
+		}
+
+		return this.mapElement(result.elements);
+	}
+
+	getFirstElementChild(location: T | null): T | null | undefined {
+		const result = this.model.getFirstElementChild(location);
+
+		if (result === null || typeof result === 'undefined') {
+			return result;
+		}
+
+		return this.mapElement(result.elements);
+	}
+
+	getLastElementAncestor(location?: T | null | undefined): T | null | undefined {
+		const result = this.model.getLastElementAncestor(location);
+
+		if (result === null || typeof result === 'undefined') {
+			return result;
+		}
+
+		return this.mapElement(result.elements);
+	}
+
+	isCollapsible(location: T | null): boolean {
+		return this.model.isCollapsible(location);
+	}
+
+	isCollapsed(location: T | null): boolean {
+		return this.model.isCollapsed(location);
+	}
+
+	setCollapsed(location: T | null, collapsed?: boolean | undefined, recursive?: boolean | undefined): boolean {
+		return this.model.setCollapsed(location, collapsed, recursive);
+	}
+
+	expandTo(location: T | null): void {
+		return this.model.expandTo(location);
+	}
+
+	rerender(location: T | null): void {
+		return this.model.rerender(location);
+	}
+
+	refilter(): void {
+		return this.model.refilter();
+	}
+
+	resort(element: T | null = null, recursive = true): void {
+		return this.model.resort(element, recursive);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/tree/dataTree.ts b/src/vs/base/browser/ui/tree/dataTree.ts
index bb93ca31fad..9f51021a2e0 100644
--- a/src/vs/base/browser/ui/tree/dataTree.ts
+++ b/src/vs/base/browser/ui/tree/dataTree.ts
@@ -32,7 +32,7 @@ export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | nu
 	constructor(
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<any /* TODO@joao */, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, any>[],
 		private dataSource: IDataSource<TInput, T>,
 		options: IDataTreeOptions<T, TFilterData> = {}
 	) {
diff --git a/src/vs/base/browser/ui/tree/indexTree.ts b/src/vs/base/browser/ui/tree/indexTree.ts
index 54eb0e103e6..4378ffd3e1a 100644
--- a/src/vs/base/browser/ui/tree/indexTree.ts
+++ b/src/vs/base/browser/ui/tree/indexTree.ts
@@ -20,7 +20,7 @@ export class IndexTree<T, TFilterData = void> extends AbstractTree<T, TFilterDat
 	constructor(
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<any /* TODO@joao */, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, any>[],
 		private rootElement: T,
 		options: IIndexTreeOptions<T, TFilterData> = {}
 	) {
diff --git a/src/vs/base/browser/ui/tree/objectTree.ts b/src/vs/base/browser/ui/tree/objectTree.ts
index 38bca41901c..51873462959 100644
--- a/src/vs/base/browser/ui/tree/objectTree.ts
+++ b/src/vs/base/browser/ui/tree/objectTree.ts
@@ -7,7 +7,7 @@ import { Iterator, ISequence } from 'vs/base/common/iterator';
 import { AbstractTree, IAbstractTreeOptions } from 'vs/base/browser/ui/tree/abstractTree';
 import { ISpliceable } from 'vs/base/common/sequence';
 import { ITreeNode, ITreeModel, ITreeElement, ITreeRenderer, ITreeSorter, ICollapseStateChangeEvent } from 'vs/base/browser/ui/tree/tree';
-import { ObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
+import { ObjectTreeModel, IObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
 import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { Event } from 'vs/base/common/event';
 
@@ -17,14 +17,14 @@ export interface IObjectTreeOptions<T, TFilterData = void> extends IAbstractTree
 
 export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends AbstractTree<T | null, TFilterData, T | null> {
 
-	protected model: ObjectTreeModel<T, TFilterData>;
+	protected model: IObjectTreeModel<T, TFilterData>;
 
-	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<T, TFilterData>> { return this.model.onDidChangeCollapseState; }
+	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<T | null, TFilterData>> { return this.model.onDidChangeCollapseState; }
 
 	constructor(
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<any /* TODO@joao */, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, any>[],
 		options: IObjectTreeOptions<T, TFilterData> = {}
 	) {
 		super(container, delegate, renderers, options);
@@ -32,11 +32,9 @@ export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends
 
 	setChildren(
 		element: T | null,
-		children?: ISequence<ITreeElement<T>>,
-		onDidCreateNode?: (node: ITreeNode<T, TFilterData>) => void,
-		onDidDeleteNode?: (node: ITreeNode<T, TFilterData>) => void
+		children?: ISequence<ITreeElement<T>>
 	): Iterator<ITreeElement<T | null>> {
-		return this.model.setChildren(element, children, onDidCreateNode, onDidDeleteNode);
+		return this.model.setChildren(element, children);
 	}
 
 	rerender(element?: T): void {
diff --git a/src/vs/base/browser/ui/tree/objectTreeModel.ts b/src/vs/base/browser/ui/tree/objectTreeModel.ts
index d836e39f116..626d1264daa 100644
--- a/src/vs/base/browser/ui/tree/objectTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/objectTreeModel.ts
@@ -10,12 +10,19 @@ import { Event } from 'vs/base/common/event';
 import { ITreeModel, ITreeNode, ITreeElement, ITreeSorter, ICollapseStateChangeEvent, ITreeModelSpliceEvent } from 'vs/base/browser/ui/tree/tree';
 import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
 
+export type ITreeNodeCallback<T, TFilterData> = (node: ITreeNode<T, TFilterData>) => void;
+
+export interface IObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> extends ITreeModel<T | null, TFilterData, T | null> {
+	setChildren(element: T | null, children: ISequence<ITreeElement<T>> | undefined): Iterator<ITreeElement<T>>;
+	resort(element?: T | null, recursive?: boolean): void;
+}
+
 export interface IObjectTreeModelOptions<T, TFilterData> extends IIndexTreeModelOptions<T, TFilterData> {
 	readonly sorter?: ITreeSorter<T>;
 	readonly identityProvider?: IIdentityProvider<T>;
 }
 
-export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> implements ITreeModel<T | null, TFilterData, T | null> {
+export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> implements IObjectTreeModel<T, TFilterData> {
 
 	readonly rootRef = null;
 
@@ -51,9 +58,9 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 	setChildren(
 		element: T | null,
 		children: ISequence<ITreeElement<T>> | undefined,
-		onDidCreateNode?: (node: ITreeNode<T, TFilterData>) => void,
-		onDidDeleteNode?: (node: ITreeNode<T, TFilterData>) => void
-	): Iterator<ITreeElement<T | null>> {
+		onDidCreateNode?: ITreeNodeCallback<T, TFilterData>,
+		onDidDeleteNode?: ITreeNodeCallback<T, TFilterData>
+	): Iterator<ITreeElement<T>> {
 		const location = this.getElementLocation(element);
 		return this._setChildren(location, this.preserveCollapseState(children), onDidCreateNode, onDidDeleteNode);
 	}
@@ -61,9 +68,9 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 	private _setChildren(
 		location: number[],
 		children: ISequence<ITreeElement<T>> | undefined,
-		onDidCreateNode?: (node: ITreeNode<T, TFilterData>) => void,
-		onDidDeleteNode?: (node: ITreeNode<T, TFilterData>) => void
-	): Iterator<ITreeElement<T | null>> {
+		onDidCreateNode?: ITreeNodeCallback<T, TFilterData>,
+		onDidDeleteNode?: ITreeNodeCallback<T, TFilterData>
+	): Iterator<ITreeElement<T>> {
 		const insertedElements = new Set<T | null>();
 		const insertedElementIds = new Set<string>();
 
@@ -107,7 +114,7 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 			_onDidDeleteNode
 		);
 
-		return result;
+		return result as Iterator<ITreeElement<T>>;
 	}
 
 	private preserveCollapseState(elements: ISequence<ITreeElement<T>> | undefined): ISequence<ITreeElement<T>> {
@@ -144,7 +151,7 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 		});
 	}
 
-	rerender(element: T): void {
+	rerender(element: T | null): void {
 		const location = this.getElementLocation(element);
 		this.model.rerender(location);
 	}
@@ -190,32 +197,32 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 		return this.model.getLastElementAncestor(location);
 	}
 
-	getListIndex(element: T): number {
+	getListIndex(element: T | null): number {
 		const location = this.getElementLocation(element);
 		return this.model.getListIndex(location);
 	}
 
-	getListRenderCount(element: T): number {
+	getListRenderCount(element: T | null): number {
 		const location = this.getElementLocation(element);
 		return this.model.getListRenderCount(location);
 	}
 
-	isCollapsible(element: T): boolean {
+	isCollapsible(element: T | null): boolean {
 		const location = this.getElementLocation(element);
 		return this.model.isCollapsible(location);
 	}
 
-	isCollapsed(element: T): boolean {
+	isCollapsed(element: T | null): boolean {
 		const location = this.getElementLocation(element);
 		return this.model.isCollapsed(location);
 	}
 
-	setCollapsed(element: T, collapsed?: boolean, recursive?: boolean): boolean {
+	setCollapsed(element: T | null, collapsed?: boolean, recursive?: boolean): boolean {
 		const location = this.getElementLocation(element);
 		return this.model.setCollapsed(location, collapsed, recursive);
 	}
 
-	expandTo(element: T): void {
+	expandTo(element: T | null): void {
 		const location = this.getElementLocation(element);
 		this.model.expandTo(location);
 	}
@@ -238,11 +245,15 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 		return node;
 	}
 
-	getNodeLocation(node: ITreeNode<T, TFilterData>): T {
+	getNodeLocation(node: ITreeNode<T, TFilterData>): T | null {
 		return node.element;
 	}
 
-	getParentNodeLocation(element: T): T | null {
+	getParentNodeLocation(element: T | null): T | null {
+		if (element === null) {
+			throw new Error(`Invalid getParentNodeLocation call`);
+		}
+
 		const node = this.nodes.get(element);
 
 		if (!node) {
diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts
index 80b30fa4c55..5f9f2e14d69 100644
--- a/src/vs/base/browser/ui/tree/tree.ts
+++ b/src/vs/base/browser/ui/tree/tree.ts
@@ -124,6 +124,7 @@ export interface ITreeModel<T, TFilterData, TRef> {
 	setCollapsed(location: TRef, collapsed?: boolean, recursive?: boolean): boolean;
 	expandTo(location: TRef): void;
 
+	rerender(location: TRef): void;
 	refilter(): void;
 }
 
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 8b89e002422..2a423637149 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -326,6 +326,20 @@ export namespace Event {
 		return result.event;
 	}
 
+	export interface DOMEventEmitter {
+		addEventListener(event: string | symbol, listener: Function): void;
+		removeEventListener(event: string | symbol, listener: Function): void;
+	}
+
+	export function fromDOMEventEmitter<T>(emitter: DOMEventEmitter, eventName: string, map: (...args: any[]) => T = id => id): Event<T> {
+		const fn = (...args: any[]) => result.fire(map(...args));
+		const onFirstListenerAdd = () => emitter.addEventListener(eventName, fn);
+		const onLastListenerRemove = () => emitter.removeEventListener(eventName, fn);
+		const result = new Emitter<T>({ onFirstListenerAdd, onLastListenerRemove });
+
+		return result.event;
+	}
+
 	export function fromPromise<T = any>(promise: Promise<T>): Event<undefined> {
 		const emitter = new Emitter<undefined>();
 		let shouldEmit = false;
diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts
index 038bf263222..db53b8aef57 100644
--- a/src/vs/base/common/iterator.ts
+++ b/src/vs/base/common/iterator.ts
@@ -29,6 +29,21 @@ export module Iterator {
 		return _empty;
 	}
 
+	export function single<T>(value: T): Iterator<T> {
+		let done = false;
+
+		return {
+			next(): IteratorResult<T> {
+				if (done) {
+					return FIN;
+				}
+
+				done = true;
+				return { done: false, value };
+			}
+		};
+	}
+
 	export function fromArray<T>(array: T[], index = 0, length = array.length): Iterator<T> {
 		return {
 			next(): IteratorResult<T> {
@@ -86,11 +101,47 @@ export module Iterator {
 		}
 	}
 
-	export function collect<T>(iterator: Iterator<T>): T[] {
+	export function collect<T>(iterator: Iterator<T>, atMost: number = Number.POSITIVE_INFINITY): T[] {
 		const result: T[] = [];
-		forEach(iterator, value => result.push(value));
+
+		if (atMost === 0) {
+			return result;
+		}
+
+		let i = 0;
+
+		for (let next = iterator.next(); !next.done; next = iterator.next()) {
+			result.push(next.value);
+
+			if (++i >= atMost) {
+				break;
+			}
+		}
+
 		return result;
 	}
+
+	export function concat<T>(...iterators: Iterator<T>[]): Iterator<T> {
+		let i = 0;
+
+		return {
+			next() {
+				if (i >= iterators.length) {
+					return FIN;
+				}
+
+				const iterator = iterators[i];
+				const result = iterator.next();
+
+				if (result.done) {
+					i++;
+					return this.next();
+				}
+
+				return result;
+			}
+		};
+	}
 }
 
 export type ISequence<T> = Iterator<T> | T[];
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index 79f206f23be..6be438cee41 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -207,6 +207,43 @@ export class MutableDisposable<T extends IDisposable> implements IDisposable {
 	}
 }
 
+/**
+ * Wrapper class that stores a disposable that is not currently "owned" by anyone.
+ *
+ * Example use cases:
+ *
+ * - Express that a function/method will take ownership of a disposable parameter.
+ * - Express that a function returns a disposable that the caller must explicitly take ownership of.
+ */
+export class UnownedDisposable<T extends IDisposable> extends Disposable {
+	private _hasBeenAcquired = false;
+	private _value?: T;
+
+	public constructor(value: T) {
+		super();
+		this._value = value;
+	}
+
+	public acquire(): T {
+		if (this._hasBeenAcquired) {
+			throw new Error('This disposable has already been acquired');
+		}
+		this._hasBeenAcquired = true;
+		const value = this._value!;
+		this._value = undefined;
+		return value;
+	}
+
+	public dispose() {
+		super.dispose();
+		if (!this._hasBeenAcquired) {
+			this._hasBeenAcquired = true;
+			this._value!.dispose();
+			this._value = undefined;
+		}
+	}
+}
+
 export interface IReference<T> extends IDisposable {
 	readonly object: T;
 }
diff --git a/src/vs/base/test/browser/ui/grid/gridview.test.ts b/src/vs/base/test/browser/ui/grid/gridview.test.ts
index 76f4e4ac68c..20b7626b184 100644
--- a/src/vs/base/test/browser/ui/grid/gridview.test.ts
+++ b/src/vs/base/test/browser/ui/grid/gridview.test.ts
@@ -107,19 +107,19 @@ suite('Gridview', function () {
 	test('simple layout', function () {
 		gridview.layout(800, 600);
 
-		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view1 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view1, 200, [0]);
 		assert.deepEqual(view1.size, [800, 600]);
 		assert.deepEqual(gridview.getViewSize([0]), { width: 800, height: 600 });
 
-		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view2 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view2, 200, [0]);
 		assert.deepEqual(view1.size, [800, 400]);
 		assert.deepEqual(gridview.getViewSize([1]), { width: 800, height: 400 });
 		assert.deepEqual(view2.size, [800, 200]);
 		assert.deepEqual(gridview.getViewSize([0]), { width: 800, height: 200 });
 
-		const view3 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view3 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view3, 200, [1, 1]);
 		assert.deepEqual(view1.size, [600, 400]);
 		assert.deepEqual(gridview.getViewSize([1, 0]), { width: 600, height: 400 });
@@ -128,7 +128,7 @@ suite('Gridview', function () {
 		assert.deepEqual(view3.size, [200, 400]);
 		assert.deepEqual(gridview.getViewSize([1, 1]), { width: 200, height: 400 });
 
-		const view4 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view4 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view4, 200, [0, 0]);
 		assert.deepEqual(view1.size, [600, 400]);
 		assert.deepEqual(gridview.getViewSize([1, 0]), { width: 600, height: 400 });
@@ -139,7 +139,7 @@ suite('Gridview', function () {
 		assert.deepEqual(view4.size, [200, 200]);
 		assert.deepEqual(gridview.getViewSize([0, 0]), { width: 200, height: 200 });
 
-		const view5 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view5 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view5, 100, [1, 0, 1]);
 		assert.deepEqual(view1.size, [600, 300]);
 		assert.deepEqual(gridview.getViewSize([1, 0, 0]), { width: 600, height: 300 });
@@ -156,30 +156,30 @@ suite('Gridview', function () {
 	test('simple layout with automatic size distribution', function () {
 		gridview.layout(800, 600);
 
-		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view1 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view1, Sizing.Distribute, [0]);
 		assert.deepEqual(view1.size, [800, 600]);
 		assert.deepEqual(gridview.getViewSize([0]), { width: 800, height: 600 });
 
-		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view2 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view2, Sizing.Distribute, [0]);
 		assert.deepEqual(view1.size, [800, 300]);
 		assert.deepEqual(view2.size, [800, 300]);
 
-		const view3 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view3 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view3, Sizing.Distribute, [1, 1]);
 		assert.deepEqual(view1.size, [400, 300]);
 		assert.deepEqual(view2.size, [800, 300]);
 		assert.deepEqual(view3.size, [400, 300]);
 
-		const view4 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view4 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view4, Sizing.Distribute, [0, 0]);
 		assert.deepEqual(view1.size, [400, 300]);
 		assert.deepEqual(view2.size, [400, 300]);
 		assert.deepEqual(view3.size, [400, 300]);
 		assert.deepEqual(view4.size, [400, 300]);
 
-		const view5 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view5 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view5, Sizing.Distribute, [1, 0, 1]);
 		assert.deepEqual(view1.size, [400, 150]);
 		assert.deepEqual(view2.size, [400, 300]);
@@ -190,13 +190,13 @@ suite('Gridview', function () {
 
 	test('addviews before layout call 1', function () {
 
-		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view1 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view1, 200, [0]);
 
-		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view2 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view2, 200, [0]);
 
-		const view3 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view3 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view3, 200, [1, 1]);
 
 		gridview.layout(800, 600);
@@ -207,14 +207,13 @@ suite('Gridview', function () {
 	});
 
 	test('addviews before layout call 2', function () {
-
-		const view1 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view1 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view1, 200, [0]);
 
-		const view2 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view2 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view2, 200, [0]);
 
-		const view3 = new TestView(50, Number.MAX_VALUE, 50, Number.MAX_VALUE);
+		const view3 = new TestView(50, Number.POSITIVE_INFINITY, 50, Number.POSITIVE_INFINITY);
 		gridview.addView(view3, 200, [0, 0]);
 
 		gridview.layout(800, 600);
diff --git a/src/vs/base/test/browser/ui/splitview/splitview.test.ts b/src/vs/base/test/browser/ui/splitview/splitview.test.ts
index 00c698c79cb..504e665f21a 100644
--- a/src/vs/base/test/browser/ui/splitview/splitview.test.ts
+++ b/src/vs/base/test/browser/ui/splitview/splitview.test.ts
@@ -196,8 +196,8 @@ suite('Splitview', () => {
 		splitview.resizeView(0, 70);
 
 		assert.equal(view1.size, 70, 'view1 is collapsed');
-		assert.equal(view2.size, 110, 'view2 is expanded');
-		assert.equal(view3.size, 20, 'view3 stays the same');
+		assert.equal(view2.size, 40, 'view2 stays the same');
+		assert.equal(view3.size, 90, 'view3 is stretched');
 
 		splitview.resizeView(2, 40);
 
@@ -474,10 +474,10 @@ suite('Splitview', () => {
 		splitview.addView(view1, Sizing.Distribute);
 		splitview.addView(view2, Sizing.Distribute);
 		splitview.addView(view3, Sizing.Distribute);
-		assert.deepEqual([view1.size, view2.size, view3.size], [66, 66, 68]);
+		assert.deepEqual([view1.size, view2.size, view3.size], [66, 68, 66]);
 
 		splitview.layout(180);
-		assert.deepEqual([view1.size, view2.size, view3.size], [66, 46, 68]);
+		assert.deepEqual([view1.size, view2.size, view3.size], [66, 48, 66]);
 
 		splitview.layout(124);
 		assert.deepEqual([view1.size, view2.size, view3.size], [66, 20, 38]);
@@ -504,13 +504,13 @@ suite('Splitview', () => {
 		splitview.addView(view1, Sizing.Distribute);
 		splitview.addView(view2, Sizing.Distribute);
 		splitview.addView(view3, Sizing.Distribute);
-		assert.deepEqual([view1.size, view2.size, view3.size], [66, 66, 68]);
+		assert.deepEqual([view1.size, view2.size, view3.size], [66, 68, 66]);
 
 		splitview.layout(180);
-		assert.deepEqual([view1.size, view2.size, view3.size], [66, 46, 68]);
+		assert.deepEqual([view1.size, view2.size, view3.size], [66, 48, 66]);
 
 		splitview.layout(132);
-		assert.deepEqual([view1.size, view2.size, view3.size], [44, 20, 68]);
+		assert.deepEqual([view1.size, view2.size, view3.size], [46, 20, 66]);
 
 		splitview.layout(60);
 		assert.deepEqual([view1.size, view2.size, view3.size], [20, 20, 20]);
diff --git a/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts
new file mode 100644
index 00000000000..4d03b49a0a8
--- /dev/null
+++ b/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts
@@ -0,0 +1,430 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { compress, ICompressedTreeElement, ICompressedTreeNode, decompress, CompressedTreeModel } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
+import { Iterator } from 'vs/base/common/iterator';
+import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
+import { ISpliceable } from 'vs/base/common/sequence';
+
+interface IResolvedCompressedTreeElement<T> extends ICompressedTreeElement<T> {
+	readonly element: T;
+	readonly children?: ICompressedTreeElement<T>[];
+}
+
+function resolve<T>(treeElement: ICompressedTreeElement<T>): IResolvedCompressedTreeElement<T> {
+	const result: any = { element: treeElement.element };
+	const children = Iterator.collect(Iterator.map(Iterator.from(treeElement.children), resolve));
+
+	if (treeElement.incompressible) {
+		result.incompressible = true;
+	}
+
+	if (children.length > 0) {
+		result.children = children;
+	}
+
+	return result;
+}
+
+suite('CompressedObjectTree', function () {
+
+	suite('compress & decompress', function () {
+
+		test('small', function () {
+			const decompressed: ICompressedTreeElement<number> = { element: 1 };
+			const compressed: IResolvedCompressedTreeElement<ICompressedTreeNode<number>> =
+				{ element: { elements: [1], incompressible: false } };
+
+			assert.deepEqual(resolve(compress(decompressed)), compressed);
+			assert.deepEqual(resolve(decompress(compressed)), decompressed);
+		});
+
+		test('no compression', function () {
+			const decompressed: ICompressedTreeElement<number> = {
+				element: 1, children: [
+					{ element: 11 },
+					{ element: 12 },
+					{ element: 13 }
+				]
+			};
+
+			const compressed: IResolvedCompressedTreeElement<ICompressedTreeNode<number>> = {
+				element: { elements: [1], incompressible: false },
+				children: [
+					{ element: { elements: [11], incompressible: false } },
+					{ element: { elements: [12], incompressible: false } },
+					{ element: { elements: [13], incompressible: false } }
+				]
+			};
+
+			assert.deepEqual(resolve(compress(decompressed)), compressed);
+			assert.deepEqual(resolve(decompress(compressed)), decompressed);
+		});
+
+		test('single hierarchy', function () {
+			const decompressed: ICompressedTreeElement<number> = {
+				element: 1, children: [
+					{
+						element: 11, children: [
+							{
+								element: 111, children: [
+									{ element: 1111 }
+								]
+							}
+						]
+					}
+				]
+			};
+
+			const compressed: IResolvedCompressedTreeElement<ICompressedTreeNode<number>> = {
+				element: { elements: [1, 11, 111, 1111], incompressible: false }
+			};
+
+			assert.deepEqual(resolve(compress(decompressed)), compressed);
+			assert.deepEqual(resolve(decompress(compressed)), decompressed);
+		});
+
+		test('deep compression', function () {
+			const decompressed: ICompressedTreeElement<number> = {
+				element: 1, children: [
+					{
+						element: 11, children: [
+							{
+								element: 111, children: [
+									{ element: 1111 },
+									{ element: 1112 },
+									{ element: 1113 },
+									{ element: 1114 },
+								]
+							}
+						]
+					}
+				]
+			};
+
+			const compressed: IResolvedCompressedTreeElement<ICompressedTreeNode<number>> = {
+				element: { elements: [1, 11, 111], incompressible: false },
+				children: [
+					{ element: { elements: [1111], incompressible: false } },
+					{ element: { elements: [1112], incompressible: false } },
+					{ element: { elements: [1113], incompressible: false } },
+					{ element: { elements: [1114], incompressible: false } },
+				]
+			};
+
+			assert.deepEqual(resolve(compress(decompressed)), compressed);
+			assert.deepEqual(resolve(decompress(compressed)), decompressed);
+		});
+
+		test('double deep compression', function () {
+			const decompressed: ICompressedTreeElement<number> = {
+				element: 1, children: [
+					{
+						element: 11, children: [
+							{
+								element: 111, children: [
+									{ element: 1112 },
+									{ element: 1113 },
+								]
+							}
+						]
+					},
+					{
+						element: 12, children: [
+							{
+								element: 121, children: [
+									{ element: 1212 },
+									{ element: 1213 },
+								]
+							}
+						]
+					}
+				]
+			};
+
+			const compressed: IResolvedCompressedTreeElement<ICompressedTreeNode<number>> = {
+				element: { elements: [1], incompressible: false },
+				children: [
+					{
+						element: { elements: [11, 111], incompressible: false },
+						children: [
+							{ element: { elements: [1112], incompressible: false } },
+							{ element: { elements: [1113], incompressible: false } },
+						]
+					},
+					{
+						element: { elements: [12, 121], incompressible: false },
+						children: [
+							{ element: { elements: [1212], incompressible: false } },
+							{ element: { elements: [1213], incompressible: false } },
+						]
+					}
+				]
+			};
+
+			assert.deepEqual(resolve(compress(decompressed)), compressed);
+			assert.deepEqual(resolve(decompress(compressed)), decompressed);
+		});
+
+		test('incompressible leaf', function () {
+			const decompressed: ICompressedTreeElement<number> = {
+				element: 1, children: [
+					{
+						element: 11, children: [
+							{
+								element: 111, children: [
+									{ element: 1111, incompressible: true }
+								]
+							}
+						]
+					}
+				]
+			};
+
+			const compressed: IResolvedCompressedTreeElement<ICompressedTreeNode<number>> = {
+				element: { elements: [1, 11, 111], incompressible: false },
+				children: [
+					{ element: { elements: [1111], incompressible: true } }
+				]
+			};
+
+			assert.deepEqual(resolve(compress(decompressed)), compressed);
+			assert.deepEqual(resolve(decompress(compressed)), decompressed);
+		});
+
+		test('incompressible branch', function () {
+			const decompressed: ICompressedTreeElement<number> = {
+				element: 1, children: [
+					{
+						element: 11, children: [
+							{
+								element: 111, incompressible: true, children: [
+									{ element: 1111 }
+								]
+							}
+						]
+					}
+				]
+			};
+
+			const compressed: IResolvedCompressedTreeElement<ICompressedTreeNode<number>> = {
+				element: { elements: [1, 11], incompressible: false },
+				children: [
+					{ element: { elements: [111, 1111], incompressible: true } }
+				]
+			};
+
+			assert.deepEqual(resolve(compress(decompressed)), compressed);
+			assert.deepEqual(resolve(decompress(compressed)), decompressed);
+		});
+
+		test('incompressible chain', function () {
+			const decompressed: ICompressedTreeElement<number> = {
+				element: 1, children: [
+					{
+						element: 11, children: [
+							{
+								element: 111, incompressible: true, children: [
+									{ element: 1111, incompressible: true }
+								]
+							}
+						]
+					}
+				]
+			};
+
+			const compressed: IResolvedCompressedTreeElement<ICompressedTreeNode<number>> = {
+				element: { elements: [1, 11], incompressible: false },
+				children: [
+					{
+						element: { elements: [111], incompressible: true },
+						children: [
+							{ element: { elements: [1111], incompressible: true } }
+						]
+					}
+				]
+			};
+
+			assert.deepEqual(resolve(compress(decompressed)), compressed);
+			assert.deepEqual(resolve(decompress(compressed)), decompressed);
+		});
+
+		test('incompressible tree', function () {
+			const decompressed: ICompressedTreeElement<number> = {
+				element: 1, children: [
+					{
+						element: 11, incompressible: true, children: [
+							{
+								element: 111, incompressible: true, children: [
+									{ element: 1111, incompressible: true }
+								]
+							}
+						]
+					}
+				]
+			};
+
+			const compressed: IResolvedCompressedTreeElement<ICompressedTreeNode<number>> = {
+				element: { elements: [1], incompressible: false },
+				children: [
+					{
+						element: { elements: [11], incompressible: true },
+						children: [
+							{
+								element: { elements: [111], incompressible: true },
+								children: [
+									{ element: { elements: [1111], incompressible: true } }
+								]
+							}
+						]
+					}
+				]
+			};
+
+			assert.deepEqual(resolve(compress(decompressed)), compressed);
+			assert.deepEqual(resolve(decompress(compressed)), decompressed);
+		});
+	});
+
+	function toSpliceable<T>(arr: T[]): ISpliceable<T> {
+		return {
+			splice(start: number, deleteCount: number, elements: T[]): void {
+				arr.splice(start, deleteCount, ...elements);
+			}
+		};
+	}
+
+	function toArray<T>(list: ITreeNode<ICompressedTreeNode<T>>[]): T[][] {
+		return list.map(i => i.element.elements);
+	}
+
+	suite('CompressedObjectTreeModel', function () {
+
+		test('ctor', () => {
+			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
+			const model = new CompressedTreeModel<number>(toSpliceable(list));
+			assert(model);
+			assert.equal(list.length, 0);
+			assert.equal(model.size, 0);
+		});
+
+		test('flat', () => {
+			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
+			const model = new CompressedTreeModel<number>(toSpliceable(list));
+
+			model.setChildren(null, Iterator.fromArray([
+				{ element: 0 },
+				{ element: 1 },
+				{ element: 2 }
+			]));
+
+			assert.deepEqual(toArray(list), [[0], [1], [2]]);
+			assert.equal(model.size, 3);
+
+			model.setChildren(null, Iterator.fromArray([
+				{ element: 3 },
+				{ element: 4 },
+				{ element: 5 },
+			]));
+
+			assert.deepEqual(toArray(list), [[3], [4], [5]]);
+			assert.equal(model.size, 3);
+
+			model.setChildren(null, Iterator.empty());
+			assert.deepEqual(toArray(list), []);
+			assert.equal(model.size, 0);
+		});
+
+		test('nested', () => {
+			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
+			const model = new CompressedTreeModel<number>(toSpliceable(list));
+
+			model.setChildren(null, Iterator.fromArray([
+				{
+					element: 0, children: Iterator.fromArray([
+						{ element: 10 },
+						{ element: 11 },
+						{ element: 12 },
+					])
+				},
+				{ element: 1 },
+				{ element: 2 }
+			]));
+
+			assert.deepEqual(toArray(list), [[0], [10], [11], [12], [1], [2]]);
+			assert.equal(model.size, 6);
+
+			model.setChildren(12, Iterator.fromArray([
+				{ element: 120 },
+				{ element: 121 }
+			]));
+
+			assert.deepEqual(toArray(list), [[0], [10], [11], [12], [120], [121], [1], [2]]);
+			assert.equal(model.size, 8);
+
+			model.setChildren(0, Iterator.empty());
+			assert.deepEqual(toArray(list), [[0], [1], [2]]);
+			assert.equal(model.size, 3);
+
+			model.setChildren(null, Iterator.empty());
+			assert.deepEqual(toArray(list), []);
+			assert.equal(model.size, 0);
+		});
+
+		test('compressed', () => {
+			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
+			const model = new CompressedTreeModel<number>(toSpliceable(list));
+
+			model.setChildren(null, Iterator.fromArray([
+				{
+					element: 1, children: Iterator.fromArray([{
+						element: 11, children: Iterator.fromArray([{
+							element: 111, children: Iterator.fromArray([
+								{ element: 1111 },
+								{ element: 1112 },
+								{ element: 1113 },
+							])
+						}])
+					}])
+				}
+			]));
+
+			assert.deepEqual(toArray(list), [[1, 11, 111], [1111], [1112], [1113]]);
+			assert.equal(model.size, 6);
+
+			model.setChildren(11, Iterator.fromArray([
+				{ element: 111 },
+				{ element: 112 },
+				{ element: 113 },
+			]));
+
+			assert.deepEqual(toArray(list), [[1, 11], [111], [112], [113]]);
+			assert.equal(model.size, 5);
+
+			model.setChildren(113, Iterator.fromArray([
+				{ element: 1131 }
+			]));
+
+			assert.deepEqual(toArray(list), [[1, 11], [111], [112], [113, 1131]]);
+			assert.equal(model.size, 6);
+
+			model.setChildren(1131, Iterator.fromArray([
+				{ element: 1132 }
+			]));
+
+			assert.deepEqual(toArray(list), [[1, 11], [111], [112], [113, 1131, 1132]]);
+			assert.equal(model.size, 7);
+
+			model.setChildren(1131, Iterator.fromArray([
+				{ element: 1132 },
+				{ element: 1133 },
+			]));
+
+			assert.deepEqual(toArray(list), [[1, 11], [111], [112], [113, 1131], [1132], [1133]]);
+			assert.equal(model.size, 8);
+		});
+	});
+});
\ No newline at end of file
diff --git a/src/vs/base/test/common/iterator.test.ts b/src/vs/base/test/common/iterator.test.ts
new file mode 100644
index 00000000000..b7a165c5095
--- /dev/null
+++ b/src/vs/base/test/common/iterator.test.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { Iterator } from 'vs/base/common/iterator';
+
+suite('Iterator', () => {
+	test('concat', () => {
+		const first = Iterator.fromArray([1, 2, 3]);
+		const second = Iterator.fromArray([4, 5, 6]);
+		const third = Iterator.fromArray([7, 8, 9]);
+		const actualIterator = Iterator.concat(first, second, third);
+		const actual = Iterator.collect(actualIterator);
+
+		assert.deepEqual(actual, [1, 2, 3, 4, 5, 6, 7, 8, 9]);
+	});
+});
\ No newline at end of file
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
index 829ce5e4aea..097dd15b3c5 100644
--- a/src/vs/code/browser/workbench/workbench.html
+++ b/src/vs/code/browser/workbench/workbench.html
@@ -10,7 +10,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 
 		<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote:; media-src 'none'; child-src 'self' {{WEBVIEW_ENDPOINT}}; script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' ws: wss: https:; font-src 'self' blob: vscode-remote:;">
+		content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote:; media-src 'none'; frame-src 'self' {{WEBVIEW_ENDPOINT}} https://*.vscode-webview-test.com; script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' ws: wss: https:; font-src 'self' blob: vscode-remote:;">
 
 		<meta id="vscode-workbench-web-configuration" data-settings="{{WORKBENCH_WEB_CONGIGURATION}}">
 
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index baeaa641903..b85c29ffc4a 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -37,8 +37,8 @@ import { ILocalizationsService } from 'vs/platform/localizations/common/localiza
 import { LocalizationsChannel } from 'vs/platform/localizations/node/localizationsIpc';
 import { DialogChannelClient } from 'vs/platform/dialogs/node/dialogIpc';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { DownloadService } from 'vs/platform/download/node/downloadService';
+import { combinedDisposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { DownloadService } from 'vs/platform/download/common/downloadService';
 import { IDownloadService } from 'vs/platform/download/common/download';
 import { IChannel, IServerChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
 import { NodeCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner';
@@ -115,7 +115,6 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
 	services.set(ILogService, logService);
 	services.set(IConfigurationService, configurationService);
 	services.set(IRequestService, new SyncDescriptor(RequestService));
-	services.set(IDownloadService, new SyncDescriptor(DownloadService));
 	services.set(IProductService, new SyncDescriptor(ProductService));
 
 	const mainProcessService = new MainProcessService(server, mainRouter);
@@ -138,6 +137,8 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
 	disposables.add(diskFileSystemProvider);
 	fileService.registerProvider(Schemas.file, diskFileSystemProvider);
 
+	services.set(IDownloadService, new SyncDescriptor(DownloadService));
+
 	const instantiationService = new InstantiationService(services);
 
 	let telemetryService: ITelemetryService;
@@ -153,7 +154,7 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
 		if (!extensionDevelopmentLocationURI && !environmentService.args['disable-telemetry'] && product.enableTelemetry) {
 			if (product.aiConfig && product.aiConfig.asimovKey && isBuilt) {
 				appInsightsAppender = new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey, telemetryLogService);
-				disposables.add(appInsightsAppender); // Ensure the AI appender is disposed so that it flushes remaining data
+				disposables.add(toDisposable(() => appInsightsAppender!.flush())); // Ensure the AI appender is disposed so that it flushes remaining data
 			}
 			const config: ITelemetryServiceConfig = {
 				appender: combinedAppender(appInsightsAppender, new LogAppender(logService)),
diff --git a/src/vs/code/electron-browser/workbench/workbench.html b/src/vs/code/electron-browser/workbench/workbench.html
index 7070141cca2..dfac360344a 100644
--- a/src/vs/code/electron-browser/workbench/workbench.html
+++ b/src/vs/code/electron-browser/workbench/workbench.html
@@ -3,7 +3,7 @@
 <html>
 	<head>
 		<meta charset="utf-8" />
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote:;">
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote:; media-src 'none'; frame-src 'self' https://*.vscode-webview-test.com; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote:;">
 	</head>
 	<body class="vs-dark" aria-label="">
 	</body>
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 69d059b4e40..7d8c5522c30 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -77,7 +77,7 @@ import { HistoryMainService } from 'vs/platform/history/electron-main/historyMai
 import { URLService } from 'vs/platform/url/common/urlService';
 import { WorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
 import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { nodeWebSocketFactory } from 'vs/platform/remote/node/nodeWebSocketFactory';
+import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { statSync } from 'fs';
 import { ISignService } from 'vs/platform/sign/common/sign';
@@ -708,7 +708,7 @@ export class CodeApplication extends Disposable {
 				const options: IConnectionOptions = {
 					isBuilt,
 					commit: product.commit,
-					webSocketFactory: nodeWebSocketFactory,
+					socketFactory: nodeSocketFactory,
 					addressProvider: {
 						getAddress: () => {
 							return Promise.resolve({ host, port });
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 1f3aeb31063..032287a3b5d 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -86,7 +86,7 @@ export class Main {
 			await this.setInstallSource(argv['install-source']);
 
 		} else if (argv['list-extensions']) {
-			await this.listExtensions(!!argv['show-versions']);
+			await this.listExtensions(!!argv['show-versions'], argv['category']);
 
 		} else if (argv['install-extension']) {
 			const arg = argv['install-extension'];
@@ -110,8 +110,17 @@ export class Main {
 		return writeFile(this.environmentService.installSourcePath, installSource.slice(0, 30));
 	}
 
-	private async listExtensions(showVersions: boolean): Promise<void> {
-		const extensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
+	private async listExtensions(showVersions: boolean, category?: string): Promise<void> {
+		let extensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
+		if (category) {
+			extensions = extensions.filter(e => {
+				if (e.manifest.categories) {
+					const lowerCaseCategories: string[] = e.manifest.categories.map(c => c.toLowerCase());
+					return lowerCaseCategories.indexOf(category.toLowerCase()) > -1;
+				}
+				return false;
+			});
+		}
 		extensions.forEach(e => console.log(getId(e.manifest, showVersions)));
 	}
 
@@ -345,8 +354,6 @@ export async function main(argv: ParsedArgs): Promise<void> {
 
 			services.set(ITelemetryService, new SyncDescriptor(TelemetryService, [config]));
 
-			// Dispose the AI adapter so that remaining data gets flushed.
-			disposables.add(combinedAppender(...appenders));
 		} else {
 			services.set(ITelemetryService, NullTelemetryService);
 		}
@@ -356,6 +363,8 @@ export async function main(argv: ParsedArgs): Promise<void> {
 
 		try {
 			await main.run(argv);
+			// Flush the remaining data in AI adapter.
+			await combinedAppender(...appenders).flush();
 		} finally {
 			disposables.dispose();
 		}
diff --git a/src/vs/editor/browser/controller/coreCommands.ts b/src/vs/editor/browser/controller/coreCommands.ts
index e72acd359f3..193ff840ac4 100644
--- a/src/vs/editor/browser/controller/coreCommands.ts
+++ b/src/vs/editor/browser/controller/coreCommands.ts
@@ -316,6 +316,9 @@ export namespace CoreNavigationCommands {
 			const result = this._getColumnSelectResult(cursors.context, cursors.getPrimaryCursor(), cursors.getColumnSelectData(), args);
 			cursors.setStates(args.source, CursorChangeReason.Explicit, result.viewStates.map((viewState) => CursorState.fromViewState(viewState)));
 			cursors.setColumnSelectData({
+				isReal: true,
+				fromViewLineNumber: result.fromLineNumber,
+				fromViewVisualColumn: result.fromVisualColumn,
 				toViewLineNumber: result.toLineNumber,
 				toViewVisualColumn: result.toVisualColumn
 			});
@@ -338,15 +341,15 @@ export namespace CoreNavigationCommands {
 
 			// validate `args`
 			const validatedPosition = context.model.validatePosition(args.position);
+			const validatedViewPosition = context.validateViewPosition(new Position(args.viewPosition.lineNumber, args.viewPosition.column), validatedPosition);
 
-			let validatedViewPosition: Position;
-			if (args.viewPosition) {
-				validatedViewPosition = context.validateViewPosition(new Position(args.viewPosition.lineNumber, args.viewPosition.column), validatedPosition);
-			} else {
-				validatedViewPosition = context.convertModelPositionToViewPosition(validatedPosition);
+			let fromViewLineNumber = prevColumnSelectData.fromViewLineNumber;
+			let fromViewVisualColumn = prevColumnSelectData.fromViewVisualColumn;
+			if (!prevColumnSelectData.isReal && args.setAnchorIfNotSet) {
+				fromViewLineNumber = validatedViewPosition.lineNumber;
+				fromViewVisualColumn = args.mouseColumn - 1;
 			}
-
-			return ColumnSelection.columnSelect(context.config, context.viewModel, primary.viewState.selection, validatedViewPosition.lineNumber, args.mouseColumn - 1);
+			return ColumnSelection.columnSelect(context.config, context.viewModel, fromViewLineNumber, fromViewVisualColumn, validatedViewPosition.lineNumber, args.mouseColumn - 1);
 		}
 	});
 
@@ -365,7 +368,7 @@ export namespace CoreNavigationCommands {
 		}
 
 		protected _getColumnSelectResult(context: CursorContext, primary: CursorState, prevColumnSelectData: IColumnSelectData, args: any): IColumnSelectResult {
-			return ColumnSelection.columnSelectLeft(context.config, context.viewModel, primary.viewState, prevColumnSelectData.toViewLineNumber, prevColumnSelectData.toViewVisualColumn);
+			return ColumnSelection.columnSelectLeft(context.config, context.viewModel, prevColumnSelectData);
 		}
 	});
 
@@ -384,7 +387,7 @@ export namespace CoreNavigationCommands {
 		}
 
 		protected _getColumnSelectResult(context: CursorContext, primary: CursorState, prevColumnSelectData: IColumnSelectData, args: any): IColumnSelectResult {
-			return ColumnSelection.columnSelectRight(context.config, context.viewModel, primary.viewState, prevColumnSelectData.toViewLineNumber, prevColumnSelectData.toViewVisualColumn);
+			return ColumnSelection.columnSelectRight(context.config, context.viewModel, prevColumnSelectData);
 		}
 	});
 
@@ -398,7 +401,7 @@ export namespace CoreNavigationCommands {
 		}
 
 		protected _getColumnSelectResult(context: CursorContext, primary: CursorState, prevColumnSelectData: IColumnSelectData, args: any): IColumnSelectResult {
-			return ColumnSelection.columnSelectUp(context.config, context.viewModel, primary.viewState, this._isPaged, prevColumnSelectData.toViewLineNumber, prevColumnSelectData.toViewVisualColumn);
+			return ColumnSelection.columnSelectUp(context.config, context.viewModel, prevColumnSelectData, this._isPaged);
 		}
 	}
 
@@ -436,7 +439,7 @@ export namespace CoreNavigationCommands {
 		}
 
 		protected _getColumnSelectResult(context: CursorContext, primary: CursorState, prevColumnSelectData: IColumnSelectData, args: any): IColumnSelectResult {
-			return ColumnSelection.columnSelectDown(context.config, context.viewModel, primary.viewState, this._isPaged, prevColumnSelectData.toViewLineNumber, prevColumnSelectData.toViewVisualColumn);
+			return ColumnSelection.columnSelectDown(context.config, context.viewModel, prevColumnSelectData, this._isPaged);
 		}
 	}
 
diff --git a/src/vs/editor/browser/view/viewController.ts b/src/vs/editor/browser/view/viewController.ts
index d2389995052..10fb2e1aa6b 100644
--- a/src/vs/editor/browser/view/viewController.ts
+++ b/src/vs/editor/browser/view/viewController.ts
@@ -133,7 +133,7 @@ export class ViewController {
 	public dispatchMouse(data: IMouseDispatchData): void {
 		if (data.middleButton) {
 			if (data.inSelectionMode) {
-				this._columnSelect(data.position, data.mouseColumn);
+				this._columnSelect(data.position, data.mouseColumn, true);
 			} else {
 				this.moveTo(data.position);
 			}
@@ -182,7 +182,7 @@ export class ViewController {
 			if (this._hasMulticursorModifier(data)) {
 				if (!this._hasNonMulticursorModifier(data)) {
 					if (data.shiftKey) {
-						this._columnSelect(data.position, data.mouseColumn);
+						this._columnSelect(data.position, data.mouseColumn, false);
 					} else {
 						// Do multi-cursor operations only when purely alt is pressed
 						if (data.inSelectionMode) {
@@ -195,7 +195,7 @@ export class ViewController {
 			} else {
 				if (data.inSelectionMode) {
 					if (data.altKey) {
-						this._columnSelect(data.position, data.mouseColumn);
+						this._columnSelect(data.position, data.mouseColumn, true);
 					} else {
 						this._moveToSelect(data.position);
 					}
@@ -222,12 +222,13 @@ export class ViewController {
 		this._execMouseCommand(CoreNavigationCommands.MoveToSelect, this._usualArgs(viewPosition));
 	}
 
-	private _columnSelect(viewPosition: Position, mouseColumn: number): void {
+	private _columnSelect(viewPosition: Position, mouseColumn: number, setAnchorIfNotSet: boolean): void {
 		viewPosition = this._validateViewColumn(viewPosition);
 		this._execMouseCommand(CoreNavigationCommands.ColumnSelect, {
 			position: this._convertViewToModelPosition(viewPosition),
 			viewPosition: viewPosition,
-			mouseColumn: mouseColumn
+			mouseColumn: mouseColumn,
+			setAnchorIfNotSet: setAnchorIfNotSet
 		});
 	}
 
diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
index ac0621d64fb..c275168cca7 100644
--- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
+++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
@@ -324,11 +324,6 @@ class Widget {
 		const aboveLeft0 = topLeft.left - ctx.scrollLeft;
 		const belowLeft0 = bottomLeft.left - ctx.scrollLeft;
 
-		if (aboveLeft0 < 0 || aboveLeft0 > this._contentWidth) {
-			// Don't render if position is scrolled outside viewport
-			return null;
-		}
-
 		let aboveTop = topLeft.top - height;
 		let belowTop = bottomLeft.top + this._lineHeight;
 		let aboveLeft = aboveLeft0 + this._contentLeft;
diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index e2397249709..00b684e7ef4 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -12,7 +12,7 @@ import { IStringBuilder } from 'vs/editor/common/core/stringBuilder';
 import { IConfiguration } from 'vs/editor/common/editorCommon';
 import { HorizontalRange } from 'vs/editor/common/view/renderingContext';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { CharacterMapping, ForeignElementType, RenderLineInput, renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
+import { CharacterMapping, ForeignElementType, RenderLineInput, renderViewLine, LineRange } from 'vs/editor/common/viewLayout/viewLineRenderer';
 import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
 import { InlineDecorationType } from 'vs/editor/common/viewModel/viewModel';
 import { HIGH_CONTRAST, ThemeType } from 'vs/platform/theme/common/themeService';
@@ -69,7 +69,7 @@ export class DomReadingContext {
 
 export class ViewLineOptions {
 	public readonly themeType: ThemeType;
-	public readonly renderWhitespace: 'none' | 'boundary' | 'all';
+	public readonly renderWhitespace: 'none' | 'boundary' | 'selection' | 'all';
 	public readonly renderControlCharacters: boolean;
 	public readonly spaceWidth: number;
 	public readonly useMonospaceOptimizations: boolean;
@@ -152,7 +152,7 @@ export class ViewLine implements IVisibleLine {
 		this._options = newOptions;
 	}
 	public onSelectionChanged(): boolean {
-		if (alwaysRenderInlineSelection || this._options.themeType === HIGH_CONTRAST) {
+		if (alwaysRenderInlineSelection || this._options.themeType === HIGH_CONTRAST || this._options.renderWhitespace === 'selection') {
 			this._isMaybeInvalid = true;
 			return true;
 		}
@@ -171,7 +171,9 @@ export class ViewLine implements IVisibleLine {
 		const options = this._options;
 		const actualInlineDecorations = LineDecoration.filter(lineData.inlineDecorations, lineNumber, lineData.minColumn, lineData.maxColumn);
 
-		if (alwaysRenderInlineSelection || options.themeType === HIGH_CONTRAST) {
+		// Only send selection information when needed for rendering whitespace
+		let selectionsOnLine: LineRange[] | null = null;
+		if (alwaysRenderInlineSelection || options.themeType === HIGH_CONTRAST || this._options.renderWhitespace === 'selection') {
 			const selections = viewportData.selections;
 			for (const selection of selections) {
 
@@ -184,7 +186,15 @@ export class ViewLine implements IVisibleLine {
 				const endColumn = (selection.endLineNumber === lineNumber ? selection.endColumn : lineData.maxColumn);
 
 				if (startColumn < endColumn) {
-					actualInlineDecorations.push(new LineDecoration(startColumn, endColumn, 'inline-selected-text', InlineDecorationType.Regular));
+					if (this._options.renderWhitespace !== 'selection') {
+						actualInlineDecorations.push(new LineDecoration(startColumn, endColumn, 'inline-selected-text', InlineDecorationType.Regular));
+					} else {
+						if (!selectionsOnLine) {
+							selectionsOnLine = [];
+						}
+
+						selectionsOnLine.push(new LineRange(startColumn - 1, endColumn - 1));
+					}
 				}
 			}
 		}
@@ -204,7 +214,8 @@ export class ViewLine implements IVisibleLine {
 			options.stopRenderingLineAfter,
 			options.renderWhitespace,
 			options.renderControlCharacters,
-			options.fontLigatures
+			options.fontLigatures,
+			selectionsOnLine
 		);
 
 		if (this._renderedViewLine && this._renderedViewLine.input.equals(renderLineInput)) {
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index a285c5af16f..9c3c0df63e8 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -2027,7 +2027,8 @@ class InlineViewZonesComputer extends ViewZonesComputer {
 			config.viewInfo.stopRenderingLineAfter,
 			config.viewInfo.renderWhitespace,
 			config.viewInfo.renderControlCharacters,
-			config.viewInfo.fontLigatures
+			config.viewInfo.fontLigatures,
+			null // Send no selections, original line cannot be selected
 		), sb);
 
 		sb.appendASCIIString('</div>');
diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts
index beb608e6d74..037883dd530 100644
--- a/src/vs/editor/browser/widget/diffReview.ts
+++ b/src/vs/editor/browser/widget/diffReview.ts
@@ -780,7 +780,8 @@ export class DiffReview extends Disposable {
 			config.viewInfo.stopRenderingLineAfter,
 			config.viewInfo.renderWhitespace,
 			config.viewInfo.renderControlCharacters,
-			config.viewInfo.fontLigatures
+			config.viewInfo.fontLigatures,
+			null
 		));
 
 		return r.html;
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index f7b61db2b35..e9fcfe8030a 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -901,10 +901,11 @@ const editorConfiguration: IConfigurationNode = {
 		},
 		'editor.renderWhitespace': {
 			'type': 'string',
-			'enum': ['none', 'boundary', 'all'],
+			'enum': ['none', 'boundary', 'selection', 'all'],
 			'enumDescriptions': [
 				'',
 				nls.localize('renderWhiteSpace.boundary', "Render whitespace characters except for single spaces between words."),
+				nls.localize('renderWhitespace.selection', "Render whitespace characters only on selected text."),
 				''
 			],
 			default: EDITOR_DEFAULTS.viewInfo.renderWhitespace,
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 6c010edc1cf..79ba4dc836d 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -664,7 +664,7 @@ export interface IEditorOptions {
 	 * Enable rendering of whitespace.
 	 * Defaults to none.
 	 */
-	renderWhitespace?: 'none' | 'boundary' | 'all';
+	renderWhitespace?: 'none' | 'boundary' | 'selection' | 'all';
 	/**
 	 * Enable rendering of control characters.
 	 * Defaults to false.
@@ -999,7 +999,7 @@ export interface InternalEditorViewOptions {
 	readonly scrollBeyondLastColumn: number;
 	readonly smoothScrolling: boolean;
 	readonly stopRenderingLineAfter: number;
-	readonly renderWhitespace: 'none' | 'boundary' | 'all';
+	readonly renderWhitespace: 'none' | 'boundary' | 'selection' | 'all';
 	readonly renderControlCharacters: boolean;
 	readonly fontLigatures: boolean;
 	readonly renderIndentGuides: boolean;
@@ -2017,7 +2017,7 @@ export class EditorOptionsValidator {
 			} else if (<any>renderWhitespace === false) {
 				renderWhitespace = 'none';
 			}
-			renderWhitespace = _stringSet<'none' | 'boundary' | 'all'>(renderWhitespace, defaults.renderWhitespace, ['none', 'boundary', 'all']);
+			renderWhitespace = _stringSet<'none' | 'boundary' | 'selection' | 'all'>(renderWhitespace, defaults.renderWhitespace, ['none', 'boundary', 'selection', 'all']);
 		}
 
 		let renderLineHighlight = opts.renderLineHighlight;
diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts
index 81493777b1c..add9f3444a9 100644
--- a/src/vs/editor/common/controller/cursor.ts
+++ b/src/vs/editor/common/controller/cursor.ts
@@ -314,9 +314,14 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 		}
 		const primaryCursor = this._cursors.getPrimaryCursor();
 		const primaryPos = primaryCursor.viewState.position;
+		const viewLineNumber = primaryPos.lineNumber;
+		const viewVisualColumn = CursorColumns.visibleColumnFromColumn2(this.context.config, this.context.viewModel, primaryPos);
 		return {
-			toViewLineNumber: primaryPos.lineNumber,
-			toViewVisualColumn: CursorColumns.visibleColumnFromColumn2(this.context.config, this.context.viewModel, primaryPos)
+			isReal: false,
+			fromViewLineNumber: viewLineNumber,
+			fromViewVisualColumn: viewVisualColumn,
+			toViewLineNumber: viewLineNumber,
+			toViewVisualColumn: viewVisualColumn,
 		};
 	}
 
diff --git a/src/vs/editor/common/controller/cursorColumnSelection.ts b/src/vs/editor/common/controller/cursorColumnSelection.ts
index efa35ca08e1..cb89e0efcbd 100644
--- a/src/vs/editor/common/controller/cursorColumnSelection.ts
+++ b/src/vs/editor/common/controller/cursorColumnSelection.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CursorColumns, CursorConfiguration, ICursorSimpleModel, SingleCursorState } from 'vs/editor/common/controller/cursorCommon';
+import { CursorColumns, CursorConfiguration, ICursorSimpleModel, SingleCursorState, IColumnSelectData } from 'vs/editor/common/controller/cursorCommon';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
 
 export interface IColumnSelectResult {
 	viewStates: SingleCursorState[];
 	reversed: boolean;
+	fromLineNumber: number;
+	fromVisualColumn: number;
 	toLineNumber: number;
 	toVisualColumn: number;
 }
 
 export class ColumnSelection {
 
-	private static _columnSelect(config: CursorConfiguration, model: ICursorSimpleModel, fromLineNumber: number, fromVisibleColumn: number, toLineNumber: number, toVisibleColumn: number): IColumnSelectResult {
+	public static columnSelect(config: CursorConfiguration, model: ICursorSimpleModel, fromLineNumber: number, fromVisibleColumn: number, toLineNumber: number, toVisibleColumn: number): IColumnSelectResult {
 		let lineCount = Math.abs(toLineNumber - fromLineNumber) + 1;
 		let reversed = (fromLineNumber > toLineNumber);
 		let isRTL = (fromVisibleColumn > toVisibleColumn);
@@ -61,64 +62,65 @@ export class ColumnSelection {
 			));
 		}
 
+		if (result.length === 0) {
+			// We are after all the lines, so add cursor at the end of each line
+			for (let i = 0; i < lineCount; i++) {
+				const lineNumber = fromLineNumber + (reversed ? -i : i);
+				const maxColumn = model.getLineMaxColumn(lineNumber);
+
+				result.push(new SingleCursorState(
+					new Range(lineNumber, maxColumn, lineNumber, maxColumn), 0,
+					new Position(lineNumber, maxColumn), 0
+				));
+			}
+		}
+
 		return {
 			viewStates: result,
 			reversed: reversed,
+			fromLineNumber: fromLineNumber,
+			fromVisualColumn: fromVisibleColumn,
 			toLineNumber: toLineNumber,
 			toVisualColumn: toVisibleColumn
 		};
 	}
 
-	public static columnSelect(config: CursorConfiguration, model: ICursorSimpleModel, fromViewSelection: Selection, toViewLineNumber: number, toViewVisualColumn: number): IColumnSelectResult {
-		const fromViewPosition = new Position(fromViewSelection.selectionStartLineNumber, fromViewSelection.selectionStartColumn);
-		const fromViewVisibleColumn = CursorColumns.visibleColumnFromColumn2(config, model, fromViewPosition);
-		return ColumnSelection._columnSelect(config, model, fromViewPosition.lineNumber, fromViewVisibleColumn, toViewLineNumber, toViewVisualColumn);
-	}
-
-	public static columnSelectLeft(config: CursorConfiguration, model: ICursorSimpleModel, cursor: SingleCursorState, toViewLineNumber: number, toViewVisualColumn: number): IColumnSelectResult {
+	public static columnSelectLeft(config: CursorConfiguration, model: ICursorSimpleModel, prevColumnSelectData: IColumnSelectData): IColumnSelectResult {
+		let toViewVisualColumn = prevColumnSelectData.toViewVisualColumn;
 		if (toViewVisualColumn > 1) {
 			toViewVisualColumn--;
 		}
 
-		return this.columnSelect(config, model, cursor.selection, toViewLineNumber, toViewVisualColumn);
+		return ColumnSelection.columnSelect(config, model, prevColumnSelectData.fromViewLineNumber, prevColumnSelectData.fromViewVisualColumn, prevColumnSelectData.toViewLineNumber, toViewVisualColumn);
 	}
 
-	public static columnSelectRight(config: CursorConfiguration, model: ICursorSimpleModel, cursor: SingleCursorState, toViewLineNumber: number, toViewVisualColumn: number): IColumnSelectResult {
+	public static columnSelectRight(config: CursorConfiguration, model: ICursorSimpleModel, prevColumnSelectData: IColumnSelectData): IColumnSelectResult {
 		let maxVisualViewColumn = 0;
-		let minViewLineNumber = Math.min(cursor.position.lineNumber, toViewLineNumber);
-		let maxViewLineNumber = Math.max(cursor.position.lineNumber, toViewLineNumber);
+		const minViewLineNumber = Math.min(prevColumnSelectData.fromViewLineNumber, prevColumnSelectData.toViewLineNumber);
+		const maxViewLineNumber = Math.max(prevColumnSelectData.fromViewLineNumber, prevColumnSelectData.toViewLineNumber);
 		for (let lineNumber = minViewLineNumber; lineNumber <= maxViewLineNumber; lineNumber++) {
-			let lineMaxViewColumn = model.getLineMaxColumn(lineNumber);
-			let lineMaxVisualViewColumn = CursorColumns.visibleColumnFromColumn2(config, model, new Position(lineNumber, lineMaxViewColumn));
+			const lineMaxViewColumn = model.getLineMaxColumn(lineNumber);
+			const lineMaxVisualViewColumn = CursorColumns.visibleColumnFromColumn2(config, model, new Position(lineNumber, lineMaxViewColumn));
 			maxVisualViewColumn = Math.max(maxVisualViewColumn, lineMaxVisualViewColumn);
 		}
 
+		let toViewVisualColumn = prevColumnSelectData.toViewVisualColumn;
 		if (toViewVisualColumn < maxVisualViewColumn) {
 			toViewVisualColumn++;
 		}
 
-		return this.columnSelect(config, model, cursor.selection, toViewLineNumber, toViewVisualColumn);
+		return this.columnSelect(config, model, prevColumnSelectData.fromViewLineNumber, prevColumnSelectData.fromViewVisualColumn, prevColumnSelectData.toViewLineNumber, toViewVisualColumn);
 	}
 
-	public static columnSelectUp(config: CursorConfiguration, model: ICursorSimpleModel, cursor: SingleCursorState, isPaged: boolean, toViewLineNumber: number, toViewVisualColumn: number): IColumnSelectResult {
-		let linesCount = isPaged ? config.pageSize : 1;
-
-		toViewLineNumber -= linesCount;
-		if (toViewLineNumber < 1) {
-			toViewLineNumber = 1;
-		}
-
-		return this.columnSelect(config, model, cursor.selection, toViewLineNumber, toViewVisualColumn);
+	public static columnSelectUp(config: CursorConfiguration, model: ICursorSimpleModel, prevColumnSelectData: IColumnSelectData, isPaged: boolean): IColumnSelectResult {
+		const linesCount = isPaged ? config.pageSize : 1;
+		const toViewLineNumber = Math.max(1, prevColumnSelectData.toViewLineNumber - linesCount);
+		return this.columnSelect(config, model, prevColumnSelectData.fromViewLineNumber, prevColumnSelectData.fromViewVisualColumn, toViewLineNumber, prevColumnSelectData.toViewVisualColumn);
 	}
 
-	public static columnSelectDown(config: CursorConfiguration, model: ICursorSimpleModel, cursor: SingleCursorState, isPaged: boolean, toViewLineNumber: number, toViewVisualColumn: number): IColumnSelectResult {
-		let linesCount = isPaged ? config.pageSize : 1;
-
-		toViewLineNumber += linesCount;
-		if (toViewLineNumber > model.getLineCount()) {
-			toViewLineNumber = model.getLineCount();
-		}
-
-		return this.columnSelect(config, model, cursor.selection, toViewLineNumber, toViewVisualColumn);
+	public static columnSelectDown(config: CursorConfiguration, model: ICursorSimpleModel, prevColumnSelectData: IColumnSelectData, isPaged: boolean): IColumnSelectResult {
+		const linesCount = isPaged ? config.pageSize : 1;
+		const toViewLineNumber = Math.min(model.getLineCount(), prevColumnSelectData.toViewLineNumber + linesCount);
+		return this.columnSelect(config, model, prevColumnSelectData.fromViewLineNumber, prevColumnSelectData.fromViewVisualColumn, toViewLineNumber, prevColumnSelectData.toViewVisualColumn);
 	}
 }
diff --git a/src/vs/editor/common/controller/cursorCommon.ts b/src/vs/editor/common/controller/cursorCommon.ts
index d6a64206ec4..844387516d6 100644
--- a/src/vs/editor/common/controller/cursorCommon.ts
+++ b/src/vs/editor/common/controller/cursorCommon.ts
@@ -21,6 +21,9 @@ import { VerticalRevealType } from 'vs/editor/common/view/viewEvents';
 import { IViewModel } from 'vs/editor/common/viewModel/viewModel';
 
 export interface IColumnSelectData {
+	isReal: boolean;
+	fromViewLineNumber: number;
+	fromViewVisualColumn: number;
 	toViewLineNumber: number;
 	toViewVisualColumn: number;
 }
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index f1b5c0422cb..bbb9b39cb8c 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -13,7 +13,8 @@ import { InlineDecorationType } from 'vs/editor/common/viewModel/viewModel';
 export const enum RenderWhitespace {
 	None = 0,
 	Boundary = 1,
-	All = 2
+	Selection = 2,
+	All = 3
 }
 
 class LinePart {
@@ -31,6 +32,28 @@ class LinePart {
 	}
 }
 
+export class LineRange {
+	/**
+	 * Zero-based offset on which the range starts, inclusive.
+	 */
+	public readonly startOffset: number;
+
+	/**
+	 * Zero-based offset on which the range ends, inclusive.
+	 */
+	public readonly endOffset: number;
+
+	constructor(startIndex: number, endIndex: number) {
+		this.startOffset = startIndex;
+		this.endOffset = endIndex;
+	}
+
+	public equals(otherLineRange: LineRange) {
+		return this.startOffset === otherLineRange.startOffset
+			&& this.endOffset === otherLineRange.endOffset;
+	}
+}
+
 export class RenderLineInput {
 
 	public readonly useMonospaceOptimizations: boolean;
@@ -49,6 +72,12 @@ export class RenderLineInput {
 	public readonly renderControlCharacters: boolean;
 	public readonly fontLigatures: boolean;
 
+	/**
+	 * Defined only when renderWhitespace is 'selection'. Selections are non-overlapping,
+	 * and ordered by position within the line.
+	 */
+	public readonly selectionsOnLine: LineRange[] | null;
+
 	constructor(
 		useMonospaceOptimizations: boolean,
 		canUseHalfwidthRightwardsArrow: boolean,
@@ -62,9 +91,10 @@ export class RenderLineInput {
 		tabSize: number,
 		spaceWidth: number,
 		stopRenderingLineAfter: number,
-		renderWhitespace: 'none' | 'boundary' | 'all',
+		renderWhitespace: 'none' | 'boundary' | 'selection' | 'all',
 		renderControlCharacters: boolean,
-		fontLigatures: boolean
+		fontLigatures: boolean,
+		selectionsOnLine: LineRange[] | null
 	) {
 		this.useMonospaceOptimizations = useMonospaceOptimizations;
 		this.canUseHalfwidthRightwardsArrow = canUseHalfwidthRightwardsArrow;
@@ -83,10 +113,35 @@ export class RenderLineInput {
 				? RenderWhitespace.All
 				: renderWhitespace === 'boundary'
 					? RenderWhitespace.Boundary
-					: RenderWhitespace.None
+					: renderWhitespace === 'selection'
+						? RenderWhitespace.Selection
+						: RenderWhitespace.None
 		);
 		this.renderControlCharacters = renderControlCharacters;
 		this.fontLigatures = fontLigatures;
+		this.selectionsOnLine = selectionsOnLine && selectionsOnLine.sort((a, b) => a.startOffset < b.startOffset ? -1 : 1);
+	}
+
+	private sameSelection(otherSelections: LineRange[] | null): boolean {
+		if (this.selectionsOnLine === null) {
+			return otherSelections === null;
+		}
+
+		if (otherSelections === null) {
+			return false;
+		}
+
+		if (otherSelections.length !== this.selectionsOnLine.length) {
+			return false;
+		}
+
+		for (let i = 0; i < this.selectionsOnLine.length; i++) {
+			if (!this.selectionsOnLine[i].equals(otherSelections[i])) {
+				return false;
+			}
+		}
+
+		return true;
 	}
 
 	public equals(other: RenderLineInput): boolean {
@@ -106,6 +161,7 @@ export class RenderLineInput {
 			&& this.fontLigatures === other.fontLigatures
 			&& LineDecoration.equalsArr(this.lineDecorations, other.lineDecorations)
 			&& this.lineTokens.equals(other.lineTokens)
+			&& this.sameSelection(other.selectionsOnLine)
 		);
 	}
 }
@@ -338,8 +394,8 @@ function resolveRenderLineInput(input: RenderLineInput): ResolvedRenderLineInput
 	}
 
 	let tokens = transformAndRemoveOverflowing(input.lineTokens, input.fauxIndentLength, len);
-	if (input.renderWhitespace === RenderWhitespace.All || input.renderWhitespace === RenderWhitespace.Boundary) {
-		tokens = _applyRenderWhitespace(lineContent, len, input.continuesWithWrappedLine, tokens, input.fauxIndentLength, input.tabSize, useMonospaceOptimizations, input.renderWhitespace === RenderWhitespace.Boundary);
+	if (input.renderWhitespace === RenderWhitespace.All || input.renderWhitespace === RenderWhitespace.Boundary || (input.renderWhitespace === RenderWhitespace.Selection && !!input.selectionsOnLine)) {
+		tokens = _applyRenderWhitespace(lineContent, len, input.continuesWithWrappedLine, tokens, input.fauxIndentLength, input.tabSize, useMonospaceOptimizations, input.selectionsOnLine, input.renderWhitespace === RenderWhitespace.Boundary);
 	}
 	let containsForeignElements = ForeignElementType.None;
 	if (input.lineDecorations.length > 0) {
@@ -481,7 +537,7 @@ function splitLargeTokens(lineContent: string, tokens: LinePart[], onlyAtSpaces:
  * Moreover, a token is created for every visual indent because on some fonts the glyphs used for rendering whitespace (&rarr; or &middot;) do not have the same width as &nbsp;.
  * The rendering phase will generate `style="width:..."` for these tokens.
  */
-function _applyRenderWhitespace(lineContent: string, len: number, continuesWithWrappedLine: boolean, tokens: LinePart[], fauxIndentLength: number, tabSize: number, useMonospaceOptimizations: boolean, onlyBoundary: boolean): LinePart[] {
+function _applyRenderWhitespace(lineContent: string, len: number, continuesWithWrappedLine: boolean, tokens: LinePart[], fauxIndentLength: number, tabSize: number, useMonospaceOptimizations: boolean, selections: LineRange[] | null, onlyBoundary: boolean): LinePart[] {
 
 	let result: LinePart[] = [], resultLen = 0;
 	let tokenIndex = 0;
@@ -511,11 +567,17 @@ function _applyRenderWhitespace(lineContent: string, len: number, continuesWithW
 		}
 	}
 	tmpIndent = tmpIndent % tabSize;
-
 	let wasInWhitespace = false;
+	let currentSelectionIndex = 0;
+	let currentSelection = selections && selections[currentSelectionIndex];
 	for (let charIndex = fauxIndentLength; charIndex < len; charIndex++) {
 		const chCode = lineContent.charCodeAt(charIndex);
 
+		if (currentSelection && charIndex >= currentSelection.endOffset) {
+			currentSelectionIndex++;
+			currentSelection = selections && selections[currentSelectionIndex];
+		}
+
 		let isInWhitespace: boolean;
 		if (charIndex < firstNonWhitespaceIndex || charIndex > lastNonWhitespaceIndex) {
 			// in leading or trailing whitespace
@@ -540,6 +602,11 @@ function _applyRenderWhitespace(lineContent: string, len: number, continuesWithW
 			isInWhitespace = false;
 		}
 
+		// If rendering whitespace on selection, check that the charIndex falls within a selection
+		if (isInWhitespace && selections) {
+			isInWhitespace = !!currentSelection && currentSelection.startOffset <= charIndex && currentSelection.endOffset > charIndex;
+		}
+
 		if (wasInWhitespace) {
 			// was in whitespace token
 			if (!isInWhitespace || (!useMonospaceOptimizations && tmpIndent >= tabSize)) {
diff --git a/src/vs/editor/contrib/documentSymbols/outlineTree.ts b/src/vs/editor/contrib/documentSymbols/outlineTree.ts
index 551ff4b4726..a77c8d1bd2e 100644
--- a/src/vs/editor/contrib/documentSymbols/outlineTree.ts
+++ b/src/vs/editor/contrib/documentSymbols/outlineTree.ts
@@ -13,7 +13,7 @@ import 'vs/css!./media/outlineTree';
 import 'vs/css!./media/symbol-icons';
 import { Range } from 'vs/editor/common/core/range';
 import { SymbolKind, symbolKindToCssClass } from 'vs/editor/common/modes';
-import { OutlineElement, OutlineGroup, OutlineModel, TreeElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
+import { OutlineElement, OutlineGroup, OutlineModel } from 'vs/editor/contrib/documentSymbols/outlineModel';
 import { localize } from 'vs/nls';
 import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -38,7 +38,7 @@ export class OutlineNavigationLabelProvider implements IKeyboardNavigationLabelP
 
 
 export class OutlineIdentityProvider implements IIdentityProvider<OutlineItem> {
-	getId(element: TreeElement): { toString(): string; } {
+	getId(element: OutlineItem): { toString(): string; } {
 		return element.id;
 	}
 }
diff --git a/src/vs/editor/contrib/find/findModel.ts b/src/vs/editor/contrib/find/findModel.ts
index 9264aa9b734..31a0d470be3 100644
--- a/src/vs/editor/contrib/find/findModel.ts
+++ b/src/vs/editor/contrib/find/findModel.ts
@@ -5,7 +5,7 @@
 
 import { RunOnceScheduler, TimeoutTimer } from 'vs/base/common/async';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { dispose, DisposableStore } from 'vs/base/common/lifecycle';
 import { IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ReplaceCommand, ReplaceCommandThatPreservesSelection } from 'vs/editor/common/commands/replaceCommand';
 import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
@@ -71,7 +71,7 @@ export class FindModelBoundToEditorModel {
 
 	private readonly _editor: IActiveCodeEditor;
 	private readonly _state: FindReplaceState;
-	private _toDispose: IDisposable[];
+	private readonly _toDispose = new DisposableStore();
 	private readonly _decorations: FindDecorations;
 	private _ignoreModelContentChanged: boolean;
 	private readonly _startSearchingTimer: TimeoutTimer;
@@ -82,17 +82,16 @@ export class FindModelBoundToEditorModel {
 	constructor(editor: IActiveCodeEditor, state: FindReplaceState) {
 		this._editor = editor;
 		this._state = state;
-		this._toDispose = [];
 		this._isDisposed = false;
 		this._startSearchingTimer = new TimeoutTimer();
 
 		this._decorations = new FindDecorations(editor);
-		this._toDispose.push(this._decorations);
+		this._toDispose.add(this._decorations);
 
 		this._updateDecorationsScheduler = new RunOnceScheduler(() => this.research(false), 100);
-		this._toDispose.push(this._updateDecorationsScheduler);
+		this._toDispose.add(this._updateDecorationsScheduler);
 
-		this._toDispose.push(this._editor.onDidChangeCursorPosition((e: ICursorPositionChangedEvent) => {
+		this._toDispose.add(this._editor.onDidChangeCursorPosition((e: ICursorPositionChangedEvent) => {
 			if (
 				e.reason === CursorChangeReason.Explicit
 				|| e.reason === CursorChangeReason.Undo
@@ -103,7 +102,7 @@ export class FindModelBoundToEditorModel {
 		}));
 
 		this._ignoreModelContentChanged = false;
-		this._toDispose.push(this._editor.onDidChangeModelContent((e) => {
+		this._toDispose.add(this._editor.onDidChangeModelContent((e) => {
 			if (this._ignoreModelContentChanged) {
 				return;
 			}
@@ -115,7 +114,7 @@ export class FindModelBoundToEditorModel {
 			this._updateDecorationsScheduler.schedule();
 		}));
 
-		this._toDispose.push(this._state.onFindReplaceStateChange((e) => this._onStateChanged(e)));
+		this._toDispose.add(this._state.onFindReplaceStateChange((e) => this._onStateChanged(e)));
 
 		this.research(false, this._state.searchScope);
 	}
@@ -123,7 +122,7 @@ export class FindModelBoundToEditorModel {
 	public dispose(): void {
 		this._isDisposed = true;
 		dispose(this._startSearchingTimer);
-		this._toDispose = dispose(this._toDispose);
+		this._toDispose.dispose();
 	}
 
 	private _onStateChanged(e: FindReplaceStateChangedEvent): void {
diff --git a/src/vs/editor/contrib/find/findOptionsWidget.ts b/src/vs/editor/contrib/find/findOptionsWidget.ts
index 8a61aabd766..76fe78b42de 100644
--- a/src/vs/editor/contrib/find/findOptionsWidget.ts
+++ b/src/vs/editor/contrib/find/findOptionsWidget.ts
@@ -11,7 +11,7 @@ import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPosit
 import { FIND_IDS } from 'vs/editor/contrib/find/findModel';
 import { FindReplaceState } from 'vs/editor/contrib/find/findState';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { contrastBorder, editorWidgetBackground, inputActiveOptionBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { contrastBorder, editorWidgetBackground, inputActiveOptionBorder, inputActiveOptionBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 
 export class FindOptionsWidget extends Widget implements IOverlayWidget {
@@ -47,11 +47,13 @@ export class FindOptionsWidget extends Widget implements IOverlayWidget {
 		this._domNode.setAttribute('aria-hidden', 'true');
 
 		const inputActiveOptionBorderColor = themeService.getTheme().getColor(inputActiveOptionBorder);
+		const inputActiveOptionBackgroundColor = themeService.getTheme().getColor(inputActiveOptionBackground);
 
 		this.caseSensitive = this._register(new CaseSensitiveCheckbox({
 			appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleCaseSensitiveCommand),
 			isChecked: this._state.matchCase,
-			inputActiveOptionBorder: inputActiveOptionBorderColor
+			inputActiveOptionBorder: inputActiveOptionBorderColor,
+			inputActiveOptionBackground: inputActiveOptionBackgroundColor
 		}));
 		this._domNode.appendChild(this.caseSensitive.domNode);
 		this._register(this.caseSensitive.onChange(() => {
@@ -63,7 +65,8 @@ export class FindOptionsWidget extends Widget implements IOverlayWidget {
 		this.wholeWords = this._register(new WholeWordsCheckbox({
 			appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleWholeWordCommand),
 			isChecked: this._state.wholeWord,
-			inputActiveOptionBorder: inputActiveOptionBorderColor
+			inputActiveOptionBorder: inputActiveOptionBorderColor,
+			inputActiveOptionBackground: inputActiveOptionBackgroundColor
 		}));
 		this._domNode.appendChild(this.wholeWords.domNode);
 		this._register(this.wholeWords.onChange(() => {
@@ -75,7 +78,8 @@ export class FindOptionsWidget extends Widget implements IOverlayWidget {
 		this.regex = this._register(new RegexCheckbox({
 			appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleRegexCommand),
 			isChecked: this._state.isRegex,
-			inputActiveOptionBorder: inputActiveOptionBorderColor
+			inputActiveOptionBorder: inputActiveOptionBorderColor,
+			inputActiveOptionBackground: inputActiveOptionBackgroundColor
 		}));
 		this._domNode.appendChild(this.regex.domNode);
 		this._register(this.regex.onChange(() => {
@@ -179,7 +183,10 @@ export class FindOptionsWidget extends Widget implements IOverlayWidget {
 	}
 
 	private _applyTheme(theme: ITheme) {
-		let inputStyles = { inputActiveOptionBorder: theme.getColor(inputActiveOptionBorder) };
+		let inputStyles = {
+			inputActiveOptionBorder: theme.getColor(inputActiveOptionBorder),
+			inputActiveOptionBackground: theme.getColor(inputActiveOptionBackground)
+		};
 		this.caseSensitive.style(inputStyles);
 		this.wholeWords.style(inputStyles);
 		this.regex.style(inputStyles);
diff --git a/src/vs/editor/contrib/find/findWidget.css b/src/vs/editor/contrib/find/findWidget.css
index 0f2a7720c67..b0311427209 100644
--- a/src/vs/editor/contrib/find/findWidget.css
+++ b/src/vs/editor/contrib/find/findWidget.css
@@ -289,10 +289,6 @@
 	background-color: rgba(255, 255, 255, 0.1);
 }
 
-.monaco-editor.vs-dark .find-widget .monaco-checkbox .checkbox:checked + .label {
-	background-color: rgba(255, 255, 255, 0.1);
-}
-
 .monaco-editor.hc-black .find-widget .close-fw,
 .monaco-editor.vs-dark .find-widget .close-fw {
 	background-image: url('images/close-dark.svg');
diff --git a/src/vs/editor/contrib/find/findWidget.ts b/src/vs/editor/contrib/find/findWidget.ts
index 5e7febe1ccf..738971c7879 100644
--- a/src/vs/editor/contrib/find/findWidget.ts
+++ b/src/vs/editor/contrib/find/findWidget.ts
@@ -27,10 +27,11 @@ import { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_REPLACE_INPUT_FOCUSED, FIND_IDS, MA
 import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/findState';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { contrastBorder, editorFindMatch, editorFindMatchBorder, editorFindMatchHighlight, editorFindMatchHighlightBorder, editorFindRangeHighlight, editorFindRangeHighlightBorder, editorWidgetBackground, editorWidgetBorder, editorWidgetResizeBorder, errorForeground, inputActiveOptionBorder, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationInfoForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationWarningForeground, widgetShadow, editorWidgetForeground } from 'vs/platform/theme/common/colorRegistry';
+import { contrastBorder, editorFindMatch, editorFindMatchBorder, editorFindMatchHighlight, editorFindMatchHighlightBorder, editorFindRangeHighlight, editorFindRangeHighlightBorder, editorWidgetBackground, editorWidgetBorder, editorWidgetResizeBorder, errorForeground, inputActiveOptionBorder, inputActiveOptionBackground, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationInfoForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationWarningForeground, widgetShadow, editorWidgetForeground } from 'vs/platform/theme/common/colorRegistry';
 import { ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { ContextScopedFindInput, ContextScopedHistoryInputBox } from 'vs/platform/browser/contextScopedHistoryWidget';
 import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
+import { alert as alertFn } from 'vs/base/browser/ui/aria/aria';
 
 export interface IFindController {
 	replace(): void;
@@ -372,13 +373,26 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 		} else {
 			label = NLS_NO_RESULTS;
 		}
+
 		this._matchesCount.appendChild(document.createTextNode(label));
 
+		alertFn(this._getAriaLabel(label, this._state.currentMatch, this._state.searchString), true);
 		MAX_MATCHES_COUNT_WIDTH = Math.max(MAX_MATCHES_COUNT_WIDTH, this._matchesCount.clientWidth);
 	}
 
 	// ----- actions
 
+	private _getAriaLabel(label: string, currentMatch: Range | null, searchString: string): string {
+		if (label === NLS_NO_RESULTS) {
+			return searchString === ''
+				? nls.localize('ariaSearchNoResultEmpty', "{0} found", label)
+				: nls.localize('ariaSearchNoResult', "{0} found for {1}", label, searchString);
+		}
+		return currentMatch
+			? nls.localize('ariaSearchNoResultWithLineNum', "{0} found for {1} at {2}", label, searchString, currentMatch.startLineNumber + ':' + currentMatch.startColumn)
+			: nls.localize('ariaSearchNoResultWithLineNumNoCurrentMatch', "{0} found for {1}", label, searchString);
+	}
+
 	/**
 	 * If 'selection find' is ON we should not disable the button (its function is to cancel 'selection find').
 	 * If 'selection find' is OFF we enable the button only if there is a selection.
@@ -560,6 +574,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 	private _applyTheme(theme: ITheme) {
 		let inputStyles: IFindInputStyles = {
 			inputActiveOptionBorder: theme.getColor(inputActiveOptionBorder),
+			inputActiveOptionBackground: theme.getColor(inputActiveOptionBackground),
 			inputBackground: theme.getColor(inputBackground),
 			inputForeground: theme.getColor(inputForeground),
 			inputBorder: theme.getColor(inputBorder),
@@ -1217,4 +1232,9 @@ registerThemingParticipant((theme, collector) => {
 	if (inputActiveBorder) {
 		collector.addRule(`.monaco-editor .find-widget .monaco-checkbox .checkbox:checked + .label { border: 1px solid ${inputActiveBorder.toString()}; }`);
 	}
+
+	const inputActiveBackground = theme.getColor(inputActiveOptionBackground);
+	if (inputActiveBackground) {
+		collector.addRule(`.monaco-editor .find-widget .monaco-checkbox .checkbox:checked + .label { background-color: ${inputActiveBackground.toString()}; }`);
+	}
 });
diff --git a/src/vs/editor/contrib/find/simpleFindWidget.ts b/src/vs/editor/contrib/find/simpleFindWidget.ts
index 31c75f9f7a6..54f256d48aa 100644
--- a/src/vs/editor/contrib/find/simpleFindWidget.ts
+++ b/src/vs/editor/contrib/find/simpleFindWidget.ts
@@ -15,7 +15,7 @@ import { IMessage as InputBoxMessage } from 'vs/base/browser/ui/inputbox/inputBo
 import { SimpleButton } from 'vs/editor/contrib/find/findWidget';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { editorWidgetBackground, inputActiveOptionBorder, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationInfoForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationWarningForeground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { editorWidgetBackground, inputActiveOptionBorder, inputActiveOptionBackground, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationInfoForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationWarningForeground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { ITheme, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { ContextScopedFindInput } from 'vs/platform/browser/contextScopedHistoryWidget';
 
@@ -180,6 +180,7 @@ export abstract class SimpleFindWidget extends Widget {
 	public updateTheme(theme: ITheme): void {
 		const inputStyles: IFindInputStyles = {
 			inputActiveOptionBorder: theme.getColor(inputActiveOptionBorder),
+			inputActiveOptionBackground: theme.getColor(inputActiveOptionBackground),
 			inputBackground: theme.getColor(inputBackground),
 			inputForeground: theme.getColor(inputForeground),
 			inputBorder: theme.getColor(inputBorder),
diff --git a/src/vs/editor/contrib/gotoError/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts
index 8f1231cbfb8..c16b9be9a6e 100644
--- a/src/vs/editor/contrib/gotoError/gotoError.ts
+++ b/src/vs/editor/contrib/gotoError/gotoError.ts
@@ -6,7 +6,7 @@
 import * as nls from 'vs/nls';
 import { Emitter } from 'vs/base/common/event';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IMarker, IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
@@ -32,7 +32,7 @@ class MarkerModel {
 	private readonly _editor: ICodeEditor;
 	private _markers: IMarker[];
 	private _nextIdx: number;
-	private _toUnbind: IDisposable[];
+	private readonly _toUnbind = new DisposableStore();
 	private _ignoreSelectionChange: boolean;
 	private readonly _onCurrentMarkerChanged: Emitter<IMarker | undefined>;
 	private readonly _onMarkerSetChanged: Emitter<MarkerModel>;
@@ -41,15 +41,14 @@ class MarkerModel {
 		this._editor = editor;
 		this._markers = [];
 		this._nextIdx = -1;
-		this._toUnbind = [];
 		this._ignoreSelectionChange = false;
 		this._onCurrentMarkerChanged = new Emitter<IMarker>();
 		this._onMarkerSetChanged = new Emitter<MarkerModel>();
 		this.setMarkers(markers);
 
 		// listen on editor
-		this._toUnbind.push(this._editor.onDidDispose(() => this.dispose()));
-		this._toUnbind.push(this._editor.onDidChangeCursorPosition(() => {
+		this._toUnbind.add(this._editor.onDidDispose(() => this.dispose()));
+		this._toUnbind.add(this._editor.onDidChangeCursorPosition(() => {
 			if (this._ignoreSelectionChange) {
 				return;
 			}
@@ -190,7 +189,7 @@ class MarkerModel {
 	}
 
 	public dispose(): void {
-		this._toUnbind = dispose(this._toUnbind);
+		this._toUnbind.dispose();
 	}
 }
 
diff --git a/src/vs/editor/contrib/linesOperations/linesOperations.ts b/src/vs/editor/contrib/linesOperations/linesOperations.ts
index e6984905582..9fb95158f25 100644
--- a/src/vs/editor/contrib/linesOperations/linesOperations.ts
+++ b/src/vs/editor/contrib/linesOperations/linesOperations.ts
@@ -581,7 +581,7 @@ export class DeleteAllLeftAction extends AbstractDeleteAllToBoundaryAction {
 					return new Range(selection.startLineNumber, 1, selection.startLineNumber, selection.startColumn);
 				}
 			} else {
-				return selection;
+				return new Range(selection.startLineNumber, 1, selection.endLineNumber, selection.endColumn);
 			}
 		});
 
diff --git a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
index 5d2ef4d0515..e9479c0f6d4 100644
--- a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
@@ -268,7 +268,7 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelections([new Selection(2, 2, 2, 2), new Selection(2, 4, 2, 5)]);
 					deleteAllLeftAction.run(null!, editor);
-					assert.equal(model.getLineContent(2), 'ord', '002');
+					assert.equal(model.getLineContent(2), 'd', '002');
 
 					editor.setSelections([new Selection(3, 2, 3, 5), new Selection(3, 7, 3, 7)]);
 					deleteAllLeftAction.run(null!, editor);
@@ -276,11 +276,11 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelections([new Selection(4, 3, 4, 3), new Selection(4, 5, 5, 4)]);
 					deleteAllLeftAction.run(null!, editor);
-					assert.equal(model.getLineContent(4), 'lljour', '004');
+					assert.equal(model.getLineContent(4), 'jour', '004');
 
 					editor.setSelections([new Selection(5, 3, 6, 3), new Selection(6, 5, 7, 5), new Selection(7, 7, 7, 7)]);
 					deleteAllLeftAction.run(null!, editor);
-					assert.equal(model.getLineContent(5), 'horlworld', '005');
+					assert.equal(model.getLineContent(5), 'world', '005');
 				});
 		});
 
diff --git a/src/vs/editor/contrib/links/links.ts b/src/vs/editor/contrib/links/links.ts
index de26df3e3d4..53ea1177390 100644
--- a/src/vs/editor/contrib/links/links.ts
+++ b/src/vs/editor/contrib/links/links.ts
@@ -25,79 +25,43 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { editorActiveLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 
-const HOVER_MESSAGE_GENERAL_META = new MarkdownString().appendText(
-	platform.isMacintosh
-		? nls.localize('links.navigate.mac', "Follow link (cmd + click)")
-		: nls.localize('links.navigate', "Follow link (ctrl + click)")
-);
+function getHoverMessage(link: Link, useMetaKey: boolean): MarkdownString {
+	const executeCmd = link.url && /^command:/i.test(link.url.toString());
 
-const HOVER_MESSAGE_COMMAND_META = new MarkdownString().appendText(
-	platform.isMacintosh
-		? nls.localize('links.command.mac', "Execute command (cmd + click)")
-		: nls.localize('links.command', "Execute command (ctrl + click)")
-);
+	const label = link.tooltip
+		? link.tooltip
+		: executeCmd
+			? nls.localize('links.navigate.executeCmd', 'Execute command')
+			: nls.localize('links.navigate.follow', 'Follow link');
 
-const HOVER_MESSAGE_GENERAL_ALT = new MarkdownString().appendText(
-	platform.isMacintosh
-		? nls.localize('links.navigate.al.mac', "Follow link (option + click)")
-		: nls.localize('links.navigate.al', "Follow link (alt + click)")
-);
+	const kb = useMetaKey
+		? platform.isMacintosh
+			? nls.localize('links.navigate.kb.meta.mac', "cmd + click")
+			: nls.localize('links.navigate.kb.meta', "ctrl + click")
+		: platform.isMacintosh
+			? nls.localize('links.navigate.kb.alt.mac', "option + click")
+			: nls.localize('links.navigate.kb.alt', "alt + click");
 
-const HOVER_MESSAGE_COMMAND_ALT = new MarkdownString().appendText(
-	platform.isMacintosh
-		? nls.localize('links.command.al.mac', "Execute command (option + click)")
-		: nls.localize('links.command.al', "Execute command (alt + click)")
-);
+	if (link.url) {
+		const hoverMessage = new MarkdownString().appendMarkdown(`[${label}](${link.url.toString()}) (${kb})`);
+		hoverMessage.isTrusted = true;
+		return hoverMessage;
+	} else {
+		return new MarkdownString().appendText(`${label} (${kb})`);
+	}
+}
 
 const decoration = {
-	meta: ModelDecorationOptions.register({
+	general: ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		collapseOnReplaceEdit: true,
-		inlineClassName: 'detected-link',
-		hoverMessage: HOVER_MESSAGE_GENERAL_META
+		inlineClassName: 'detected-link'
 	}),
-	metaActive: ModelDecorationOptions.register({
+	active: ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		collapseOnReplaceEdit: true,
-		inlineClassName: 'detected-link-active',
-		hoverMessage: HOVER_MESSAGE_GENERAL_META
-	}),
-	alt: ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		collapseOnReplaceEdit: true,
-		inlineClassName: 'detected-link',
-		hoverMessage: HOVER_MESSAGE_GENERAL_ALT
-	}),
-	altActive: ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		collapseOnReplaceEdit: true,
-		inlineClassName: 'detected-link-active',
-		hoverMessage: HOVER_MESSAGE_GENERAL_ALT
-	}),
-	altCommand: ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		collapseOnReplaceEdit: true,
-		inlineClassName: 'detected-link',
-		hoverMessage: HOVER_MESSAGE_COMMAND_ALT
-	}),
-	altCommandActive: ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		collapseOnReplaceEdit: true,
-		inlineClassName: 'detected-link-active',
-		hoverMessage: HOVER_MESSAGE_COMMAND_ALT
-	}),
-	metaCommand: ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		collapseOnReplaceEdit: true,
-		inlineClassName: 'detected-link',
-		hoverMessage: HOVER_MESSAGE_COMMAND_META
-	}),
-	metaCommandActive: ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		collapseOnReplaceEdit: true,
-		inlineClassName: 'detected-link-active',
-		hoverMessage: HOVER_MESSAGE_COMMAND_META
-	}),
+		inlineClassName: 'detected-link-active'
+	})
 };
 
 
@@ -111,38 +75,11 @@ class LinkOccurrence {
 	}
 
 	private static _getOptions(link: Link, useMetaKey: boolean, isActive: boolean): ModelDecorationOptions {
-		const options = { ...this._getBaseOptions(link, useMetaKey, isActive) };
-		if (typeof link.tooltip === 'string') {
-			const message = new MarkdownString().appendText(
-				platform.isMacintosh
-					? useMetaKey
-						? nls.localize('links.custom.mac', "{0} (cmd + click)", link.tooltip)
-						: nls.localize('links.custom.mac.al', "{0} (option + click)", link.tooltip)
-					: useMetaKey
-						? nls.localize('links.custom', "{0} (ctrl + click)", link.tooltip)
-						: nls.localize('links.custom.al', "{0} (alt + click)", link.tooltip)
-			);
-			options.hoverMessage = message;
-		}
+		const options = { ... (isActive ? decoration.active : decoration.general) };
+		options.hoverMessage = getHoverMessage(link, useMetaKey);
 		return options;
 	}
 
-	private static _getBaseOptions(link: Link, useMetaKey: boolean, isActive: boolean): ModelDecorationOptions {
-		if (link.url && /^command:/i.test(link.url.toString())) {
-			if (useMetaKey) {
-				return (isActive ? decoration.metaCommandActive : decoration.metaCommand);
-			} else {
-				return (isActive ? decoration.altCommandActive : decoration.altCommand);
-			}
-		} else {
-			if (useMetaKey) {
-				return (isActive ? decoration.metaActive : decoration.meta);
-			} else {
-				return (isActive ? decoration.altActive : decoration.alt);
-			}
-		}
-	}
-
 	public decorationId: string;
 	public link: Link;
 
diff --git a/src/vs/editor/standalone/browser/colorizer.ts b/src/vs/editor/standalone/browser/colorizer.ts
index ff47bd408c0..d72d141046b 100644
--- a/src/vs/editor/standalone/browser/colorizer.ts
+++ b/src/vs/editor/standalone/browser/colorizer.ts
@@ -128,7 +128,8 @@ export class Colorizer {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 		return renderResult.html;
 	}
@@ -195,7 +196,8 @@ function _fakeColorize(lines: string[], tabSize: number): string {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		html = html.concat(renderResult.html);
@@ -231,7 +233,8 @@ function _actualColorize(lines: string[], tabSize: number, tokenizationSupport:
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		html = html.concat(renderResult.html);
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
index 56a0f094d6e..576092c9865 100644
--- a/src/vs/editor/standalone/browser/simpleServices.ts
+++ b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -234,7 +234,9 @@ export class StandaloneCommandService implements ICommandService {
 	private readonly _dynamicCommands: { [id: string]: ICommand; };
 
 	private readonly _onWillExecuteCommand = new Emitter<ICommandEvent>();
+	private readonly _onDidExecuteCommand = new Emitter<ICommandEvent>();
 	public readonly onWillExecuteCommand: Event<ICommandEvent> = this._onWillExecuteCommand.event;
+	public readonly onDidExecuteCommand: Event<ICommandEvent> = this._onDidExecuteCommand.event;
 
 	constructor(instantiationService: IInstantiationService) {
 		this._instantiationService = instantiationService;
@@ -256,8 +258,10 @@ export class StandaloneCommandService implements ICommandService {
 		}
 
 		try {
-			this._onWillExecuteCommand.fire({ commandId: id });
+			this._onWillExecuteCommand.fire({ commandId: id, args });
 			const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler, ...args]) as T;
+
+			this._onDidExecuteCommand.fire({ commandId: id, args });
 			return Promise.resolve(result);
 		} catch (err) {
 			return Promise.reject(err);
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index aee33dba412..cf0905a08ea 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -710,7 +710,8 @@ suite('Editor Controller - Cursor', () => {
 			CoreNavigationCommands.ColumnSelect.runCoreEditorCommand(cursor, {
 				position: new Position(4, 4),
 				viewPosition: new Position(4, 4),
-				mouseColumn: 15
+				mouseColumn: 15,
+				setAnchorIfNotSet: false
 			});
 
 			let expectedSelections = [
@@ -745,7 +746,8 @@ suite('Editor Controller - Cursor', () => {
 		CoreNavigationCommands.ColumnSelect.runCoreEditorCommand(cursor, {
 			position: new Position(4, 1),
 			viewPosition: new Position(4, 1),
-			mouseColumn: 1
+			mouseColumn: 1,
+			setAnchorIfNotSet: false
 		});
 
 		assertCursor(cursor, [
@@ -784,7 +786,8 @@ suite('Editor Controller - Cursor', () => {
 		CoreNavigationCommands.ColumnSelect.runCoreEditorCommand(cursor, {
 			position: new Position(1, 1),
 			viewPosition: new Position(1, 1),
-			mouseColumn: 1
+			mouseColumn: 1,
+			setAnchorIfNotSet: false
 		});
 		assertCursor(cursor, [
 			new Selection(10, 10, 10, 1),
@@ -802,7 +805,8 @@ suite('Editor Controller - Cursor', () => {
 		CoreNavigationCommands.ColumnSelect.runCoreEditorCommand(cursor, {
 			position: new Position(1, 1),
 			viewPosition: new Position(1, 1),
-			mouseColumn: 1
+			mouseColumn: 1,
+			setAnchorIfNotSet: false
 		});
 		assertCursor(cursor, [
 			new Selection(10, 10, 10, 1),
diff --git a/src/vs/editor/test/browser/editorTestServices.ts b/src/vs/editor/test/browser/editorTestServices.ts
index 25af3b0efa6..f896360acf4 100644
--- a/src/vs/editor/test/browser/editorTestServices.ts
+++ b/src/vs/editor/test/browser/editorTestServices.ts
@@ -32,6 +32,9 @@ export class TestCommandService implements ICommandService {
 	private readonly _onWillExecuteCommand = new Emitter<ICommandEvent>();
 	public readonly onWillExecuteCommand: Event<ICommandEvent> = this._onWillExecuteCommand.event;
 
+	private readonly _onDidExecuteCommand = new Emitter<ICommandEvent>();
+	public readonly onDidExecuteCommand: Event<ICommandEvent> = this._onDidExecuteCommand.event;
+
 	constructor(instantiationService: IInstantiationService) {
 		this._instantiationService = instantiationService;
 	}
@@ -43,8 +46,9 @@ export class TestCommandService implements ICommandService {
 		}
 
 		try {
-			this._onWillExecuteCommand.fire({ commandId: id });
+			this._onWillExecuteCommand.fire({ commandId: id, args });
 			const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler, ...args]) as T;
+			this._onDidExecuteCommand.fire({ commandId: id, args });
 			return Promise.resolve(result);
 		} catch (err) {
 			return Promise.reject(err);
diff --git a/src/vs/editor/test/browser/services/openerService.test.ts b/src/vs/editor/test/browser/services/openerService.test.ts
index 3e643742469..eadf902357a 100644
--- a/src/vs/editor/test/browser/services/openerService.test.ts
+++ b/src/vs/editor/test/browser/services/openerService.test.ts
@@ -17,6 +17,7 @@ suite('OpenerService', function () {
 	const commandService = new class implements ICommandService {
 		_serviceBrand: any;
 		onWillExecuteCommand = () => ({ dispose: () => { } });
+		onDidExecuteCommand = () => ({ dispose: () => { } });
 		executeCommand(id: string, ...args: any[]): Promise<any> {
 			lastCommand = { id, args };
 			return Promise.resolve(undefined);
diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
index 0112ef018b6..e3e6ad4c22b 100644
--- a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
+++ b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -9,7 +9,7 @@ import * as strings from 'vs/base/common/strings';
 import { IViewLineTokens } from 'vs/editor/common/core/lineTokens';
 import { MetadataConsts } from 'vs/editor/common/modes';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { CharacterMapping, RenderLineInput, renderViewLine2 as renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
+import { CharacterMapping, RenderLineInput, renderViewLine2 as renderViewLine, LineRange } from 'vs/editor/common/viewLayout/viewLineRenderer';
 import { InlineDecorationType } from 'vs/editor/common/viewModel/viewModel';
 import { ViewLineToken, ViewLineTokens } from 'vs/editor/test/common/core/viewLineToken';
 
@@ -41,7 +41,8 @@ suite('viewLineRenderer.renderLine', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		assert.equal(_actual.html, '<span><span class="mtk0">' + expected + '</span></span>');
@@ -90,7 +91,8 @@ suite('viewLineRenderer.renderLine', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		assert.equal(_actual.html, '<span>' + expected + '</span>');
@@ -142,7 +144,8 @@ suite('viewLineRenderer.renderLine', () => {
 			6,
 			'boundary',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expectedOutput = [
@@ -233,7 +236,8 @@ suite('viewLineRenderer.renderLine', () => {
 			-1,
 			'boundary',
 			false,
-			false
+			false,
+			null
 		));
 
 		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
@@ -295,7 +299,8 @@ suite('viewLineRenderer.renderLine', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
@@ -357,7 +362,8 @@ suite('viewLineRenderer.renderLine', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
@@ -396,7 +402,8 @@ suite('viewLineRenderer.renderLine', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
@@ -426,7 +433,8 @@ suite('viewLineRenderer.renderLine', () => {
 				-1,
 				'none',
 				false,
-				false
+				false,
+				null
 			));
 			assert.equal(actual.html, '<span>' + expectedOutput.join('') + '</span>', message);
 		}
@@ -526,7 +534,8 @@ suite('viewLineRenderer.renderLine', () => {
 				-1,
 				'none',
 				false,
-				true
+				true,
+				null
 			));
 			assert.equal(actual.html, '<span>' + expectedOutput.join('') + '</span>', message);
 		}
@@ -564,7 +573,8 @@ suite('viewLineRenderer.renderLine', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 		let expectedOutput = [
 			'<span class="mtk1">a𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
@@ -593,7 +603,8 @@ suite('viewLineRenderer.renderLine', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 		assert.equal(actual.html, '<span>' + expectedOutput.join('') + '</span>');
 		assert.equal(actual.containsRTL, true);
@@ -639,7 +650,8 @@ suite('viewLineRenderer.renderLine', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
@@ -704,7 +716,7 @@ suite('viewLineRenderer.renderLine', () => {
 
 suite('viewLineRenderer.renderLine 2', () => {
 
-	function testCreateLineParts(fontIsMonospace: boolean, lineContent: string, tokens: ViewLineToken[], fauxIndentLength: number, renderWhitespace: 'none' | 'boundary' | 'all', expected: string): void {
+	function testCreateLineParts(fontIsMonospace: boolean, lineContent: string, tokens: ViewLineToken[], fauxIndentLength: number, renderWhitespace: 'none' | 'boundary' | 'selection' | 'all', selections: LineRange[] | null, expected: string): void {
 		let actual = renderViewLine(new RenderLineInput(
 			fontIsMonospace,
 			true,
@@ -720,7 +732,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			-1,
 			renderWhitespace,
 			false,
-			false
+			false,
+			selections
 		));
 
 		assert.deepEqual(actual.html, expected);
@@ -745,7 +758,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -784,7 +798,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -811,6 +826,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			0,
 			'none',
+			null,
 			[
 				'<span>',
 				'<span class="mtk1">Hello\u00a0world!</span>',
@@ -828,6 +844,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			0,
 			'none',
+			null,
 			[
 				'<span>',
 				'<span class="mtk1">Hello\u00a0</span>',
@@ -847,6 +864,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			0,
 			'boundary',
+			null,
 			[
 				'<span>',
 				'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u00b7\u00b7</span>',
@@ -868,6 +886,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			0,
 			'boundary',
+			null,
 			[
 				'<span>',
 				'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u00b7\u00b7</span>',
@@ -891,6 +910,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			0,
 			'boundary',
+			null,
 			[
 				'<span>',
 				'<span class="vs-whitespace" style="width:40px">\u2192\u00a0\u00a0\u00a0</span>',
@@ -913,6 +933,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			0,
 			'boundary',
+			null,
 			[
 				'<span>',
 				'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u2192\u00a0</span>',
@@ -940,6 +961,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			2,
 			'boundary',
+			null,
 			[
 				'<span>',
 				'<span class="">\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0</span>',
@@ -966,6 +988,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			2,
 			'boundary',
+			null,
 			[
 				'<span>',
 				'<span class="">\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0</span>',
@@ -989,6 +1012,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			0,
 			'boundary',
+			null,
 			[
 				'<span>',
 				'<span class="mtk1">it</span>',
@@ -1014,6 +1038,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			],
 			0,
 			'all',
+			null,
 			[
 				'<span>',
 				'<span class="vs-whitespace" style="width:10px">\u00b7</span>',
@@ -1027,6 +1052,147 @@ suite('viewLineRenderer.renderLine 2', () => {
 		);
 	});
 
+	test('createLineParts render whitespace for selection with no selections', () => {
+		testCreateLineParts(
+			false,
+			' Hello world!\t',
+			[
+				createPart(4, 0),
+				createPart(6, 1),
+				createPart(14, 2)
+			],
+			0,
+			'selection',
+			null,
+			[
+				'<span>',
+				'<span class="mtk0">\u00a0Hel</span>',
+				'<span class="mtk1">lo</span>',
+				'<span class="mtk2">\u00a0world!\u00a0\u00a0\u00a0</span>',
+				'</span>',
+			].join('')
+		);
+	});
+
+	test('createLineParts render whitespace for selection with whole line selection', () => {
+		testCreateLineParts(
+			false,
+			' Hello world!\t',
+			[
+				createPart(4, 0),
+				createPart(6, 1),
+				createPart(14, 2)
+			],
+			0,
+			'selection',
+			[new LineRange(0, 14)],
+			[
+				'<span>',
+				'<span class="vs-whitespace" style="width:10px">\u00b7</span>',
+				'<span class="mtk0">Hel</span>',
+				'<span class="mtk1">lo</span>',
+				'<span class="vs-whitespace" style="width:10px">\u00b7</span>',
+				'<span class="mtk2">world!</span>',
+				'<span class="vs-whitespace" style="width:30px">\u2192\u00a0\u00a0</span>',
+				'</span>',
+			].join('')
+		);
+	});
+
+	test('createLineParts render whitespace for selection with selection spanning part of whitespace', () => {
+		testCreateLineParts(
+			false,
+			' Hello world!\t',
+			[
+				createPart(4, 0),
+				createPart(6, 1),
+				createPart(14, 2)
+			],
+			0,
+			'selection',
+			[new LineRange(0, 5)],
+			[
+				'<span>',
+				'<span class="vs-whitespace" style="width:10px">\u00b7</span>',
+				'<span class="mtk0">Hel</span>',
+				'<span class="mtk1">lo</span>',
+				'<span class="mtk2">\u00a0world!\u00a0\u00a0\u00a0</span>',
+				'</span>',
+			].join('')
+		);
+	});
+
+
+	test('createLineParts render whitespace for selection with multiple selections', () => {
+		testCreateLineParts(
+			false,
+			' Hello world!\t',
+			[
+				createPart(4, 0),
+				createPart(6, 1),
+				createPart(14, 2)
+			],
+			0,
+			'selection',
+			[new LineRange(0, 5), new LineRange(9, 14)],
+			[
+				'<span>',
+				'<span class="vs-whitespace" style="width:10px">\u00b7</span>',
+				'<span class="mtk0">Hel</span>',
+				'<span class="mtk1">lo</span>',
+				'<span class="mtk2">\u00a0world!</span>',
+				'<span class="vs-whitespace" style="width:30px">\u2192\u00a0\u00a0</span>',
+				'</span>',
+			].join('')
+		);
+	});
+
+
+	test('createLineParts render whitespace for selection with multiple, initially unsorted selections', () => {
+		testCreateLineParts(
+			false,
+			' Hello world!\t',
+			[
+				createPart(4, 0),
+				createPart(6, 1),
+				createPart(14, 2)
+			],
+			0,
+			'selection',
+			[new LineRange(9, 14), new LineRange(0, 5)],
+			[
+				'<span>',
+				'<span class="vs-whitespace" style="width:10px">\u00b7</span>',
+				'<span class="mtk0">Hel</span>',
+				'<span class="mtk1">lo</span>',
+				'<span class="mtk2">\u00a0world!</span>',
+				'<span class="vs-whitespace" style="width:30px">\u2192\u00a0\u00a0</span>',
+				'</span>',
+			].join('')
+		);
+	});
+
+	test('createLineParts render whitespace for selection with selections next to each other', () => {
+		testCreateLineParts(
+			false,
+			' * S',
+			[
+				createPart(4, 0)
+			],
+			0,
+			'selection',
+			[new LineRange(0, 1), new LineRange(1, 2), new LineRange(2, 3)],
+			[
+				'<span>',
+				'<span class="vs-whitespace" style="width:10px">\u00b7</span>',
+				'<span class="mtk0">*</span>',
+				'<span class="vs-whitespace" style="width:10px">\u00b7</span>',
+				'<span class="mtk0">S</span>',
+				'</span>',
+			].join('')
+		);
+	});
+
 	test('createLineParts can handle unsorted inline decorations', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
@@ -1047,7 +1213,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		// 01234567890
@@ -1087,7 +1254,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			-1,
 			'all',
 			false,
-			true
+			true,
+			null
 		));
 
 		let expected = [
@@ -1119,7 +1287,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			-1,
 			'all',
 			false,
-			true
+			true,
+			null
 		));
 
 		let expected = [
@@ -1152,7 +1321,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			-1,
 			'all',
 			false,
-			true
+			true,
+			null
 		));
 
 		let expected = [
@@ -1181,7 +1351,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -1214,7 +1385,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -1246,7 +1418,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -1276,7 +1449,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -1305,7 +1479,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'all',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -1340,7 +1515,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -1369,7 +1545,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -1400,7 +1577,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -1430,7 +1608,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'boundary',
 			false,
-			false
+			false,
+			null
 		));
 
 		let expected = [
@@ -1458,7 +1637,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'none',
 			false,
-			true
+			true,
+			null
 		));
 
 		let expected = [
@@ -1490,7 +1670,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			10000,
 			'none',
 			false,
-			true
+			true,
+			null
 		));
 
 		let expected = [
@@ -1518,7 +1699,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 			-1,
 			'none',
 			false,
-			false
+			false,
+			null
 		));
 
 		return (partIndex: number, partLength: number, offset: number, expected: number) => {
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 945d10d7e14..5f0f52de148 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -5,6 +5,8 @@
 
 declare namespace monaco {
 
+	// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.
+
 	export type Thenable<T> = PromiseLike<T>;
 
 	export interface IDisposable {
@@ -3031,7 +3033,7 @@ declare namespace monaco.editor {
 		 * Enable rendering of whitespace.
 		 * Defaults to none.
 		 */
-		renderWhitespace?: 'none' | 'boundary' | 'all';
+		renderWhitespace?: 'none' | 'boundary' | 'selection' | 'all';
 		/**
 		 * Enable rendering of control characters.
 		 * Defaults to false.
@@ -3303,7 +3305,7 @@ declare namespace monaco.editor {
 		readonly scrollBeyondLastColumn: number;
 		readonly smoothScrolling: boolean;
 		readonly stopRenderingLineAfter: number;
-		readonly renderWhitespace: 'none' | 'boundary' | 'all';
+		readonly renderWhitespace: 'none' | 'boundary' | 'selection' | 'all';
 		readonly renderControlCharacters: boolean;
 		readonly fontLigatures: boolean;
 		readonly renderIndentGuides: boolean;
diff --git a/src/vs/platform/commands/common/commands.ts b/src/vs/platform/commands/common/commands.ts
index 4777d1ddef7..06c33cf281e 100644
--- a/src/vs/platform/commands/common/commands.ts
+++ b/src/vs/platform/commands/common/commands.ts
@@ -15,11 +15,13 @@ export const ICommandService = createDecorator<ICommandService>('commandService'
 
 export interface ICommandEvent {
 	commandId: string;
+	args: any[];
 }
 
 export interface ICommandService {
 	_serviceBrand: any;
 	onWillExecuteCommand: Event<ICommandEvent>;
+	onDidExecuteCommand: Event<ICommandEvent>;
 	executeCommand<T = any>(commandId: string, ...args: any[]): Promise<T | undefined>;
 }
 
@@ -135,6 +137,7 @@ export const CommandsRegistry: ICommandRegistry = new class implements ICommandR
 export const NullCommandService: ICommandService = {
 	_serviceBrand: undefined,
 	onWillExecuteCommand: () => ({ dispose: () => { } }),
+	onDidExecuteCommand: () => ({ dispose: () => { } }),
 	executeCommand() {
 		return Promise.resolve(undefined);
 	}
diff --git a/src/vs/platform/configuration/test/node/configurationService.test.ts b/src/vs/platform/configuration/test/node/configurationService.test.ts
index 22fdbb6c911..ae5e9a795fc 100644
--- a/src/vs/platform/configuration/test/node/configurationService.test.ts
+++ b/src/vs/platform/configuration/test/node/configurationService.test.ts
@@ -94,7 +94,8 @@ suite('ConfigurationService - Node', () => {
 		const service = new ConfigurationService(URI.file(res.testFile));
 		await service.initialize();
 		return new Promise((c, e) => {
-			service.onDidChangeConfiguration(() => {
+			const disposable = service.onDidChangeConfiguration(() => {
+				disposable.dispose();
 				assert.equal(service.getValue('foo'), 'bar');
 				service.dispose();
 				c();
diff --git a/src/vs/platform/debug/common/extensionHostDebugIpc.ts b/src/vs/platform/debug/common/extensionHostDebugIpc.ts
index af7f1e526b8..1304d5cd669 100644
--- a/src/vs/platform/debug/common/extensionHostDebugIpc.ts
+++ b/src/vs/platform/debug/common/extensionHostDebugIpc.ts
@@ -7,6 +7,7 @@ import { IServerChannel, IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IReloadSessionEvent, ICloseSessionEvent, IAttachSessionEvent, ILogToSessionEvent, ITerminateSessionEvent, IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IRemoteConsoleLog } from 'vs/base/common/console';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export class ExtensionHostDebugBroadcastChannel<TContext> implements IServerChannel<TContext> {
 
@@ -51,11 +52,13 @@ export class ExtensionHostDebugBroadcastChannel<TContext> implements IServerChan
 	}
 }
 
-export class ExtensionHostDebugChannelClient implements IExtensionHostDebugService {
+export class ExtensionHostDebugChannelClient extends Disposable implements IExtensionHostDebugService {
 
 	_serviceBrand: any;
 
-	constructor(private channel: IChannel) { }
+	constructor(private channel: IChannel) {
+		super();
+	}
 
 	reload(sessionId: string): void {
 		this.channel.call('reload', [sessionId]);
diff --git a/src/vs/platform/download/common/download.ts b/src/vs/platform/download/common/download.ts
index 83bd30bdaa5..a012358875d 100644
--- a/src/vs/platform/download/common/download.ts
+++ b/src/vs/platform/download/common/download.ts
@@ -13,6 +13,6 @@ export interface IDownloadService {
 
 	_serviceBrand: any;
 
-	download(uri: URI, to?: string, cancellationToken?: CancellationToken): Promise<string>;
+	download(uri: URI, to: URI, cancellationToken?: CancellationToken): Promise<void>;
 
 }
diff --git a/src/vs/platform/download/common/downloadIpc.ts b/src/vs/platform/download/common/downloadIpc.ts
new file mode 100644
index 00000000000..d2d00dd8ccc
--- /dev/null
+++ b/src/vs/platform/download/common/downloadIpc.ts
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from 'vs/base/common/uri';
+import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { Event } from 'vs/base/common/event';
+import { IDownloadService } from 'vs/platform/download/common/download';
+import { IURITransformer } from 'vs/base/common/uriIpc';
+
+export class DownloadServiceChannel implements IServerChannel {
+
+	constructor(private readonly service: IDownloadService) { }
+
+	listen(_: unknown, event: string, arg?: any): Event<any> {
+		throw new Error('Invalid listen');
+	}
+
+	call(context: any, command: string, args?: any): Promise<any> {
+		switch (command) {
+			case 'download': return this.service.download(URI.revive(args[0]), URI.revive(args[1]));
+		}
+		throw new Error('Invalid call');
+	}
+}
+
+export class DownloadServiceChannelClient implements IDownloadService {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IChannel, private getUriTransformer: () => IURITransformer | null) { }
+
+	async download(from: URI, to: URI): Promise<void> {
+		const uriTransfomer = this.getUriTransformer();
+		if (uriTransfomer) {
+			from = uriTransfomer.transformOutgoingURI(from);
+			to = uriTransfomer.transformOutgoingURI(to);
+		}
+		await this.channel.call('download', [from, to]);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/download/node/downloadService.ts b/src/vs/platform/download/common/downloadService.ts
similarity index 53%
rename from src/vs/platform/download/node/downloadService.ts
rename to src/vs/platform/download/common/downloadService.ts
index e464b7ae73d..a2b8365df4c 100644
--- a/src/vs/platform/download/node/downloadService.ts
+++ b/src/vs/platform/download/common/downloadService.ts
@@ -5,14 +5,10 @@
 
 import { IDownloadService } from 'vs/platform/download/common/download';
 import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { copy } from 'vs/base/node/pfs';
 import { IRequestService, asText } from 'vs/platform/request/common/request';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { join } from 'vs/base/common/path';
-import { tmpdir } from 'os';
-import { generateUuid } from 'vs/base/common/uuid';
 import { IFileService } from 'vs/platform/files/common/files';
+import { Schemas } from 'vs/base/common/network';
 
 export class DownloadService implements IDownloadService {
 
@@ -23,18 +19,18 @@ export class DownloadService implements IDownloadService {
 		@IFileService private readonly fileService: IFileService
 	) { }
 
-	download(uri: URI, target: string = join(tmpdir(), generateUuid()), cancellationToken: CancellationToken = CancellationToken.None): Promise<string> {
-		if (uri.scheme === Schemas.file) {
-			return copy(uri.fsPath, target).then(() => target);
+	async download(resource: URI, target: URI, cancellationToken: CancellationToken = CancellationToken.None): Promise<void> {
+		if (resource.scheme === Schemas.file) {
+			await this.fileService.copy(resource, target);
+			return;
+		}
+		const options = { type: 'GET', url: resource.toString() };
+		const context = await this.requestService.request(options, cancellationToken);
+		if (context.res.statusCode === 200) {
+			await this.fileService.writeFile(target, context.stream);
+		} else {
+			const message = await asText(context);
+			return Promise.reject(new Error(`Expected 200, got back ${context.res.statusCode} instead.\n\n${message}`));
 		}
-		const options = { type: 'GET', url: uri.toString() };
-		return this.requestService.request(options, cancellationToken)
-			.then(context => {
-				if (context.res.statusCode === 200) {
-					return this.fileService.writeFile(URI.file(target), context.stream).then(() => target);
-				}
-				return asText(context)
-					.then(message => Promise.reject(new Error(`Expected 200, got back ${context.res.statusCode} instead.\n\n${message}`)));
-			});
 	}
 }
diff --git a/src/vs/platform/download/node/downloadIpc.ts b/src/vs/platform/download/node/downloadIpc.ts
deleted file mode 100644
index 4bc0593679a..00000000000
--- a/src/vs/platform/download/node/downloadIpc.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { URI } from 'vs/base/common/uri';
-import * as path from 'vs/base/common/path';
-import * as fs from 'fs';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { mkdirp } from 'vs/base/node/pfs';
-import { IURITransformer } from 'vs/base/common/uriIpc';
-import { tmpdir } from 'os';
-import { generateUuid } from 'vs/base/common/uuid';
-
-type UploadResponse = Buffer | string | undefined;
-
-function upload(uri: URI): Event<UploadResponse> {
-	const stream = new Emitter<UploadResponse>();
-	const readstream = fs.createReadStream(uri.fsPath);
-	readstream.on('data', data => stream.fire(data));
-	readstream.on('error', error => stream.fire(error.toString()));
-	readstream.on('close', () => stream.fire(undefined));
-	return stream.event;
-}
-
-export class DownloadServiceChannel implements IServerChannel {
-
-	constructor() { }
-
-	listen(_: unknown, event: string, arg?: any): Event<any> {
-		switch (event) {
-			case 'upload': return Event.buffer(upload(URI.revive(arg)));
-		}
-
-		throw new Error(`Event not found: ${event}`);
-	}
-
-	call(_: unknown, command: string): Promise<any> {
-		throw new Error(`Call not found: ${command}`);
-	}
-}
-
-export class DownloadServiceChannelClient implements IDownloadService {
-
-	_serviceBrand: any;
-
-	constructor(private channel: IChannel, private getUriTransformer: () => IURITransformer) { }
-
-	download(from: URI, to: string = path.join(tmpdir(), generateUuid())): Promise<string> {
-		from = this.getUriTransformer().transformOutgoingURI(from);
-		const dirName = path.dirname(to);
-		let out: fs.WriteStream;
-		return new Promise<string>((c, e) => {
-			return mkdirp(dirName)
-				.then(() => {
-					out = fs.createWriteStream(to);
-					out.once('close', () => c(to));
-					out.once('error', e);
-					const uploadStream = this.channel.listen<UploadResponse>('upload', from);
-					const disposable = uploadStream(result => {
-						if (result === undefined) {
-							disposable.dispose();
-							out.end(() => c(to));
-						} else if (Buffer.isBuffer(result)) {
-							out.write(result);
-						} else if (typeof result === 'string') {
-							disposable.dispose();
-							out.end(() => e(result));
-						}
-					});
-				});
-		});
-	}
-}
\ No newline at end of file
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 440b393833d..a6c9eb9d11c 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -47,6 +47,7 @@ export interface ParsedArgs {
 	'disable-extension'?: string | string[];
 	'list-extensions'?: boolean;
 	'show-versions'?: boolean;
+	'category'?: string;
 	'install-extension'?: string | string[];
 	'uninstall-extension'?: string | string[];
 	'locate-extension'?: string | string[];
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index 71d6e6cc882..a1d33c98577 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -48,6 +48,7 @@ export const options: Option[] = [
 	{ id: 'extensions-dir', type: 'string', deprecates: 'extensionHomePath', cat: 'e', args: 'dir', description: localize('extensionHomePath', "Set the root path for extensions.") },
 	{ id: 'list-extensions', type: 'boolean', cat: 'e', description: localize('listExtensions', "List the installed extensions.") },
 	{ id: 'show-versions', type: 'boolean', cat: 'e', description: localize('showVersions', "Show versions of installed extensions, when using --list-extension.") },
+	{ id: 'category', type: 'string', cat: 'e', description: localize('category', "Filters installed extensions by provided category, when using --list-extension.") },
 	{ id: 'install-extension', type: 'string', cat: 'e', args: 'extension-id | path-to-vsix', description: localize('installExtension', "Installs or updates the extension. Use `--force` argument to avoid prompts.") },
 	{ id: 'uninstall-extension', type: 'string', cat: 'e', args: 'extension-id', description: localize('uninstallExtension', "Uninstalls an extension.") },
 	{ id: 'enable-proposed-api', type: 'string', cat: 'e', args: 'extension-id', description: localize('experimentalApis', "Enables proposed API features for extensions. Can receive one or more extension IDs to enable individually.") },
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index fa54ffc156d..e291d436115 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -22,6 +22,8 @@ import { URI } from 'vs/base/common/uri';
 import { joinPath } from 'vs/base/common/resources';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { IProductService } from 'vs/platform/product/common/product';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { optional } from 'vs/platform/instantiation/common/instantiation';
 
 interface IRawGalleryExtensionFile {
 	assetType: string;
@@ -338,11 +340,12 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IFileService private readonly fileService: IFileService,
 		@IProductService private readonly productService: IProductService,
+		@optional(IStorageService) private readonly storageService: IStorageService,
 	) {
 		const config = productService.extensionsGallery;
 		this.extensionsGalleryUrl = config && config.serviceUrl;
 		this.extensionsControlUrl = config && config.controlUrl;
-		this.commonHeadersPromise = resolveMarketplaceHeaders(productService.version, this.environmentService, this.fileService);
+		this.commonHeadersPromise = resolveMarketplaceHeaders(productService.version, this.environmentService, this.fileService, this.storageService);
 	}
 
 	private api(path = ''): string {
@@ -775,7 +778,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 	}
 }
 
-export async function resolveMarketplaceHeaders(version: string, environmentService: IEnvironmentService, fileService: IFileService): Promise<{ [key: string]: string; }> {
+export async function resolveMarketplaceHeaders(version: string, environmentService: IEnvironmentService, fileService: IFileService, storageService?: IStorageService): Promise<{ [key: string]: string; }> {
 	const headers: IHeaders = {
 		'X-Market-Client-Id': `VSCode ${version}`,
 		'User-Agent': `VSCode ${version}`
@@ -798,8 +801,20 @@ export async function resolveMarketplaceHeaders(version: string, environmentServ
 				//noop
 			}
 		}
+	}
+
+	if (storageService) {
+		uuid = storageService.get('marketplace.userid', StorageScope.GLOBAL) || null;
+		if (!uuid) {
+			uuid = generateUuid();
+			storageService.store('marketplace.userid', uuid, StorageScope.GLOBAL);
+		}
+	}
+
+	if (uuid) {
 		headers['X-Market-User-Id'] = uuid;
 	}
+
 	return headers;
 
 }
\ No newline at end of file
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 564b0981fba..70cd46c824a 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -241,7 +241,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			throw new Error('Download service is not available');
 		}
 		const downloadedLocation = path.join(tmpdir(), generateUuid());
-		return this.downloadService.download(vsix, downloadedLocation).then(() => URI.file(downloadedLocation));
+		return this.downloadService.download(vsix, URI.file(downloadedLocation)).then(() => URI.file(downloadedLocation));
 	}
 
 	private installFromZipPath(identifierWithVersion: ExtensionIdentifierWithVersion, zipPath: string, metadata: IGalleryMetadata | null, type: ExtensionType, operation: InstallOperation, token: CancellationToken): Promise<ILocalExtension> {
diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
index 4798e84518d..ec4a46372a6 100644
--- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
+++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
@@ -121,6 +121,7 @@ suite('AbstractKeybindingService', () => {
 			let commandService: ICommandService = {
 				_serviceBrand: undefined,
 				onWillExecuteCommand: () => ({ dispose: () => { } }),
+				onDidExecuteCommand: () => ({ dispose: () => { } }),
 				executeCommand: (commandId: string, ...args: any[]): Promise<any> => {
 					executeCommandCalls.push({
 						commandId: commandId,
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index 6261e15b41d..0ef822bae84 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -247,7 +247,7 @@ export class WorkbenchList<T> extends List<T> {
 	constructor(
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: IListRenderer<any /* TODO@joao */, any>[],
+		renderers: IListRenderer<T, any>[],
 		options: IListOptions<T>,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IListService listService: IListService,
@@ -787,7 +787,7 @@ export class WorkbenchObjectTree<T extends NonNullable<any>, TFilterData = void>
 	constructor(
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<any /* TODO@joao */, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, any>[],
 		options: IObjectTreeOptions<T, TFilterData>,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IListService listService: IListService,
@@ -813,7 +813,7 @@ export class WorkbenchDataTree<TInput, T, TFilterData = void> extends DataTree<T
 	constructor(
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<any /* TODO@joao */, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, any>[],
 		dataSource: IDataSource<TInput, T>,
 		options: IDataTreeOptions<T, TFilterData>,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -840,7 +840,7 @@ export class WorkbenchAsyncDataTree<TInput, T, TFilterData = void> extends Async
 	constructor(
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<any /* TODO@joao */, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, any>[],
 		dataSource: IAsyncDataSource<TInput, T>,
 		options: IAsyncDataTreeOptions<T, TFilterData>,
 		@IContextKeyService contextKeyService: IContextKeyService,
diff --git a/src/vs/platform/remote/browser/browserSocketFactory.ts b/src/vs/platform/remote/browser/browserSocketFactory.ts
new file mode 100644
index 00000000000..6b24ec07810
--- /dev/null
+++ b/src/vs/platform/remote/browser/browserSocketFactory.ts
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ISocketFactory, IConnectCallback } from 'vs/platform/remote/common/remoteAgentConnection';
+import { ISocket } from 'vs/base/parts/ipc/common/ipc.net';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { Event, Emitter } from 'vs/base/common/event';
+
+export interface IWebSocketFactory {
+	create(url: string): IWebSocket;
+}
+
+export interface IWebSocket {
+	readonly onData: Event<ArrayBuffer>;
+	readonly onOpen: Event<void>;
+	readonly onClose: Event<void>;
+	readonly onError: Event<any>;
+
+	send(data: ArrayBuffer | ArrayBufferView): void;
+	close(): void;
+}
+
+class BrowserWebSocket implements IWebSocket {
+
+	private readonly _onData = new Emitter<ArrayBuffer>();
+	public readonly onData = this._onData.event;
+
+	public readonly onOpen: Event<void>;
+	public readonly onClose: Event<void>;
+	public readonly onError: Event<any>;
+
+	private readonly _socket: WebSocket;
+	private readonly _fileReader: FileReader;
+	private readonly _queue: Blob[];
+	private _isReading: boolean;
+
+	private readonly _socketMessageListener: (ev: MessageEvent) => void;
+
+	constructor(socket: WebSocket) {
+		this._socket = socket;
+		this._fileReader = new FileReader();
+		this._queue = [];
+		this._isReading = false;
+
+		this._fileReader.onload = (event) => {
+			this._isReading = false;
+			const buff = <ArrayBuffer>(<any>event.target).result;
+
+			this._onData.fire(buff);
+
+			if (this._queue.length > 0) {
+				enqueue(this._queue.shift()!);
+			}
+		};
+
+		const enqueue = (blob: Blob) => {
+			if (this._isReading) {
+				this._queue.push(blob);
+				return;
+			}
+			this._isReading = true;
+			this._fileReader.readAsArrayBuffer(blob);
+		};
+
+		this._socketMessageListener = (ev: MessageEvent) => {
+			enqueue(<Blob>ev.data);
+		};
+		this._socket.addEventListener('message', this._socketMessageListener);
+
+		this.onOpen = Event.fromDOMEventEmitter(this._socket, 'open');
+		this.onClose = Event.fromDOMEventEmitter(this._socket, 'close');
+		this.onError = Event.fromDOMEventEmitter(this._socket, 'error');
+	}
+
+	send(data: ArrayBuffer | ArrayBufferView): void {
+		this._socket.send(data);
+	}
+
+	close(): void {
+		this._socket.close();
+		this._socket.removeEventListener('message', this._socketMessageListener);
+	}
+}
+
+export const defaultWebSocketFactory = new class implements IWebSocketFactory {
+	create(url: string): IWebSocket {
+		return new BrowserWebSocket(new WebSocket(url));
+	}
+};
+
+class BrowserSocket implements ISocket {
+	public readonly socket: IWebSocket;
+
+	constructor(socket: IWebSocket) {
+		this.socket = socket;
+	}
+
+	public dispose(): void {
+		this.socket.close();
+	}
+
+	public onData(listener: (e: VSBuffer) => void): IDisposable {
+		return this.socket.onData((data) => listener(VSBuffer.wrap(new Uint8Array(data))));
+	}
+
+	public onClose(listener: () => void): IDisposable {
+		return this.socket.onClose(listener);
+	}
+
+	public onEnd(listener: () => void): IDisposable {
+		return Disposable.None;
+	}
+
+	public write(buffer: VSBuffer): void {
+		this.socket.send(buffer.buffer);
+	}
+
+	public end(): void {
+		this.socket.close();
+	}
+
+}
+
+
+export class BrowserSocketFactory implements ISocketFactory {
+	private readonly _webSocketFactory: IWebSocketFactory;
+
+	constructor(webSocketFactory: IWebSocketFactory | null | undefined) {
+		this._webSocketFactory = webSocketFactory || defaultWebSocketFactory;
+	}
+
+	connect(host: string, port: number, query: string, callback: IConnectCallback): void {
+		const socket = this._webSocketFactory.create(`ws://${host}:${port}/?${query}&skipWebSocketFrames=false`);
+		const errorListener = socket.onError((err) => callback(err, undefined));
+		socket.onOpen(() => {
+			errorListener.dispose();
+			callback(undefined, new BrowserSocket(socket));
+		});
+	}
+}
+
+
+
diff --git a/src/vs/platform/remote/browser/browserWebSocketFactory.ts b/src/vs/platform/remote/browser/browserWebSocketFactory.ts
deleted file mode 100644
index 6d9ecbcf5a6..00000000000
--- a/src/vs/platform/remote/browser/browserWebSocketFactory.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IWebSocketFactory, IConnectCallback } from 'vs/platform/remote/common/remoteAgentConnection';
-import { ISocket } from 'vs/base/parts/ipc/common/ipc.net';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
-import { onUnexpectedError } from 'vs/base/common/errors';
-
-class BrowserSocket implements ISocket {
-	public readonly socket: WebSocket;
-
-	constructor(socket: WebSocket) {
-		this.socket = socket;
-	}
-
-	public dispose(): void {
-		this.socket.close();
-	}
-
-	public onData(_listener: (e: VSBuffer) => void): IDisposable {
-		const fileReader = new FileReader();
-		const queue: Blob[] = [];
-		let isReading = false;
-		fileReader.onload = function (event) {
-			isReading = false;
-			const buff = <ArrayBuffer>(<any>event.target).result;
-
-			try {
-				_listener(VSBuffer.wrap(new Uint8Array(buff)));
-			} catch (err) {
-				onUnexpectedError(err);
-			}
-
-			if (queue.length > 0) {
-				enqueue(queue.shift()!);
-			}
-		};
-		const enqueue = (blob: Blob) => {
-			if (isReading) {
-				queue.push(blob);
-				return;
-			}
-			isReading = true;
-			fileReader.readAsArrayBuffer(blob);
-		};
-		const listener = (e: MessageEvent) => {
-			enqueue(<Blob>e.data);
-		};
-		this.socket.addEventListener('message', listener);
-		return {
-			dispose: () => this.socket.removeEventListener('message', listener)
-		};
-	}
-
-	public onClose(listener: () => void): IDisposable {
-		this.socket.addEventListener('close', listener);
-		return {
-			dispose: () => this.socket.removeEventListener('close', listener)
-		};
-	}
-
-	public onEnd(listener: () => void): IDisposable {
-		return Disposable.None;
-	}
-
-	public write(buffer: VSBuffer): void {
-		this.socket.send(buffer.buffer);
-	}
-
-	public end(): void {
-		this.socket.close();
-	}
-
-}
-
-export const browserWebSocketFactory = new class implements IWebSocketFactory {
-	connect(host: string, port: number, query: string, callback: IConnectCallback): void {
-		const errorListener = (err: any) => callback(err, undefined);
-		const socket = new WebSocket(`ws://${host}:${port}/?${query}&skipWebSocketFrames=false`);
-		socket.onopen = function (event) {
-			socket.removeEventListener('error', errorListener);
-			callback(undefined, new BrowserSocket(socket));
-		};
-		socket.addEventListener('error', errorListener);
-	}
-};
diff --git a/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts b/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts
index 37d42a5c391..5db4ac5683e 100644
--- a/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts
+++ b/src/vs/platform/remote/browser/remoteAuthorityResolverService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResolvedAuthority, IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { ResolvedAuthority, IRemoteAuthorityResolverService, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
 
 export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverService {
 
@@ -12,12 +12,16 @@ export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverS
 	constructor() {
 	}
 
-	resolveAuthority(authority: string): Promise<ResolvedAuthority> {
+	resolveAuthority(authority: string): Promise<ResolverResult> {
 		if (authority.indexOf(':') >= 0) {
 			const pieces = authority.split(':');
-			return Promise.resolve({ authority, host: pieces[0], port: parseInt(pieces[1], 10) });
+			return Promise.resolve({
+				authority: { authority, host: pieces[0], port: parseInt(pieces[1], 10) }
+			});
 		}
-		return Promise.resolve({ authority, host: authority, port: 80 });
+		return Promise.resolve({
+			authority: { authority, host: authority, port: 80 }
+		});
 	}
 
 	clearResolvedAuthority(authority: string): void {
diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts
index 7c64d37917b..ad95b6751a7 100644
--- a/src/vs/platform/remote/common/remoteAgentConnection.ts
+++ b/src/vs/platform/remote/common/remoteAgentConnection.ts
@@ -57,7 +57,7 @@ interface ISimpleConnectionOptions {
 	port: number;
 	reconnectionToken: string;
 	reconnectionProtocol: PersistentProtocol | null;
-	webSocketFactory: IWebSocketFactory;
+	socketFactory: ISocketFactory;
 	signService: ISignService;
 }
 
@@ -65,13 +65,13 @@ export interface IConnectCallback {
 	(err: any | undefined, socket: ISocket | undefined): void;
 }
 
-export interface IWebSocketFactory {
+export interface ISocketFactory {
 	connect(host: string, port: number, query: string, callback: IConnectCallback): void;
 }
 
 async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptions, connectionType: ConnectionType, args: any | undefined): Promise<PersistentProtocol> {
 	const protocol = await new Promise<PersistentProtocol>((c, e) => {
-		options.webSocketFactory.connect(
+		options.socketFactory.connect(
 			options.host,
 			options.port,
 			`reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`,
@@ -163,6 +163,7 @@ export interface IRemoteExtensionHostStartParams {
 	debugId?: string;
 	break?: boolean;
 	port?: number | null;
+	env?: { [key: string]: string | null };
 }
 
 interface IExtensionHostConnectionResult {
@@ -201,7 +202,7 @@ async function doConnectRemoteAgentTunnel(options: ISimpleConnectionOptions, sta
 export interface IConnectionOptions {
 	isBuilt: boolean;
 	commit: string | undefined;
-	webSocketFactory: IWebSocketFactory;
+	socketFactory: ISocketFactory;
 	addressProvider: IAddressProvider;
 	signService: ISignService;
 }
@@ -215,7 +216,7 @@ async function resolveConnectionOptions(options: IConnectionOptions, reconnectio
 		port: port,
 		reconnectionToken: reconnectionToken,
 		reconnectionProtocol: reconnectionProtocol,
-		webSocketFactory: options.webSocketFactory,
+		socketFactory: options.socketFactory,
 		signService: options.signService
 	};
 }
@@ -255,7 +256,7 @@ function sleep(seconds: number): Promise<void> {
 	});
 }
 
-export const enum PersistenConnectionEventType {
+export const enum PersistentConnectionEventType {
 	ConnectionLost,
 	ReconnectionWait,
 	ReconnectionRunning,
@@ -263,22 +264,22 @@ export const enum PersistenConnectionEventType {
 	ConnectionGain
 }
 export class ConnectionLostEvent {
-	public readonly type = PersistenConnectionEventType.ConnectionLost;
+	public readonly type = PersistentConnectionEventType.ConnectionLost;
 }
 export class ReconnectionWaitEvent {
-	public readonly type = PersistenConnectionEventType.ReconnectionWait;
+	public readonly type = PersistentConnectionEventType.ReconnectionWait;
 	constructor(
 		public readonly durationSeconds: number
 	) { }
 }
 export class ReconnectionRunningEvent {
-	public readonly type = PersistenConnectionEventType.ReconnectionRunning;
+	public readonly type = PersistentConnectionEventType.ReconnectionRunning;
 }
 export class ConnectionGainEvent {
-	public readonly type = PersistenConnectionEventType.ConnectionGain;
+	public readonly type = PersistentConnectionEventType.ConnectionGain;
 }
 export class ReconnectionPermanentFailureEvent {
-	public readonly type = PersistenConnectionEventType.ReconnectionPermanentFailure;
+	public readonly type = PersistentConnectionEventType.ReconnectionPermanentFailure;
 }
 export type PersistenConnectionEvent = ConnectionGainEvent | ConnectionLostEvent | ReconnectionWaitEvent | ReconnectionRunningEvent | ReconnectionPermanentFailureEvent;
 
diff --git a/src/vs/platform/remote/common/remoteAuthorityResolver.ts b/src/vs/platform/remote/common/remoteAuthorityResolver.ts
index fac355a4917..e9ba56563b3 100644
--- a/src/vs/platform/remote/common/remoteAuthorityResolver.ts
+++ b/src/vs/platform/remote/common/remoteAuthorityResolver.ts
@@ -13,6 +13,15 @@ export interface ResolvedAuthority {
 	readonly port: number;
 }
 
+export interface ResolvedOptions {
+	readonly extensionHostEnv?: { [key: string]: string | null };
+}
+
+export interface ResolverResult {
+	authority: ResolvedAuthority;
+	options?: ResolvedOptions;
+}
+
 export enum RemoteAuthorityResolverErrorCode {
 	Unknown = 'Unknown',
 	NotAvailable = 'NotAvailable',
@@ -61,9 +70,9 @@ export interface IRemoteAuthorityResolverService {
 
 	_serviceBrand: any;
 
-	resolveAuthority(authority: string): Promise<ResolvedAuthority>;
+	resolveAuthority(authority: string): Promise<ResolverResult>;
 
 	clearResolvedAuthority(authority: string): void;
-	setResolvedAuthority(resolvedAuthority: ResolvedAuthority): void;
+	setResolvedAuthority(resolvedAuthority: ResolvedAuthority, resolvedOptions?: ResolvedOptions): void;
 	setResolvedAuthorityError(authority: string, err: any): void;
 }
diff --git a/src/vs/platform/remote/common/remoteHosts.ts b/src/vs/platform/remote/common/remoteHosts.ts
index 8ca915e74dc..5578246cc82 100644
--- a/src/vs/platform/remote/common/remoteHosts.ts
+++ b/src/vs/platform/remote/common/remoteHosts.ts
@@ -10,4 +10,16 @@ export const REMOTE_HOST_SCHEME = Schemas.vscodeRemote;
 
 export function getRemoteAuthority(uri: URI): string | undefined {
 	return uri.scheme === REMOTE_HOST_SCHEME ? uri.authority : undefined;
+}
+
+export function getRemoteName(authority: string | undefined): string | undefined {
+	if (!authority) {
+		return undefined;
+	}
+	const pos = authority.indexOf('+');
+	if (pos < 0) {
+		// funky? bad authority?
+		return authority;
+	}
+	return authority.substr(0, pos);
 }
\ No newline at end of file
diff --git a/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
index 0a97af69780..3cd1da3e018 100644
--- a/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
+++ b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResolvedAuthority, IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { ResolvedAuthority, IRemoteAuthorityResolverService, ResolverResult, ResolvedOptions } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { ipcRenderer as ipc } from 'electron';
 import * as errors from 'vs/base/common/errors';
 
 class PendingResolveAuthorityRequest {
 	constructor(
-		public readonly resolve: (value: ResolvedAuthority) => void,
+		public readonly resolve: (value: ResolverResult) => void,
 		public readonly reject: (err: any) => void,
-		public readonly promise: Promise<ResolvedAuthority>,
+		public readonly promise: Promise<ResolverResult>,
 	) {
 	}
 }
@@ -26,11 +26,11 @@ export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverS
 		this._resolveAuthorityRequests = Object.create(null);
 	}
 
-	resolveAuthority(authority: string): Promise<ResolvedAuthority> {
+	resolveAuthority(authority: string): Promise<ResolverResult> {
 		if (!this._resolveAuthorityRequests[authority]) {
-			let resolve: (value: ResolvedAuthority) => void;
+			let resolve: (value: ResolverResult) => void;
 			let reject: (err: any) => void;
-			let promise = new Promise<ResolvedAuthority>((_resolve, _reject) => {
+			let promise = new Promise<ResolverResult>((_resolve, _reject) => {
 				resolve = _resolve;
 				reject = _reject;
 			});
@@ -46,11 +46,11 @@ export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverS
 		}
 	}
 
-	setResolvedAuthority(resolvedAuthority: ResolvedAuthority) {
+	setResolvedAuthority(resolvedAuthority: ResolvedAuthority, options?: ResolvedOptions) {
 		if (this._resolveAuthorityRequests[resolvedAuthority.authority]) {
 			let request = this._resolveAuthorityRequests[resolvedAuthority.authority];
 			ipc.send('vscode:remoteAuthorityResolved', resolvedAuthority);
-			request.resolve(resolvedAuthority);
+			request.resolve({ authority: resolvedAuthority, options });
 		}
 	}
 
diff --git a/src/vs/platform/remote/node/nodeWebSocketFactory.ts b/src/vs/platform/remote/node/nodeSocketFactory.ts
similarity index 89%
rename from src/vs/platform/remote/node/nodeWebSocketFactory.ts
rename to src/vs/platform/remote/node/nodeSocketFactory.ts
index 9139f3e9992..44d68996140 100644
--- a/src/vs/platform/remote/node/nodeWebSocketFactory.ts
+++ b/src/vs/platform/remote/node/nodeSocketFactory.ts
@@ -5,9 +5,9 @@
 
 import * as net from 'net';
 import { NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
-import { IWebSocketFactory, IConnectCallback } from 'vs/platform/remote/common/remoteAgentConnection';
+import { ISocketFactory, IConnectCallback } from 'vs/platform/remote/common/remoteAgentConnection';
 
-export const nodeWebSocketFactory = new class implements IWebSocketFactory {
+export const nodeSocketFactory = new class implements ISocketFactory {
 	connect(host: string, port: number, query: string, callback: IConnectCallback): void {
 		const errorListener = (err: any) => callback(err, undefined);
 
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 2e7a4bb00d1..4604c0e189c 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -10,7 +10,7 @@ import { ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils'
 import { optional } from 'vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { cloneAndChange, mixin } from 'vs/base/common/objects';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ClassifiedEvent, StrictPropertyCheck, GDPRClassification } from 'vs/platform/telemetry/common/gdprTypings';
@@ -35,7 +35,7 @@ export class TelemetryService implements ITelemetryService {
 	private _userOptIn: boolean;
 	private _enabled: boolean;
 
-	private _disposables: IDisposable[] = [];
+	private readonly _disposables = new DisposableStore();
 	private _cleanupPatterns: RegExp[] = [];
 
 	constructor(
@@ -113,7 +113,7 @@ export class TelemetryService implements ITelemetryService {
 	}
 
 	dispose(): void {
-		this._disposables = dispose(this._disposables);
+		this._disposables.dispose();
 	}
 
 	publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): Promise<any> {
diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index e2fca2ba8c6..f8990d64a32 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -33,17 +33,17 @@ export const NullTelemetryService = new class implements ITelemetryService {
 
 export interface ITelemetryAppender {
 	log(eventName: string, data: any): void;
-	dispose(): Promise<any> | undefined;
+	flush(): Promise<any>;
 }
 
 export function combinedAppender(...appenders: ITelemetryAppender[]): ITelemetryAppender {
 	return {
 		log: (e, d) => appenders.forEach(a => a.log(e, d)),
-		dispose: () => Promise.all(appenders.map(a => a.dispose()))
+		flush: () => Promise.all(appenders.map(a => a.flush()))
 	};
 }
 
-export const NullAppender: ITelemetryAppender = { log: () => null, dispose: () => Promise.resolve(null) };
+export const NullAppender: ITelemetryAppender = { log: () => null, flush: () => Promise.resolve(null) };
 
 
 export class LogAppender implements ITelemetryAppender {
@@ -51,7 +51,7 @@ export class LogAppender implements ITelemetryAppender {
 	private commonPropertiesRegex = /^sessionID$|^version$|^timestamp$|^commitHash$|^common\./;
 	constructor(@ILogService private readonly _logService: ILogService) { }
 
-	dispose(): Promise<any> {
+	flush(): Promise<any> {
 		return Promise.resolve(undefined);
 	}
 
diff --git a/src/vs/platform/telemetry/node/appInsightsAppender.ts b/src/vs/platform/telemetry/node/appInsightsAppender.ts
index 2ed0150ac1f..f9c012cd344 100644
--- a/src/vs/platform/telemetry/node/appInsightsAppender.ts
+++ b/src/vs/platform/telemetry/node/appInsightsAppender.ts
@@ -73,7 +73,7 @@ export class AppInsightsAppender implements ITelemetryAppender {
 		});
 	}
 
-	dispose(): Promise<any> | undefined {
+	flush(): Promise<any> {
 		if (this._aiClient) {
 			return new Promise(resolve => {
 				this._aiClient!.flush({
@@ -85,6 +85,6 @@ export class AppInsightsAppender implements ITelemetryAppender {
 				});
 			});
 		}
-		return undefined;
+		return Promise.resolve(undefined);
 	}
 }
diff --git a/src/vs/platform/telemetry/node/telemetryIpc.ts b/src/vs/platform/telemetry/node/telemetryIpc.ts
index 8e1b68eb364..b49a3a23142 100644
--- a/src/vs/platform/telemetry/node/telemetryIpc.ts
+++ b/src/vs/platform/telemetry/node/telemetryIpc.ts
@@ -37,7 +37,8 @@ export class TelemetryAppenderClient implements ITelemetryAppender {
 		return Promise.resolve(null);
 	}
 
-	dispose(): any {
+	flush(): Promise<void> {
 		// TODO
+		return Promise.resolve();
 	}
 }
diff --git a/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts b/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts
index c891f9b894b..92f9d63b15e 100644
--- a/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts
@@ -84,7 +84,7 @@ suite('AIAdapter', () => {
 	});
 
 	teardown(() => {
-		adapter.dispose();
+		adapter.flush();
 	});
 
 	test('Simple event', () => {
diff --git a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
index 9f728745344..86a5f5203ed 100644
--- a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
@@ -30,7 +30,7 @@ class TestTelemetryAppender implements ITelemetryAppender {
 		return this.events.length;
 	}
 
-	public dispose(): Promise<any> {
+	public flush(): Promise<any> {
 		this.isDisposed = true;
 		return Promise.resolve(null);
 	}
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index 1a5e6e79217..6f356bfe66b 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -203,7 +203,8 @@ export const widgetShadow = registerColor('widget.shadow', { dark: '#000000', li
 export const inputBackground = registerColor('input.background', { dark: '#3C3C3C', light: Color.white, hc: Color.black }, nls.localize('inputBoxBackground', "Input box background."));
 export const inputForeground = registerColor('input.foreground', { dark: foreground, light: foreground, hc: foreground }, nls.localize('inputBoxForeground', "Input box foreground."));
 export const inputBorder = registerColor('input.border', { dark: null, light: null, hc: contrastBorder }, nls.localize('inputBoxBorder', "Input box border."));
-export const inputActiveOptionBorder = registerColor('inputOption.activeBorder', { dark: '#007ACC', light: '#007ACC', hc: activeContrastBorder }, nls.localize('inputBoxActiveOptionBorder', "Border color of activated options in input fields."));
+export const inputActiveOptionBorder = registerColor('inputOption.activeBorder', { dark: '#007ACC00', light: '#007ACC00', hc: contrastBorder }, nls.localize('inputBoxActiveOptionBorder', "Border color of activated options in input fields."));
+export const inputActiveOptionBackground = registerColor('inputOption.activeBackground', { dark: transparent(focusBorder, 0.5), light: transparent(focusBorder, 0.3), hc: null }, nls.localize('inputOption.activeBackground', "Background color of activated options in input fields."));
 export const inputPlaceholderForeground = registerColor('input.placeholderForeground', { light: transparent(foreground, 0.5), dark: transparent(foreground, 0.5), hc: transparent(foreground, 0.7) }, nls.localize('inputPlaceholderForeground', "Input box foreground color for placeholder text."));
 
 export const inputValidationInfoBackground = registerColor('inputValidation.infoBackground', { dark: '#063B49', light: '#D6ECF2', hc: Color.black }, nls.localize('inputValidationInfoBackground', "Input validation background color for information severity."));
diff --git a/src/vs/platform/theme/common/styler.ts b/src/vs/platform/theme/common/styler.ts
index d04b8bd3c8f..75245df2d1e 100644
--- a/src/vs/platform/theme/common/styler.ts
+++ b/src/vs/platform/theme/common/styler.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listInactiveFocusBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, badgeBackground, badgeForeground, progressBarBackground, breadcrumbsForeground, breadcrumbsFocusForeground, breadcrumbsActiveSelectionForeground, breadcrumbsBackground, editorWidgetBorder, inputValidationInfoForeground, inputValidationWarningForeground, inputValidationErrorForeground, menuForeground, menuBackground, menuSelectionForeground, menuSelectionBackground, menuSelectionBorder, menuBorder, menuSeparatorBackground, darken, listFilterWidgetOutline, listFilterWidgetNoMatchesOutline, listFilterWidgetBackground, editorWidgetBackground, treeIndentGuidesStroke, editorWidgetForeground } from 'vs/platform/theme/common/colorRegistry';
+import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, inputActiveOptionBackground, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listInactiveFocusBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, badgeBackground, badgeForeground, progressBarBackground, breadcrumbsForeground, breadcrumbsFocusForeground, breadcrumbsActiveSelectionForeground, breadcrumbsBackground, editorWidgetBorder, inputValidationInfoForeground, inputValidationWarningForeground, inputValidationErrorForeground, menuForeground, menuBackground, menuSelectionForeground, menuSelectionBackground, menuSelectionBorder, menuBorder, menuSeparatorBackground, darken, listFilterWidgetOutline, listFilterWidgetNoMatchesOutline, listFilterWidgetBackground, editorWidgetBackground, treeIndentGuidesStroke, editorWidgetForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
@@ -59,11 +59,13 @@ export function attachStyler<T extends IColorMapping>(themeService: IThemeServic
 
 export interface ICheckboxStyleOverrides extends IStyleOverrides {
 	inputActiveOptionBorderColor?: ColorIdentifier;
+	inputActiveOptionBackgroundColor?: ColorIdentifier;
 }
 
 export function attachCheckboxStyler(widget: IThemable, themeService: IThemeService, style?: ICheckboxStyleOverrides): IDisposable {
 	return attachStyler(themeService, {
-		inputActiveOptionBorder: (style && style.inputActiveOptionBorderColor) || inputActiveOptionBorder
+		inputActiveOptionBorder: (style && style.inputActiveOptionBorderColor) || inputActiveOptionBorder,
+		inputActiveOptionBackground: (style && style.inputActiveOptionBackgroundColor) || inputActiveOptionBackground
 	} as ICheckboxStyleOverrides, widget);
 }
 
@@ -85,6 +87,7 @@ export interface IInputBoxStyleOverrides extends IStyleOverrides {
 	inputForeground?: ColorIdentifier;
 	inputBorder?: ColorIdentifier;
 	inputActiveOptionBorder?: ColorIdentifier;
+	inputActiveOptionBackground?: ColorIdentifier;
 	inputValidationInfoBorder?: ColorIdentifier;
 	inputValidationInfoBackground?: ColorIdentifier;
 	inputValidationInfoForeground?: ColorIdentifier;
@@ -146,6 +149,7 @@ export function attachFindInputBoxStyler(widget: IThemable, themeService: ITheme
 		inputForeground: (style && style.inputForeground) || inputForeground,
 		inputBorder: (style && style.inputBorder) || inputBorder,
 		inputActiveOptionBorder: (style && style.inputActiveOptionBorder) || inputActiveOptionBorder,
+		inputActiveOptionBackground: (style && style.inputActiveOptionBackground) || inputActiveOptionBackground,
 		inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || inputValidationInfoBorder,
 		inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || inputValidationInfoBackground,
 		inputValidationInfoForeground: (style && style.inputValidationInfoForeground) || inputValidationInfoForeground,
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 786439397ef..65892f8b976 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -3826,7 +3826,7 @@ declare module 'vscode' {
 		/**
 		 * Provide selection ranges for the given positions.
 		 *
-		 * Selection ranges should be computed individually and independend for each position. The editor will merge
+		 * Selection ranges should be computed individually and independent for each position. The editor will merge
 		 * and deduplicate ranges but providers must return hierarchies of selection ranges so that a range
 		 * is [contained](#Range.contains) by its parent.
 		 *
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 2acdd9eb0c9..d86d071f6f4 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -94,6 +94,12 @@ declare module 'vscode' {
 		constructor(host: string, port: number);
 	}
 
+	export interface ResolvedOptions {
+		extensionHostEnv?: { [key: string]: string | null };
+	}
+
+	export type ResolverResult = ResolvedAuthority & ResolvedOptions;
+
 	export class RemoteAuthorityResolverError extends Error {
 		static NotAvailable(message?: string, handled?: boolean): RemoteAuthorityResolverError;
 		static TemporarilyNotAvailable(message?: string): RemoteAuthorityResolverError;
@@ -102,7 +108,7 @@ declare module 'vscode' {
 	}
 
 	export interface RemoteAuthorityResolver {
-		resolve(authority: string, context: RemoteAuthorityResolverContext): ResolvedAuthority | Thenable<ResolvedAuthority>;
+		resolve(authority: string, context: RemoteAuthorityResolverContext): ResolverResult | Thenable<ResolverResult>;
 	}
 
 	export interface ResourceLabelFormatter {
@@ -559,6 +565,22 @@ declare module 'vscode' {
 
 	//#endregion
 
+	//#region Joh: onDidExecuteCommand
+
+	export interface CommandExecutionEvent {
+		command: string;
+		arguments: any[];
+	}
+
+	export namespace commands {
+		/**
+		 * An event that is emitted when a [command](#Command) is executed.
+		 */
+		export const onDidExecuteCommand: Event<CommandExecutionEvent>;
+	}
+
+	//#endregion
+
 	//#region Joh: decorations
 
 	//todo@joh -> make class
diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts
index dca4efc3835..2905c524113 100644
--- a/src/vs/workbench/api/browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts
@@ -48,6 +48,7 @@ import './mainThreadStorage';
 import './mainThreadTelemetry';
 import './mainThreadTerminalService';
 import './mainThreadTreeViews';
+import './mainThreadDownloadService';
 import './mainThreadUrls';
 import './mainThreadWindow';
 import './mainThreadWebview';
diff --git a/src/vs/workbench/api/browser/mainThreadCommands.ts b/src/vs/workbench/api/browser/mainThreadCommands.ts
index 2f4d043f048..25dc1138055 100644
--- a/src/vs/workbench/api/browser/mainThreadCommands.ts
+++ b/src/vs/workbench/api/browser/mainThreadCommands.ts
@@ -15,6 +15,7 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 	private readonly _commandRegistrations = new Map<string, IDisposable>();
 	private readonly _generateCommandsDocumentationRegistration: IDisposable;
 	private readonly _proxy: ExtHostCommandsShape;
+	private _onDidExecuteCommandListener?: IDisposable;
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -77,6 +78,19 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 		return this._commandService.executeCommand<T>(id, ...args);
 	}
 
+	$registerCommandListener() {
+		if (!this._onDidExecuteCommandListener) {
+			this._onDidExecuteCommandListener = this._commandService.onDidExecuteCommand(command => this._proxy.$handleDidExecuteCommand(command));
+		}
+	}
+
+	$unregisterCommandListener() {
+		if (this._onDidExecuteCommandListener) {
+			this._onDidExecuteCommandListener.dispose();
+			this._onDidExecuteCommandListener = undefined;
+		}
+	}
+
 	$getCommands(): Promise<string[]> {
 		return Promise.resolve([...CommandsRegistry.getCommands().keys()]);
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadDownloadService.ts b/src/vs/workbench/api/browser/mainThreadDownloadService.ts
new file mode 100644
index 00000000000..8b64b910337
--- /dev/null
+++ b/src/vs/workbench/api/browser/mainThreadDownloadService.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from 'vs/base/common/lifecycle';
+import { MainContext, IExtHostContext, MainThreadDownloadServiceShape } from 'vs/workbench/api/common/extHost.protocol';
+import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+import { IDownloadService } from 'vs/platform/download/common/download';
+import { UriComponents, URI } from 'vs/base/common/uri';
+
+@extHostNamedCustomer(MainContext.MainThreadDownloadService)
+export class MainThreadDownloadService extends Disposable implements MainThreadDownloadServiceShape {
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@IDownloadService private readonly downloadService: IDownloadService
+	) {
+		super();
+	}
+
+	$download(uri: UriComponents, to: UriComponents): Promise<void> {
+		return this.downloadService.download(URI.revive(uri), URI.revive(to));
+	}
+
+}
\ No newline at end of file
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
index d1cdcc4c131..03858de675f 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
@@ -35,8 +35,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		// ITerminalService listeners
 		this._toDispose.add(_terminalService.onInstanceCreated((instance) => {
 			// Delay this message so the TerminalInstance constructor has a chance to finish and
-			// return the ID normally to the extension host. The ID that is passed here will be used
-			// to register non-extension API terminals in the extension host.
+			// return the ID normally to the extension host. The ID that is passed here will be
+			// used to register non-extension API terminals in the extension host.
 			setTimeout(() => {
 				this._onTerminalOpened(instance);
 				this._onInstanceDimensionsChanged(instance);
diff --git a/src/vs/workbench/api/browser/mainThreadTreeViews.ts b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
index 7a18271ff58..f7024269742 100644
--- a/src/vs/workbench/api/browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from 'vs/base/common/lifecycle';
-import { ExtHostContext, MainThreadTreeViewsShape, ExtHostTreeViewsShape, MainContext, IExtHostContext } from '../common/extHost.protocol';
+import { ExtHostContext, MainThreadTreeViewsShape, ExtHostTreeViewsShape, MainContext, IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { ITreeViewDataProvider, ITreeItem, IViewsService, ITreeView, IViewsRegistry, ITreeViewDescriptor, IRevealOptions, Extensions } from 'vs/workbench/common/views';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { distinct } from 'vs/base/common/arrays';
diff --git a/src/vs/workbench/api/browser/mainThreadWebview.ts b/src/vs/workbench/api/browser/mainThreadWebview.ts
index 94413dd49a7..90bdeb5ea74 100644
--- a/src/vs/workbench/api/browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebview.ts
@@ -22,6 +22,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { extHostNamedCustomer } from '../common/extHostCustomers';
 import { IProductService } from 'vs/platform/product/common/product';
 import { startsWith } from 'vs/base/common/strings';
+import { Webview } from 'vs/workbench/contrib/webview/common/webview';
 
 interface OldMainThreadWebviewState {
 	readonly viewType: string;
@@ -41,9 +42,9 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 
 	private static revivalPool = 0;
 
-
 	private readonly _proxy: ExtHostWebviewsShape;
-	private readonly _webviews = new Map<WebviewPanelHandle, WebviewEditorInput>();
+	private readonly _webviewEditorInputs = new Map<string, WebviewEditorInput>();
+	private readonly _webviews = new Map<string, Webview>();
 	private readonly _revivers = new Map<string, IDisposable>();
 
 	private _activeWebview: WebviewPanelHandle | undefined = undefined;
@@ -103,7 +104,8 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		});
 		this.hookupWebviewEventDelegate(handle, webview);
 
-		this._webviews.set(handle, webview);
+		this._webviewEditorInputs.set(handle, webview);
+		this._webviews.set(handle, webview.webview);
 
 		/* __GDPR__
 			"webviews:createWebviewPanel" : {
@@ -114,32 +116,32 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 	}
 
 	public $disposeWebview(handle: WebviewPanelHandle): void {
-		const webview = this.getWebview(handle);
+		const webview = this.getWebviewEditorInput(handle);
 		webview.dispose();
 	}
 
 	public $setTitle(handle: WebviewPanelHandle, value: string): void {
-		const webview = this.getWebview(handle);
+		const webview = this.getWebviewEditorInput(handle);
 		webview.setName(value);
 	}
 
 	public $setIconPath(handle: WebviewPanelHandle, value: { light: UriComponents, dark: UriComponents } | undefined): void {
-		const webview = this.getWebview(handle);
+		const webview = this.getWebviewEditorInput(handle);
 		webview.iconPath = reviveWebviewIcon(value);
 	}
 
 	public $setHtml(handle: WebviewPanelHandle, value: string): void {
 		const webview = this.getWebview(handle);
-		webview.webview.html = value;
+		webview.html = value;
 	}
 
 	public $setOptions(handle: WebviewPanelHandle, options: modes.IWebviewOptions): void {
 		const webview = this.getWebview(handle);
-		webview.webview.contentOptions = reviveWebviewOptions(options as any /*todo@mat */);
+		webview.contentOptions = reviveWebviewOptions(options as any /*todo@mat */);
 	}
 
 	public $reveal(handle: WebviewPanelHandle, showOptions: WebviewPanelShowOptions): void {
-		const webview = this.getWebview(handle);
+		const webview = this.getWebviewEditorInput(handle);
 		if (webview.isDisposed()) {
 			return;
 		}
@@ -152,7 +154,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 
 	public async $postMessage(handle: WebviewPanelHandle, message: any): Promise<boolean> {
 		const webview = this.getWebview(handle);
-		webview.webview.sendMessage(message);
+		webview.sendMessage(message);
 		return true;
 	}
 
@@ -173,8 +175,10 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 				}
 
 				const handle = `revival-${MainThreadWebviews.revivalPool++}`;
-				this._webviews.set(handle, webviewEditorInput);
+				this._webviewEditorInputs.set(handle, webviewEditorInput);
+				this._webviews.set(handle, webviewEditorInput.webview);
 				this.hookupWebviewEventDelegate(handle, webviewEditorInput);
+
 				let state = undefined;
 				if (webviewEditorInput.webview.state) {
 					try {
@@ -229,11 +233,12 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		input.webview.onMessage((message: any) => this._proxy.$onMessage(handle, message));
 		input.onDispose(() => {
 			this._proxy.$onDidDisposeWebviewPanel(handle).finally(() => {
+				this._webviewEditorInputs.delete(handle);
 				this._webviews.delete(handle);
 			});
 		});
 		input.webview.onDidUpdateState((newState: any) => {
-			const webview = this.tryGetWebview(handle);
+			const webview = this.tryGetWebviewEditorInput(handle);
 			if (!webview || webview.isDisposed()) {
 				return;
 			}
@@ -245,8 +250,8 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		const activeEditor = this._editorService.activeControl;
 		let newActiveWebview: { input: WebviewEditorInput, handle: WebviewPanelHandle } | undefined = undefined;
 		if (activeEditor && activeEditor.input instanceof WebviewEditorInput) {
-			for (const handle of map.keys(this._webviews)) {
-				const input = this._webviews.get(handle)!;
+			for (const handle of map.keys(this._webviewEditorInputs)) {
+				const input = this._webviewEditorInputs.get(handle)!;
 				if (input.matches(activeEditor.input)) {
 					newActiveWebview = { input, handle };
 					break;
@@ -266,7 +271,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 
 		// Broadcast view state update for currently active
 		if (typeof this._activeWebview !== 'undefined') {
-			const oldActiveWebview = this._webviews.get(this._activeWebview);
+			const oldActiveWebview = this._webviewEditorInputs.get(this._activeWebview);
 			if (oldActiveWebview) {
 				this._proxy.$onDidChangeWebviewPanelViewState(this._activeWebview, {
 					active: false,
@@ -290,7 +295,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 	}
 
 	private onVisibleEditorsChanged(): void {
-		this._webviews.forEach((input, handle) => {
+		this._webviewEditorInputs.forEach((input, handle) => {
 			for (const workbenchEditor of this._editorService.visibleControls) {
 				if (workbenchEditor.input && workbenchEditor.input.matches(input)) {
 					const editorPosition = editorGroupToViewColumn(this._editorGroupService, workbenchEditor.group!);
@@ -312,7 +317,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 			return;
 		}
 
-		const webview = this.getWebview(handle);
+		const webview = this.getWebviewEditorInput(handle);
 		if (this.isSupportedLink(webview, link)) {
 			this._openerService.open(link);
 		}
@@ -328,7 +333,19 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		return !!webview.webview.contentOptions.enableCommandUris && link.scheme === 'command';
 	}
 
-	private getWebview(handle: WebviewPanelHandle): WebviewEditorInput {
+	private getWebviewEditorInput(handle: WebviewPanelHandle): WebviewEditorInput {
+		const webview = this.tryGetWebviewEditorInput(handle);
+		if (!webview) {
+			throw new Error('Unknown webview handle:' + handle);
+		}
+		return webview;
+	}
+
+	private tryGetWebviewEditorInput(handle: WebviewPanelHandle): WebviewEditorInput | undefined {
+		return this._webviewEditorInputs.get(handle);
+	}
+
+	private getWebview(handle: WebviewPanelHandle): Webview {
 		const webview = this.tryGetWebview(handle);
 		if (!webview) {
 			throw new Error('Unknown webview handle:' + handle);
@@ -336,7 +353,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 		return webview;
 	}
 
-	private tryGetWebview(handle: WebviewPanelHandle): WebviewEditorInput | undefined {
+	private tryGetWebview(handle: WebviewPanelHandle): Webview | undefined {
 		return this._webviews.get(handle);
 	}
 
diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index 732a037641c..f0c9c62ec00 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -24,6 +24,7 @@ import { ExtHostContext, ExtHostWorkspaceShape, IExtHostContext, MainContext, Ma
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { isEqualOrParent } from 'vs/base/common/resources';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { withNullAsUndefined } from 'vs/base/common/types';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@@ -122,21 +123,21 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 	// --- search ---
 
-	$startFileSearch(includePattern: string, _includeFolder: UriComponents | undefined, excludePatternOrDisregardExcludes: string | false | undefined, maxResults: number, token: CancellationToken): Promise<URI[] | undefined> {
+	$startFileSearch(includePattern: string | null, _includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false | null, maxResults: number | null, token: CancellationToken): Promise<UriComponents[] | null> {
 		const includeFolder = URI.revive(_includeFolder);
 		const workspace = this._contextService.getWorkspace();
 		if (!workspace.folders.length) {
-			return Promise.resolve(undefined);
+			return Promise.resolve(null);
 		}
 
 		const query = this._queryBuilder.file(
 			includeFolder ? [includeFolder] : workspace.folders.map(f => f.uri),
 			{
-				maxResults,
+				maxResults: withNullAsUndefined(maxResults),
 				disregardExcludeSettings: (excludePatternOrDisregardExcludes === false) || undefined,
 				disregardSearchExcludeSettings: true,
 				disregardIgnoreFiles: true,
-				includePattern,
+				includePattern: withNullAsUndefined(includePattern),
 				excludePattern: typeof excludePatternOrDisregardExcludes === 'string' ? excludePatternOrDisregardExcludes : undefined,
 				_reason: 'startFileSearch'
 			});
diff --git a/src/vs/workbench/api/common/apiCommands.ts b/src/vs/workbench/api/common/apiCommands.ts
index 0c303c05c44..0c5b098cd6a 100644
--- a/src/vs/workbench/api/common/apiCommands.ts
+++ b/src/vs/workbench/api/common/apiCommands.ts
@@ -12,7 +12,6 @@ import { EditorViewColumn } from 'vs/workbench/api/common/shared/editor';
 import { EditorGroupLayout } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IOpenSettings, IURIToOpen, IWindowService } from 'vs/platform/windows/common/windows';
-import { IDownloadService } from 'vs/platform/download/common/download';
 import { IWorkspacesService, hasWorkspaceFileExtension } from 'vs/platform/workspaces/common/workspaces';
 import { IRecent } from 'vs/platform/history/common/history';
 import { Schemas } from 'vs/base/common/network';
@@ -206,9 +205,4 @@ CommandsRegistry.registerCommand({
 			}
 		}]
 	}
-});
-
-CommandsRegistry.registerCommand('_workbench.downloadResource', function (accessor: ServicesAccessor, resource: URI) {
-	const downloadService = accessor.get(IDownloadService);
-	return downloadService.download(resource).then(location => URI.file(location));
-});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index cde31c599a3..bda74a3b53b 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -21,7 +21,7 @@ import { EndOfLineSequence, ISingleEditOperation } from 'vs/editor/common/model'
 import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 import * as modes from 'vs/editor/common/modes';
 import { CharacterPair, CommentRule, EnterAction } from 'vs/editor/common/modes/languageConfiguration';
-import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
+import { ICommandHandlerDescription, ICommandEvent } from 'vs/platform/commands/common/commands';
 import { ConfigurationTarget, IConfigurationData, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
 import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
@@ -31,7 +31,7 @@ import { LogLevel } from 'vs/platform/log/common/log';
 import { IMarkerData } from 'vs/platform/markers/common/markers';
 import { IProgressOptions, IProgressStep } from 'vs/platform/progress/common/progress';
 import * as quickInput from 'vs/platform/quickinput/common/quickInput';
-import { RemoteAuthorityResolverErrorCode, ResolvedAuthority } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { RemoteAuthorityResolverErrorCode, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import * as statusbar from 'vs/platform/statusbar/common/statusbar';
 import { ClassifiedEvent, GDPRClassification, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
 import { ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
@@ -115,6 +115,8 @@ export interface MainThreadClipboardShape extends IDisposable {
 
 export interface MainThreadCommandsShape extends IDisposable {
 	$registerCommand(id: string): void;
+	$registerCommandListener(): void;
+	$unregisterCommandListener(): void;
 	$unregisterCommand(id: string): void;
 	$executeCommand<T>(id: string, args: any[]): Promise<T | undefined>;
 	$getCommands(): Promise<string[]>;
@@ -246,6 +248,10 @@ export interface MainThreadTreeViewsShape extends IDisposable {
 	$setMessage(treeViewId: string, message: string | IMarkdownString): void;
 }
 
+export interface MainThreadDownloadServiceShape extends IDisposable {
+	$download(uri: UriComponents, to: UriComponents): Promise<void>;
+}
+
 export interface MainThreadErrorsShape extends IDisposable {
 	$onUnexpectedError(err: any | SerializedError): void;
 }
@@ -576,7 +582,7 @@ export interface ITextSearchComplete {
 }
 
 export interface MainThreadWorkspaceShape extends IDisposable {
-	$startFileSearch(includePattern: string | undefined, includeFolder: UriComponents | undefined, excludePatternOrDisregardExcludes: string | false | undefined, maxResults: number | undefined, token: CancellationToken): Promise<UriComponents[] | undefined>;
+	$startFileSearch(includePattern: string | null, includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false | null, maxResults: number | null, token: CancellationToken): Promise<UriComponents[] | null>;
 	$startTextSearch(query: search.IPatternInfo, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete>;
 	$checkExists(folders: UriComponents[], includes: string[], token: CancellationToken): Promise<boolean>;
 	$saveAll(includeUntitled?: boolean): Promise<boolean>;
@@ -733,6 +739,7 @@ export interface MainThreadWindowShape extends IDisposable {
 export interface ExtHostCommandsShape {
 	$executeContributedCommand<T>(id: string, ...args: any[]): Promise<T>;
 	$getContributedCommandHandlerDescriptions(): Promise<{ [id: string]: string | ICommandHandlerDescription }>;
+	$handleDidExecuteCommand(command: ICommandEvent): void;
 }
 
 export interface ExtHostConfigurationShape {
@@ -812,6 +819,9 @@ export interface ExtHostTreeViewsShape {
 	$setVisible(treeViewId: string, visible: boolean): void;
 }
 
+export interface ExtHostDownloadServiceShape {
+}
+
 export interface ExtHostWorkspaceShape {
 	$initializeWorkspace(workspace: IWorkspaceData | null): void;
 	$acceptWorkspaceData(workspace: IWorkspaceData | null): void;
@@ -856,7 +866,7 @@ export interface IResolveAuthorityErrorResult {
 
 export interface IResolveAuthorityOKResult {
 	type: 'ok';
-	value: ResolvedAuthority;
+	value: ResolverResult;
 }
 
 export type IResolveAuthorityResult = IResolveAuthorityErrorResult | IResolveAuthorityOKResult;
@@ -1310,6 +1320,7 @@ export const MainContext = {
 	MainThreadEditorInsets: createMainId<MainThreadEditorInsetsShape>('MainThreadEditorInsets'),
 	MainThreadErrors: createMainId<MainThreadErrorsShape>('MainThreadErrors'),
 	MainThreadTreeViews: createMainId<MainThreadTreeViewsShape>('MainThreadTreeViews'),
+	MainThreadDownloadService: createMainId<MainThreadDownloadServiceShape>('MainThreadDownloadService'),
 	MainThreadKeytar: createMainId<MainThreadKeytarShape>('MainThreadKeytar'),
 	MainThreadLanguageFeatures: createMainId<MainThreadLanguageFeaturesShape>('MainThreadLanguageFeatures'),
 	MainThreadLanguages: createMainId<MainThreadLanguagesShape>('MainThreadLanguages'),
@@ -1345,6 +1356,7 @@ export const ExtHostContext = {
 	ExtHostDocumentSaveParticipant: createExtId<ExtHostDocumentSaveParticipantShape>('ExtHostDocumentSaveParticipant'),
 	ExtHostEditors: createExtId<ExtHostEditorsShape>('ExtHostEditors'),
 	ExtHostTreeViews: createExtId<ExtHostTreeViewsShape>('ExtHostTreeViews'),
+	ExtHostDownloadService: createExtId<ExtHostDownloadServiceShape>('ExtHostDownloadService'),
 	ExtHostFileSystem: createExtId<ExtHostFileSystemShape>('ExtHostFileSystem'),
 	ExtHostFileSystemEventService: createExtId<ExtHostFileSystemEventServiceShape>('ExtHostFileSystemEventService'),
 	ExtHostLanguageFeatures: createExtId<ExtHostLanguageFeaturesShape>('ExtHostLanguageFeatures'),
diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts
index 3d0840068b0..f2456398c95 100644
--- a/src/vs/workbench/api/common/extHostCommands.ts
+++ b/src/vs/workbench/api/common/extHostCommands.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { validateConstraint } from 'vs/base/common/types';
-import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
+import { ICommandHandlerDescription, ICommandEvent } from 'vs/platform/commands/common/commands';
 import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
 import * as extHostTypeConverter from 'vs/workbench/api/common/extHostTypeConverters';
 import { cloneAndChange } from 'vs/base/common/objects';
@@ -17,6 +17,7 @@ import { revive } from 'vs/base/common/marshalling';
 import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import { URI } from 'vs/base/common/uri';
+import { Event, Emitter } from 'vs/base/common/event';
 import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 
 interface CommandHandler {
@@ -31,6 +32,9 @@ export interface ArgumentProcessor {
 
 export class ExtHostCommands implements ExtHostCommandsShape {
 
+	private readonly _onDidExecuteCommand: Emitter<vscode.CommandExecutionEvent>;
+	readonly onDidExecuteCommand: Event<vscode.CommandExecutionEvent>;
+
 	private readonly _commands = new Map<string, CommandHandler>();
 	private readonly _proxy: MainThreadCommandsShape;
 	private readonly _converter: CommandsConverter;
@@ -42,6 +46,11 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		logService: ILogService
 	) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadCommands);
+		this._onDidExecuteCommand = new Emitter<vscode.CommandExecutionEvent>({
+			onFirstListenerDidAdd: () => this._proxy.$registerCommandListener(),
+			onLastListenerRemove: () => this._proxy.$unregisterCommandListener(),
+		});
+		this.onDidExecuteCommand = this._onDidExecuteCommand.event;
 		this._logService = logService;
 		this._converter = new CommandsConverter(this);
 		this._argumentProcessors = [
@@ -106,6 +115,13 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		});
 	}
 
+	$handleDidExecuteCommand(command: ICommandEvent): void {
+		this._onDidExecuteCommand.fire({
+			command: command.commandId,
+			arguments: command.args.map(arg => this._argumentProcessors.reduce((r, p) => p.processArgument(r), arg))
+		});
+	}
+
 	executeCommand<T>(id: string, ...args: any[]): Promise<T> {
 		this._logService.trace('ExtHostCommands#executeCommand', id);
 
@@ -154,6 +170,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 
 		try {
 			const result = callback.apply(thisArg, args);
+			this._onDidExecuteCommand.fire({ command: id, arguments: args });
 			return Promise.resolve(result);
 		} catch (err) {
 			this._logService.error(err, id);
diff --git a/src/vs/workbench/api/common/extHostSCM.ts b/src/vs/workbench/api/common/extHostSCM.ts
index 675201e622f..311981d6f4d 100644
--- a/src/vs/workbench/api/common/extHostSCM.ts
+++ b/src/vs/workbench/api/common/extHostSCM.ts
@@ -6,7 +6,7 @@
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { debounce } from 'vs/base/common/decorators';
-import { dispose, IDisposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { asPromise } from 'vs/base/common/async';
 import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
 import { MainContext, MainThreadSCMShape, SCMRawResource, SCMRawResourceSplice, SCMRawResourceSplices, IMainContext, ExtHostSCMShape, CommandDto } from './extHost.protocol';
@@ -263,7 +263,6 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG
 	}
 
 	readonly handle = ExtHostSourceControlResourceGroup._handlePool++;
-	private _disposables: IDisposable[] = [];
 
 	constructor(
 		private _proxy: MainThreadSCMShape,
@@ -353,7 +352,6 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG
 
 	dispose(): void {
 		this._proxy.$unregisterGroup(this._sourceControlHandle, this.handle);
-		this._disposables = dispose(this._disposables);
 		this._onDidDispose.fire();
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index f6d9c59a1b6..5c81776820b 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -24,6 +24,7 @@ import { ExtHostWorkspaceShape, IWorkspaceData, MainThreadMessageServiceShape, M
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { Barrier } from 'vs/base/common/async';
 import { Schemas } from 'vs/base/common/network';
+import { withUndefinedAsNull } from 'vs/base/common/types';
 
 export interface IExtHostWorkspaceProvider {
 	getWorkspaceFolder2(uri: vscode.Uri, resolveParent?: boolean): Promise<vscode.WorkspaceFolder | undefined>;
@@ -438,7 +439,13 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 			return Promise.resolve([]);
 		}
 
-		return this._proxy.$startFileSearch(includePattern, includeFolder, excludePatternOrDisregardExcludes, maxResults, token)
+		return this._proxy.$startFileSearch(
+			withUndefinedAsNull(includePattern),
+			withUndefinedAsNull(includeFolder),
+			withUndefinedAsNull(excludePatternOrDisregardExcludes),
+			withUndefinedAsNull(maxResults),
+			token
+		)
 			.then(data => Array.isArray(data) ? data.map(d => URI.revive(d)) : []);
 	}
 
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index e580c222d2c..590861767f8 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -49,6 +49,7 @@ import { ExtHostTask } from 'vs/workbench/api/node/extHostTask';
 import { ExtHostTerminalService } from 'vs/workbench/api/node/extHostTerminalService';
 import { ExtHostEditors } from 'vs/workbench/api/common/extHostTextEditors';
 import { ExtHostTreeViews } from 'vs/workbench/api/common/extHostTreeViews';
+import { ExtHostDownloadService } from 'vs/workbench/api/node/extHostDownloadService';
 import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
 import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
 import { ExtHostUrls } from 'vs/workbench/api/common/extHostUrls';
@@ -71,6 +72,7 @@ import { ExtHostLabelService } from 'vs/workbench/api/common/extHostLabelService
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { getSingletonServiceDescriptors } from 'vs/platform/instantiation/common/extensions';
+import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
 
 export interface IExtensionApiFactory {
 	(extension: IExtensionDescription, registry: ExtensionDescriptionRegistry, configProvider: ExtHostConfigProvider): typeof vscode;
@@ -114,6 +116,7 @@ export function createApiFactory(
 	const extHostEditors = rpcProtocol.set(ExtHostContext.ExtHostEditors, new ExtHostEditors(rpcProtocol, extHostDocumentsAndEditors));
 	const extHostCommands = rpcProtocol.set(ExtHostContext.ExtHostCommands, new ExtHostCommands(rpcProtocol, extHostLogService));
 	const extHostTreeViews = rpcProtocol.set(ExtHostContext.ExtHostTreeViews, new ExtHostTreeViews(rpcProtocol.getProxy(MainContext.MainThreadTreeViews), extHostCommands, extHostLogService));
+	rpcProtocol.set(ExtHostContext.ExtHostDownloadService, new ExtHostDownloadService(rpcProtocol.getProxy(MainContext.MainThreadDownloadService), extHostCommands));
 	rpcProtocol.set(ExtHostContext.ExtHostWorkspace, extHostWorkspace);
 	rpcProtocol.set(ExtHostContext.ExtHostConfiguration, extHostConfiguration);
 	const extHostEditorInsets = rpcProtocol.set(ExtHostContext.ExtHostEditorInsets, new ExtHostEditorInsets(rpcProtocol.getProxy(MainContext.MainThreadEditorInsets), extHostEditors, initData.environment));
@@ -242,7 +245,11 @@ export function createApiFactory(
 			},
 			getCommands(filterInternal: boolean = false): Thenable<string[]> {
 				return extHostCommands.getCommands(filterInternal);
-			}
+			},
+			onDidExecuteCommand: proposedApiFunction(extension, (listener, thisArgs?, disposables?) => {
+				checkProposedApiEnabled(extension);
+				return extHostCommands.onDidExecuteCommand(listener, thisArgs, disposables);
+			}),
 		};
 
 		// namespace: env
@@ -271,15 +278,7 @@ export function createApiFactory(
 				return extHostWindow.openUri(uri, { allowTunneling: !!initData.remote.isRemote });
 			},
 			get remoteName() {
-				if (!initData.remote.authority) {
-					return undefined;
-				}
-				const pos = initData.remote.authority.indexOf('+');
-				if (pos < 0) {
-					// funky? bad authority?
-					return initData.remote.authority;
-				}
-				return initData.remote.authority.substr(0, pos);
+				return getRemoteName(initData.remote.authority);
 			}
 		};
 		if (!initData.environment.extensionTestsLocationURI) {
diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts
index 7683b5e9478..e5b2a445ec3 100644
--- a/src/vs/workbench/api/node/extHostDebugService.ts
+++ b/src/vs/workbench/api/node/extHostDebugService.ts
@@ -34,6 +34,8 @@ import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
 import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { SignService } from 'vs/platform/sign/node/signService';
+import { ISignService } from 'vs/platform/sign/common/sign';
 
 export class ExtHostDebugService implements ExtHostDebugServiceShape {
 
@@ -81,6 +83,8 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 	private _integratedTerminalInstance?: vscode.Terminal;
 	private _terminalDisposedListener: IDisposable;
 
+	private _signService: ISignService;
+
 
 	constructor(mainContext: IMainContext,
 		private _workspaceService: IExtHostWorkspaceProvider,
@@ -421,16 +425,45 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 						this._debugAdaptersTrackers.set(debugAdapterHandle, tracker);
 					}
 
-					debugAdapter.onMessage(message => {
+					debugAdapter.onMessage(async message => {
 
-						if (tracker && tracker.onDidSendMessage) {
-							tracker.onDidSendMessage(message);
+						if (message.type === 'request' && (<DebugProtocol.Request>message).command === 'handshake') {
+
+							const request = <DebugProtocol.Request>message;
+
+							const response: DebugProtocol.Response = {
+								type: 'response',
+								seq: 0,
+								command: request.command,
+								request_seq: request.seq,
+								success: true
+							};
+
+							if (!this._signService) {
+								this._signService = new SignService();
+							}
+
+							try {
+								const signature = await this._signService.sign(request.arguments.value);
+								response.body = {
+									signature: signature
+								};
+								debugAdapter.sendResponse(response);
+							} catch (e) {
+								response.success = false;
+								response.message = e.message;
+								debugAdapter.sendResponse(response);
+							}
+						} else {
+							if (tracker && tracker.onDidSendMessage) {
+								tracker.onDidSendMessage(message);
+							}
+
+							// DA -> VS Code
+							message = convertToVSCPaths(message, true);
+
+							mythis._debugServiceProxy.$acceptDAMessage(debugAdapterHandle, message);
 						}
-
-						// DA -> VS Code
-						message = convertToVSCPaths(message, true);
-
-						mythis._debugServiceProxy.$acceptDAMessage(debugAdapterHandle, message);
 					});
 					debugAdapter.onError(err => {
 						if (tracker && tracker.onError) {
diff --git a/src/vs/workbench/api/node/extHostDownloadService.ts b/src/vs/workbench/api/node/extHostDownloadService.ts
new file mode 100644
index 00000000000..c86a8ecd8f9
--- /dev/null
+++ b/src/vs/workbench/api/node/extHostDownloadService.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { join } from 'vs/base/common/path';
+import { tmpdir } from 'os';
+import { generateUuid } from 'vs/base/common/uuid';
+import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { MainThreadDownloadServiceShape } from 'vs/workbench/api/common/extHost.protocol';
+import { URI } from 'vs/base/common/uri';
+
+export class ExtHostDownloadService extends Disposable {
+
+	constructor(
+		proxy: MainThreadDownloadServiceShape,
+		commands: ExtHostCommands
+	) {
+		super();
+		commands.registerCommand(false, '_workbench.downloadResource', async (resource: URI): Promise<any> => {
+			const location = URI.file(join(tmpdir(), generateUuid()));
+			await proxy.$download(resource, location);
+			return location;
+		});
+	}
+
+}
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index af2ba60a797..781cb8998ab 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -33,6 +33,7 @@ import { ExtensionMemento } from 'vs/workbench/api/common/extHostMemento';
 import { ExtensionStoragePaths } from 'vs/workbench/api/node/extHostStoragePaths';
 import { RemoteAuthorityResolverError, ExtensionExecutionContext } from 'vs/workbench/api/common/extHostTypes';
 import { IURITransformer } from 'vs/base/common/uriIpc';
+import { ResolvedAuthority, ResolvedOptions } from 'vs/platform/remote/common/remoteAuthorityResolver';
 
 interface ITestRunner {
 	/** Old test runner API, as exported from `vscode/lib/testrunner` */
@@ -662,12 +663,22 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 
 		try {
 			const result = await resolver.resolve(remoteAuthority, { resolveAttempt });
+
+			// Split merged API result into separate authority/options
+			const authority: ResolvedAuthority = {
+				authority: remoteAuthority,
+				host: result.host,
+				port: result.port
+			};
+			const options: ResolvedOptions = {
+				extensionHostEnv: result.extensionHostEnv
+			};
+
 			return {
 				type: 'ok',
 				value: {
-					authority: remoteAuthority,
-					host: result.host,
-					port: result.port,
+					authority,
+					options
 				}
 			};
 		} catch (err) {
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
index 4d97792f198..a1e82957b48 100644
--- a/src/vs/workbench/api/node/extHostTask.ts
+++ b/src/vs/workbench/api/node/extHostTask.ts
@@ -588,9 +588,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 
 			// Clone the custom execution to keep the original untouched. This is important for multiple runs of the same task.
 			this._activeCustomExecutions2.set(execution.id, execution2);
-			this._terminalService.performTerminalIdAction(terminalId, async terminal => {
-				this._terminalService.attachVirtualProcessToTerminal(terminalId, await execution2.callback());
-			});
+			this._terminalService.attachVirtualProcessToTerminal(terminalId, await execution2.callback());
 		}
 
 		// Once a terminal is spun up for the custom execution task this event will be fired.
diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
index 3b9eef355e1..8dea2f5f267 100644
--- a/src/vs/workbench/api/node/extHostTerminalService.ts
+++ b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -91,7 +91,7 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 		this._idPromise.then(c => {
 			this._proxy.$registerOnDataListener(this._id);
 		});
-		return this._onData && this._onData.event;
+		return this._onData.event;
 	}
 
 	constructor(
@@ -110,7 +110,7 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 		});
 	}
 
-	public create(
+	public async create(
 		shellPath?: string,
 		shellArgs?: string[] | string,
 		cwd?: string | URI,
@@ -118,18 +118,16 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 		waitOnExit?: boolean,
 		strictEnv?: boolean,
 		hideFromUser?: boolean
-	): void {
-		this._proxy.$createTerminal({ name: this._name, shellPath, shellArgs, cwd, env, waitOnExit, strictEnv, hideFromUser }).then(terminal => {
-			this._name = terminal.name;
-			this._runQueuedRequests(terminal.id);
-		});
+	): Promise<void> {
+		const terminal = await this._proxy.$createTerminal({ name: this._name, shellPath, shellArgs, cwd, env, waitOnExit, strictEnv, hideFromUser });
+		this._name = terminal.name;
+		this._runQueuedRequests(terminal.id);
 	}
 
-	public createVirtualProcess(): Promise<void> {
-		return this._proxy.$createTerminal({ name: this._name, isVirtualProcess: true }).then(terminal => {
-			this._name = terminal.name;
-			this._runQueuedRequests(terminal.id);
-		});
+	public async createVirtualProcess(): Promise<void> {
+		const terminal = await this._proxy.$createTerminal({ name: this._name, isVirtualProcess: true });
+		this._name = terminal.name;
+		this._runQueuedRequests(terminal.id);
 	}
 
 	public get name(): string {
@@ -622,8 +620,18 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 		this._setupExtHostProcessListeners(id, new TerminalProcess(shellLaunchConfig, initialCwd, cols, rows, env, enableConpty, this._logService));
 	}
 
-	public $startVirtualProcess(id: number, initialDimensions: ITerminalDimensionsDto | undefined): void {
-		(this._terminalProcesses[id] as ExtHostVirtualProcess).startSendingEvents(initialDimensions);
+	public async $startVirtualProcess(id: number, initialDimensions: ITerminalDimensionsDto | undefined): Promise<void> {
+		// Processes should be initialized here for normal virtual process terminals, however for
+		// tasks they are responsible for attaching the virtual process to a terminal so this
+		// function may be called before tasks is able to attach to the terminal.
+		let retries = 5;
+		while (retries-- > 0) {
+			if (this._terminalProcesses[id]) {
+				(this._terminalProcesses[id] as ExtHostVirtualProcess).startSendingEvents(initialDimensions);
+				return;
+			}
+			await timeout(50);
+		}
 	}
 
 	private _setupExtHostProcessListeners(id: number, p: ITerminalChildProcess): void {
diff --git a/src/vs/workbench/browser/contextkeys.ts b/src/vs/workbench/browser/contextkeys.ts
index 863626bdf48..b1de1c5bdc6 100644
--- a/src/vs/workbench/browser/contextkeys.ts
+++ b/src/vs/workbench/browser/contextkeys.ts
@@ -20,6 +20,7 @@ import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { isMacintosh, isLinux, isWindows, isWeb } from 'vs/base/common/platform';
 import { PanelPositionContext } from 'vs/workbench/common/panel';
+import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
 
 export const IsMacContext = new RawContextKey<boolean>('isMac', isMacintosh);
 export const IsLinuxContext = new RawContextKey<boolean>('isLinux', isLinux);
@@ -28,8 +29,9 @@ export const IsWindowsContext = new RawContextKey<boolean>('isWindows', isWindow
 export const IsWebContext = new RawContextKey<boolean>('isWeb', isWeb);
 export const IsMacNativeContext = new RawContextKey<boolean>('isMacNative', isMacintosh && !isWeb);
 
-export const RemoteAuthorityContext = new RawContextKey<string>('remoteAuthority', '');
+export const Deprecated_RemoteAuthorityContext = new RawContextKey<string>('remoteAuthority', '');
 
+export const RemoteNameContext = new RawContextKey<string>('remoteName', '');
 export const RemoteConnectionState = new RawContextKey<'' | 'initializing' | 'disconnected' | 'connected'>('remoteConnectionState', '');
 
 export const HasMacNativeTabsContext = new RawContextKey<boolean>('hasMacNativeTabs', false);
@@ -121,7 +123,7 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		IsWebContext.bindTo(this.contextKeyService);
 		IsMacNativeContext.bindTo(this.contextKeyService);
 
-		RemoteAuthorityContext.bindTo(this.contextKeyService).set(this.environmentService.configuration.remoteAuthority || '');
+		RemoteNameContext.bindTo(this.contextKeyService).set(getRemoteName(this.environmentService.configuration.remoteAuthority) || '');
 
 		// macOS Native Tabs
 		const windowConfig = this.configurationService.getValue<IWindowsConfiguration>();
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 1b23d3a42e3..c2e011c5370 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -27,14 +27,13 @@ import { IWindowService, MenuBarVisibility, getTitleBarStyle } from 'vs/platform
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { Sizing, Direction, Grid } from 'vs/base/browser/ui/grid/grid';
+import { Sizing, Direction, Grid, SerializableGrid, ISerializableView, ISerializedGrid } from 'vs/base/browser/ui/grid/grid';
 import { WorkbenchLegacyLayout } from 'vs/workbench/browser/legacyLayout';
 import { IDimension } from 'vs/platform/layout/browser/layoutService';
 import { Part } from 'vs/workbench/browser/part';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IView } from 'vs/base/browser/ui/grid/gridview';
 
 enum Settings {
 	MENUBAR_VISIBLE = 'window.menuBarVisibility',
@@ -57,6 +56,8 @@ enum Storage {
 
 	ZEN_MODE_ENABLED = 'workbench.zenmode.active',
 	CENTERED_LAYOUT_ENABLED = 'workbench.centerededitorlayout.active',
+
+	GRID_LAYOUT = 'workbench.grid.layout'
 }
 
 export abstract class Layout extends Disposable implements IWorkbenchLayoutService {
@@ -89,16 +90,16 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 	private parts: Map<string, Part> = new Map<string, Part>();
 
-	private workbenchGrid: Grid | WorkbenchLegacyLayout;
+	private workbenchGrid: SerializableGrid<ISerializableView> | WorkbenchLegacyLayout;
 
 	private disposed: boolean;
 
-	private titleBarPartView: IView;
-	private activityBarPartView: IView;
-	private sideBarPartView: IView;
-	private panelPartView: IView;
-	private editorPartView: IView;
-	private statusBarPartView: IView;
+	private titleBarPartView: ISerializableView;
+	private activityBarPartView: ISerializableView;
+	private sideBarPartView: ISerializableView;
+	private panelPartView: ISerializableView;
+	private editorPartView: ISerializableView;
+	private statusBarPartView: ISerializableView;
 
 	private environmentService: IWorkbenchEnvironmentService;
 	private configurationService: IConfigurationService;
@@ -144,8 +145,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			hidden: false,
 			sizeBeforeMaximize: 0,
 			position: Position.BOTTOM,
-			height: 350,
-			width: 350,
 			panelToRestore: undefined as string | undefined
 		},
 
@@ -706,7 +705,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		if (this.configurationService.getValue('workbench.useExperimentalGridLayout')) {
 
-			// Create view wrappers for all parts
+			// View references for all parts
 			this.titleBarPartView = titleBar;
 			this.sideBarPartView = sideBar;
 			this.activityBarPartView = activityBar;
@@ -714,9 +713,63 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this.panelPartView = panelPart;
 			this.statusBarPartView = statusBar;
 
-			this.workbenchGrid = new Grid(this.editorPartView, { proportionalLayout: false });
+			let workbenchGrid: SerializableGrid<ISerializableView> | undefined;
 
-			this.container.prepend(this.workbenchGrid.element);
+			const savedGrid = this.storageService.get(Storage.GRID_LAYOUT, StorageScope.GLOBAL, undefined);
+			if (savedGrid) {
+				const parsedGrid: ISerializedGrid = JSON.parse(savedGrid);
+
+				const fromJSON = (serializedPart: { type: Parts } | null) => {
+					if (serializedPart && serializedPart.type) {
+						switch (serializedPart.type) {
+							case Parts.ACTIVITYBAR_PART:
+								return this.activityBarPartView;
+							case Parts.TITLEBAR_PART:
+								return this.titleBarPartView;
+							case Parts.EDITOR_PART:
+								return this.editorPartView;
+							case Parts.PANEL_PART:
+								return this.panelPartView;
+							case Parts.SIDEBAR_PART:
+								return this.sideBarPartView;
+							case Parts.STATUSBAR_PART:
+								return this.statusBarPartView;
+							default:
+								return this.editorPartView;
+						}
+					} else {
+						return this.editorPartView;
+					}
+				};
+
+				try {
+					workbenchGrid = SerializableGrid.deserialize(parsedGrid, { fromJSON }, { proportionalLayout: false });
+
+					// Set some layout state
+					this.state.sideBar.position = Position.LEFT;
+					for (let view of workbenchGrid.getNeighborViews(this.sideBarPartView, Direction.Right)) {
+						if (view === this.activityBarPartView) {
+							this.state.sideBar.position = Position.RIGHT;
+						}
+					}
+
+					this.state.panel.position = Position.BOTTOM;
+					for (let view of workbenchGrid.getNeighborViews(this.panelPartView, Direction.Left)) {
+						if (view === this.editorPartView) {
+							this.state.panel.position = Position.RIGHT;
+						}
+					}
+				} catch (err) {
+					console.error(err);
+				}
+			}
+
+			if (!workbenchGrid) {
+				workbenchGrid = new SerializableGrid(this.editorPartView, { proportionalLayout: false });
+			}
+
+			this.container.prepend(workbenchGrid.element);
+			this.workbenchGrid = workbenchGrid;
 
 			this._register((this.sideBarPartView as SidebarPart).onDidVisibilityChange((visible) => {
 				this.setSideBarHidden(!visible, true);
@@ -725,6 +778,17 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this._register((this.panelPartView as PanelPart).onDidVisibilityChange((visible) => {
 				this.setPanelHidden(!visible, true);
 			}));
+
+			this._register(this.lifecycleService.onBeforeShutdown(beforeShutdownEvent => {
+				beforeShutdownEvent.veto(new Promise((resolve) => {
+					const grid = this.workbenchGrid as SerializableGrid<ISerializableView>;
+					const serializedGrid = grid.serialize();
+
+					this.storageService.store(Storage.GRID_LAYOUT, JSON.stringify(serializedGrid), StorageScope.GLOBAL);
+
+					resolve();
+				}));
+			}));
 		} else {
 			this.workbenchGrid = instantiationService.createInstance(
 				WorkbenchLegacyLayout,
@@ -797,7 +861,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		}
 
 		if (!panelInGrid) {
-			this.workbenchGrid.addView(this.panelPartView, this.getPanelDimension(this.state.panel.position) !== undefined ? this.getPanelDimension(this.state.panel.position) : Sizing.Split, this.editorPartView, this.state.panel.position === Position.BOTTOM ? Direction.Down : Direction.Right);
+			this.workbenchGrid.addView(this.panelPartView, Sizing.Split, this.editorPartView, this.state.panel.position === Position.BOTTOM ? Direction.Down : Direction.Right);
 			panelInGrid = true;
 		}
 
@@ -852,10 +916,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		}
 	}
 
-	private getPanelDimension(position: Position): number {
-		return position === Position.BOTTOM ? this.state.panel.height : this.state.panel.width;
-	}
-
 	isEditorLayoutCentered(): boolean {
 		return this.state.editor.centered;
 	}
@@ -1148,12 +1208,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 	setPanelPosition(position: Position): void {
 		const panelPart = this.getPart(Parts.PANEL_PART);
-		const wasHidden = this.state.panel.hidden;
 
 		if (this.state.panel.hidden) {
 			this.setPanelHidden(false, true /* Skip Layout */);
-		} else {
-			this.savePanelDimension();
 		}
 
 		const newPositionValue = (position === Position.BOTTOM) ? 'bottom' : 'right';
@@ -1179,10 +1236,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		// Layout
 		if (this.workbenchGrid instanceof Grid) {
-			if (!wasHidden) {
-				this.savePanelDimension();
-			}
-
 			this.workbenchGrid.removeView(this.panelPartView);
 			this.layout();
 		} else {
@@ -1192,18 +1245,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		this._onPanelPositionChange.fire(positionToString(this.state.panel.position));
 	}
 
-	private savePanelDimension(): void {
-		if (!(this.workbenchGrid instanceof Grid)) {
-			return;
-		}
-
-		if (this.state.panel.position === Position.BOTTOM) {
-			this.state.panel.height = this.workbenchGrid.getViewSize(this.panelPartView).height;
-		} else {
-			this.state.panel.width = this.workbenchGrid.getViewSize(this.panelPartView).width;
-		}
-	}
-
 	dispose(): void {
 		super.dispose();
 
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
index 873dc45aadf..a95543fc0f4 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
@@ -165,7 +165,7 @@ export class GlobalActivityActionViewItem extends ActivityActionViewItem {
 export class PlaceHolderViewletActivityAction extends ViewletActivityAction {
 
 	constructor(
-		id: string, iconUrl: URI,
+		id: string, name: string, iconUrl: URI,
 		@IViewletService viewletService: IViewletService,
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@ITelemetryService telemetryService: ITelemetryService
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 430a560f520..c8ce2bc031f 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -34,9 +34,11 @@ import { isUndefinedOrNull } from 'vs/base/common/types';
 import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { Schemas } from 'vs/base/common/network';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 interface ICachedViewlet {
 	id: string;
+	name?: string;
 	iconUrl?: UriComponents;
 	pinned: boolean;
 	order?: number;
@@ -78,18 +80,23 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		@IStorageService private readonly storageService: IStorageService,
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IViewsService private readonly viewsService: IViewsService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IWorkbenchEnvironmentService workbenchEnvironmentService: IWorkbenchEnvironmentService,
 	) {
 		super(Parts.ACTIVITYBAR_PART, { hasTitle: false }, themeService, storageService, layoutService);
 
 		this.cachedViewlets = this.getCachedViewlets();
 		for (const cachedViewlet of this.cachedViewlets) {
-			if (this.shouldBeHidden(cachedViewlet.id, cachedViewlet)) {
+			if (workbenchEnvironmentService.configuration.remoteAuthority // In remote window, hide activity bar entries until registered.
+				|| this.shouldBeHidden(cachedViewlet.id, cachedViewlet)
+			) {
 				cachedViewlet.visible = false;
 			}
 		}
 
-		this.compositeBar = this._register(this.instantiationService.createInstance(CompositeBar, this.cachedViewlets.map(v => ({ id: v.id, name: undefined, visible: v.visible, order: v.order, pinned: v.pinned })), {
+		const cachedItems = this.cachedViewlets
+			.map(v => ({ id: v.id, name: v.name, visible: v.visible, order: v.order, pinned: v.pinned }));
+		this.compositeBar = this._register(this.instantiationService.createInstance(CompositeBar, cachedItems, {
 			icon: true,
 			orientation: ActionsOrientation.VERTICAL,
 			openComposite: (compositeId: string) => this.viewletService.openViewlet(compositeId, true),
@@ -252,7 +259,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 			} else {
 				const cachedComposite = this.cachedViewlets.filter(c => c.id === compositeId)[0];
 				compositeActions = {
-					activityAction: this.instantiationService.createInstance(PlaceHolderViewletActivityAction, compositeId, cachedComposite && cachedComposite.iconUrl ? URI.revive(cachedComposite.iconUrl) : undefined),
+					activityAction: this.instantiationService.createInstance(PlaceHolderViewletActivityAction, compositeId, cachedComposite && cachedComposite.name ? cachedComposite.name : compositeId, cachedComposite && cachedComposite.iconUrl ? URI.revive(cachedComposite.iconUrl) : undefined),
 					pinnedAction: new PlaceHolderToggleCompositePinnedAction(compositeId, this.compositeBar)
 				};
 			}
@@ -312,7 +319,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		}
 	}
 
-	private shouldBeHidden(viewletId: string, cachedViewlet: ICachedViewlet): boolean {
+	private shouldBeHidden(viewletId: string, cachedViewlet?: ICachedViewlet): boolean {
 		const viewContainer = this.getViewContainer(viewletId);
 		if (!viewContainer || !viewContainer.hideIfEmpty) {
 			return false;
@@ -428,7 +435,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 						}
 					}
 				}
-				state.push({ id: compositeItem.id, iconUrl: viewlet.iconUrl && viewlet.iconUrl.scheme === Schemas.file ? viewlet.iconUrl : undefined, views, pinned: compositeItem.pinned, order: compositeItem.order, visible: compositeItem.visible });
+				state.push({ id: compositeItem.id, name: viewlet.name, iconUrl: viewlet.iconUrl && viewlet.iconUrl.scheme === Schemas.file ? viewlet.iconUrl : undefined, views, pinned: compositeItem.pinned, order: compositeItem.order, visible: compositeItem.visible });
 			} else {
 				state.push({ id: compositeItem.id, pinned: compositeItem.pinned, order: compositeItem.order, visible: false });
 			}
@@ -440,7 +447,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 	private getCachedViewlets(): ICachedViewlet[] {
 		const storedStates: Array<string | ICachedViewlet> = JSON.parse(this.cachedViewletsValue);
 		const cachedViewlets = storedStates.map(c => {
-			const serialized: ICachedViewlet = typeof c === 'string' /* migration from pinned states to composites states */ ? { id: c, pinned: true, order: undefined, visible: true, iconUrl: undefined, views: undefined } : c;
+			const serialized: ICachedViewlet = typeof c === 'string' /* migration from pinned states to composites states */ ? { id: c, pinned: true, order: undefined, visible: true, name: undefined, iconUrl: undefined, views: undefined } : c;
 			serialized.visible = isUndefinedOrNull(serialized.visible) ? true : serialized.visible;
 			return serialized;
 		});
@@ -448,6 +455,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		for (const old of this.loadOldCachedViewlets()) {
 			const cachedViewlet = cachedViewlets.filter(cached => cached.id === old.id)[0];
 			if (cachedViewlet) {
+				cachedViewlet.name = old.name;
 				cachedViewlet.iconUrl = old.iconUrl;
 				cachedViewlet.views = old.views;
 			}
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
index 365faea190f..42ca9e2d502 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
@@ -25,10 +25,9 @@ import { ResourceLabels, IResourceLabel, DEFAULT_LABELS_CONTAINER } from 'vs/wor
 import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
 import { BreadcrumbElement, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
 import { IFileIconTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeFilter, TreeVisibility, ITreeSorter, IDataSource } from 'vs/base/browser/ui/tree/tree';
-import { OutlineVirtualDelegate, OutlineGroupRenderer, OutlineElementRenderer, OutlineItemComparator, OutlineIdentityProvider, OutlineNavigationLabelProvider, OutlineDataSource, OutlineSortOrder, OutlineItem } from 'vs/editor/contrib/documentSymbols/outlineTree';
+import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeFilter, TreeVisibility, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
+import { OutlineVirtualDelegate, OutlineGroupRenderer, OutlineElementRenderer, OutlineItemComparator, OutlineIdentityProvider, OutlineNavigationLabelProvider, OutlineDataSource, OutlineSortOrder } from 'vs/editor/contrib/documentSymbols/outlineTree';
 import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
-import { IDataTreeOptions } from 'vs/base/browser/ui/tree/dataTree';
 
 export function createBreadcrumbsPicker(instantiationService: IInstantiationService, parent: HTMLElement, element: BreadcrumbElement): BreadcrumbsPicker {
 	const ctor: IConstructorSignature1<HTMLElement, BreadcrumbsPicker> = element instanceof FileElement
@@ -381,7 +380,7 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker {
 			filter: this._instantiationService.createInstance(FileFilter),
 			identityProvider: new FileIdentityProvider(),
 			keyboardNavigationLabelProvider: new FileNavigationLabelProvider()
-		}) as WorkbenchAsyncDataTree<BreadcrumbElement | IFileStat, any, FuzzyScore>;
+		});
 	}
 
 	_setInput(element: BreadcrumbElement): Promise<void> {
@@ -439,14 +438,7 @@ export class BreadcrumbsOutlinePicker extends BreadcrumbsPicker {
 	}
 
 	protected _createTree(container: HTMLElement) {
-		return this._instantiationService.createInstance<
-			HTMLElement,
-			IListVirtualDelegate<OutlineItem>,
-			ITreeRenderer<any, FuzzyScore, any>[],
-			IDataSource<OutlineModel, OutlineItem>,
-			IDataTreeOptions<OutlineItem, FuzzyScore>,
-			WorkbenchDataTree<OutlineModel, OutlineItem, FuzzyScore>
-		>(
+		return this._instantiationService.createInstance(
 			WorkbenchDataTree,
 			container,
 			new OutlineVirtualDelegate(),
@@ -459,7 +451,7 @@ export class BreadcrumbsOutlinePicker extends BreadcrumbsPicker {
 				identityProvider: new OutlineIdentityProvider(),
 				keyboardNavigationLabelProvider: new OutlineNavigationLabelProvider()
 			}
-		) as WorkbenchDataTree<OutlineModel, OutlineItem, FuzzyScore>;
+		);
 	}
 
 	dispose(): void {
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsList.ts b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
index ad21cda900c..03fd18b705d 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsList.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
@@ -70,7 +70,7 @@ export class NotificationsList extends Themable {
 		const renderer = this.instantiationService.createInstance(NotificationRenderer, actionRunner);
 
 		// List
-		this.list = this._register(<WorkbenchList<INotificationViewItem>>this.instantiationService.createInstance(
+		this.list = this._register(this.instantiationService.createInstance(
 			WorkbenchList,
 			this.listContainer,
 			new NotificationsListDelegate(this.listContainer),
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputList.ts
index a1b09a2ea46..97bc546f7e8 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInputList.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputList.ts
@@ -252,7 +252,7 @@ export class QuickInputList {
 			setRowLineHeight: false,
 			multipleSelectionSupport: false,
 			horizontalScrolling: false
-		} as IListOptions<ListElement>) as WorkbenchList<ListElement>;
+		} as IListOptions<ListElement>);
 		this.list.getHTMLElement().id = id;
 		this.disposables.push(this.list);
 		this.disposables.push(this.list.onKeyDown(e => {
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
index 99a141b9b3a..ab1ad41a50b 100644
--- a/src/vs/workbench/browser/parts/views/customView.ts
+++ b/src/vs/workbench/browser/parts/views/customView.ts
@@ -385,13 +385,17 @@ export class CustomTreeView extends Disposable implements ITreeView {
 				collapseByDefault: (e: ITreeItem): boolean => {
 					return e.collapsibleState !== TreeItemCollapsibleState.Expanded;
 				}
-			}) as WorkbenchAsyncDataTree<ITreeItem, ITreeItem, FuzzyScore>);
+			}));
 		aligner.tree = this.tree;
 
 		this.tree.contextKeyService.createKey<boolean>(this.id, true);
 		this._register(this.tree.onContextMenu(e => this.onContextMenu(treeMenus, e)));
 		this._register(this.tree.onDidChangeSelection(e => this._onDidChangeSelection.fire(e.elements)));
 		this._register(this.tree.onDidChangeCollapseState(e => {
+			if (!e.node.element) {
+				return;
+			}
+
 			const element: ITreeItem = Array.isArray(e.node.element.element) ? e.node.element.element[0] : e.node.element.element;
 			if (e.node.collapsed) {
 				this._onDidCollapseItem.fire(element);
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index f7f28e50a1d..fadc5132cd2 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -135,7 +135,7 @@ class CodeRendererMain extends Disposable {
 		serviceCollection.set(ISignService, signService);
 
 		// Remote Agent
-		const remoteAgentService = this._register(new RemoteAgentService(environmentService, productService, remoteAuthorityResolverService, signService));
+		const remoteAgentService = this._register(new RemoteAgentService(this.configuration.webSocketFactory, environmentService, productService, remoteAuthorityResolverService, signService));
 		serviceCollection.set(IRemoteAgentService, remoteAgentService);
 
 		// Files
diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts
index cf48dcdeba7..d450e7da4f3 100644
--- a/src/vs/workbench/browser/web.simpleservices.ts
+++ b/src/vs/workbench/browser/web.simpleservices.ts
@@ -8,9 +8,6 @@ import * as browser from 'vs/base/browser/browser';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { Event } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-// tslint:disable-next-line: import-patterns no-standalone-editor
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { CancellationToken } from 'vs/base/common/cancellation';
 import { IGalleryExtension, IExtensionIdentifier, IReportedExtension, IExtensionManagementService, ILocalExtension, IGalleryMetadata } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionTipsService, ExtensionRecommendationReason, IExtensionRecommendation } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { ExtensionType, ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
@@ -33,7 +30,7 @@ import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/co
 import { pathsToEditors } from 'vs/workbench/common/editor';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ParsedArgs } from 'vs/platform/environment/common/environment';
+import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 import { toStoreData, restoreRecentlyOpened } from 'vs/platform/history/common/historyStorage';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
@@ -41,22 +38,6 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
 import { IExperimentService, IExperiment, ExperimentActionType, ExperimentState } from 'vs/workbench/contrib/experiments/common/experimentService';
 import { ExtensionHostDebugChannelClient, ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
 
-//#region Download
-
-export class SimpleDownloadService implements IDownloadService {
-
-	_serviceBrand: any;
-
-	download(uri: URI, to?: string, cancellationToken?: CancellationToken): Promise<string> {
-		// @ts-ignore
-		return Promise.resolve(undefined);
-	}
-}
-
-registerSingleton(IDownloadService, SimpleDownloadService, true);
-
-//#endregion
-
 //#region Extension Tips
 
 export class SimpleExtensionTipsService implements IExtensionTipsService {
@@ -583,7 +564,9 @@ registerSingleton(IWindowService, SimpleWindowService);
 export class SimpleExtensionHostDebugService extends ExtensionHostDebugChannelClient {
 
 	constructor(
-		@IRemoteAgentService remoteAgentService: IRemoteAgentService
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
+		//@IWindowService windowService: IWindowService,
+		@IEnvironmentService environmentService: IEnvironmentService
 	) {
 		const connection = remoteAgentService.getConnection();
 
@@ -592,6 +575,19 @@ export class SimpleExtensionHostDebugService extends ExtensionHostDebugChannelCl
 		}
 
 		super(connection.getChannel(ExtensionHostDebugBroadcastChannel.ChannelName));
+
+		this._register(this.onReload(event => {
+			if (environmentService.isExtensionDevelopment && environmentService.debugExtensionHost.debugId === event.sessionId) {
+				//windowService.reloadWindow();
+				window.location.reload();
+			}
+		}));
+		this._register(this.onClose(event => {
+			if (environmentService.isExtensionDevelopment && environmentService.debugExtensionHost.debugId === event.sessionId) {
+				//this._windowService.closeWindow();
+				window.close();
+			}
+		}));
 	}
 }
 registerSingleton(IExtensionHostDebugService, SimpleExtensionHostDebugService);
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index 741f4e77dc9..54496ea933a 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -237,7 +237,7 @@ import { isMacintosh, isWindows, isLinux, isWeb } from 'vs/base/common/platform'
 			'workbench.useExperimentalGridLayout': {
 				'type': 'boolean',
 				'description': nls.localize('workbench.useExperimentalGridLayout', "Enables the grid layout for the workbench. This setting may enable additional layout options for workbench components."),
-				'default': false,
+				'default': true,
 				'scope': ConfigurationScope.APPLICATION
 			}
 		}
diff --git a/src/vs/workbench/contrib/codeEditor/browser/WordWrap_16x.svg b/src/vs/workbench/contrib/codeEditor/browser/WordWrap_16x.svg
deleted file mode 100644
index 21058f74e72..00000000000
--- a/src/vs/workbench/contrib/codeEditor/browser/WordWrap_16x.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M16 3H9v.445c-.034-.07-.062-.145-.1-.21a2.318 2.318 0 0 0-.759-.793C7.81 2.229 7 2.117 7 2.109V0H4v2.438c-.078-.042-.15-.092-.233-.125a2.685 2.685 0 0 0-1.013-.188c-.184 0-.392.016-.619.055a5.422 5.422 0 0 0-.506.115c-.149.045-.337.096-.493.162-.173.077-.39.151-.533.25L0 3.006v3.17c0 .297.045.56.136.821.1.291.255.525.454.736.207.224.462.351.75.467.065.027.137.026.205.039a2.827 2.827 0 0 0-.651.532 3.064 3.064 0 0 0-.6 1.061 3.81 3.81 0 0 0-.188 1.21c0 .402.062.784.185 1.137.132.377.323.709.562.978a2.748 2.748 0 0 0 2.131.942c.333 0 .595-.042.876-.13a2.61 2.61 0 0 0 .678-.333L5 13.225v-1.811L8.586 15h4.828l-2-2H16V3zM5 10.586V8.523l-.556-.404c-.081-.043-.152-.083-.228-.119h1.96c.196 0 .409.266.634.266.187 0 .366-.007.538-.029L5 10.586z"/></g><g id="icon_x5F_bg"><path class="st2" d="M10 4v2h3v4H9l2-2H9l-3 3 3 3h2l-2-2h6V4zM3.869 3.568a1.21 1.21 0 0 0-.473-.329c-.274-.111-.623-.15-1.055-.076a3.5 3.5 0 0 0-.711.208 1.501 1.501 0 0 0-.234.125l-.043.03v1.056l.168-.139c.149-.124.326-.225.527-.303.196-.074.399-.113.604-.113.188 0 .33.051.431.157.087.095.137.248.147.456l-.962.144c-.219.03-.41.086-.57.166a1.245 1.245 0 0 0-.398.311 1.234 1.234 0 0 0-.229.426 1.714 1.714 0 0 0 .011 1.008 1.096 1.096 0 0 0 .638.67c.155.063.328.093.528.093a1.25 1.25 0 0 0 .978-.441v.345h1.007V4.769c0-.255-.03-.484-.089-.681a1.423 1.423 0 0 0-.275-.52zm-.636 1.896V5.7c0 .119-.018.231-.055.341a.745.745 0 0 1-.377.447.694.694 0 0 1-.512.027.454.454 0 0 1-.156-.094.389.389 0 0 1-.094-.139.474.474 0 0 1-.035-.186c0-.077.009-.147.024-.212a.33.33 0 0 1 .078-.141.436.436 0 0 1 .161-.109 1.3 1.3 0 0 1 .305-.073l.661-.097zM8.284 4.397a2.253 2.253 0 0 0-.244-.656 1.354 1.354 0 0 0-.436-.459 1.165 1.165 0 0 0-.642-.173 1.136 1.136 0 0 0-.69.223 1.312 1.312 0 0 0-.264.266V1.119H5.09v6.224h.918v-.281a1.023 1.023 0 0 0 .472.328c.098.032.208.047.33.047.255 0 .483-.06.677-.177.192-.115.355-.278.486-.486a2.29 2.29 0 0 0 .293-.718 3.87 3.87 0 0 0 .096-.886 3.76 3.76 0 0 0-.078-.773zm-.861.758c0 .232-.02.439-.059.613-.036.172-.09.315-.159.424a.639.639 0 0 1-.233.237.582.582 0 0 1-.565.014.683.683 0 0 1-.211-.183.925.925 0 0 1-.141-.283 1.187 1.187 0 0 1-.054-.358v-.517c0-.164.02-.314.059-.447.037-.132.088-.242.157-.336a.668.668 0 0 1 .228-.208.584.584 0 0 1 .289-.071.554.554 0 0 1 .497.279c.063.099.108.214.143.354.031.143.049.306.049.482zM2.409 10.019a.913.913 0 0 1 .316-.239c.218-.1.547-.105.766-.018.104.042.204.1.32.184l.329.26V9.064l-.096-.062a1.932 1.932 0 0 0-.905-.215c-.308 0-.593.057-.846.168-.25.11-.467.27-.647.475a2.072 2.072 0 0 0-.403.717c-.09.272-.137.57-.137.895 0 .289.043.561.129.808.087.249.212.471.374.652.161.185.361.333.597.441.232.104.493.155.778.155.233 0 .434-.028.613-.084a1.85 1.85 0 0 0 .466-.217l.078-.061v-.889l-.2.095a.402.402 0 0 1-.076.026c-.05.017-.099.035-.128.049-.036.023-.227.09-.227.09-.06.024-.14.043-.218.059a.977.977 0 0 1-.599-.057.827.827 0 0 1-.306-.225 1.088 1.088 0 0 1-.205-.376 1.728 1.728 0 0 1-.076-.529c0-.21.028-.399.083-.56.054-.158.129-.294.22-.4z"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
index d2a7bd7f4c0..eb15bf10a1f 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
@@ -18,6 +18,7 @@ import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { DefaultSettingsEditorContribution } from 'vs/workbench/contrib/preferences/browser/preferencesEditor';
 
 const transientWordWrapState = 'transientWordWrapState';
 const isWordWrapMinifiedKey = 'isWordWrapMinified';
@@ -131,6 +132,10 @@ class ToggleWordWrapAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		if (editor.getContribution(DefaultSettingsEditorContribution.ID)) {
+			// in the settings editor...
+			return;
+		}
 		if (!editor.hasModel()) {
 			return;
 		}
@@ -201,6 +206,10 @@ class ToggleWordWrapController extends Disposable implements IEditorContribution
 		}));
 
 		const ensureWordWrapSettings = () => {
+			if (this.editor.getContribution(DefaultSettingsEditorContribution.ID)) {
+				// in the settings editor...
+				return;
+			}
 			// Ensure correct word wrap settings
 			const newModel = this.editor.getModel();
 			if (!newModel) {
@@ -267,7 +276,7 @@ function canToggleWordWrap(uri: URI): boolean {
 	if (!uri) {
 		return false;
 	}
-	return (uri.scheme !== 'output' && uri.scheme !== 'vscode');
+	return (uri.scheme !== 'output');
 }
 
 
@@ -279,7 +288,10 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	command: {
 		id: TOGGLE_WORD_WRAP_ID,
 		title: nls.localize('unwrapMinified', "Disable wrapping for this file"),
-		iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/WordWrap_16x.svg')) }
+		iconLocation: {
+			dark: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg')),
+			light: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg'))
+		}
 	},
 	group: 'navigation',
 	order: 1,
@@ -293,7 +305,10 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	command: {
 		id: TOGGLE_WORD_WRAP_ID,
 		title: nls.localize('wrapMinified', "Enable wrapping for this file"),
-		iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/WordWrap_16x.svg')) }
+		iconLocation: {
+			dark: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg')),
+			light: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg'))
+		}
 	},
 	group: 'navigation',
 	order: 1,
diff --git a/src/vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg b/src/vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg
new file mode 100644
index 00000000000..f54d621127f
--- /dev/null
+++ b/src/vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.86838 3.449C3.73951 3.30285 3.57724 3.18998 3.39538 3.12C3.12138 3.009 2.77238 2.97 2.34038 3.044C2.09669 3.08799 1.85836 3.15771 1.62938 3.252C1.54785 3.28668 1.46954 3.32851 1.39538 3.377L1.35238 3.407V4.463L1.52038 4.324C1.66938 4.2 1.84638 4.099 2.04738 4.021C2.24338 3.947 2.44638 3.908 2.65138 3.908C2.83938 3.908 2.98138 3.959 3.08238 4.065C3.16938 4.16 3.21938 4.313 3.22938 4.521L2.26738 4.665C2.04838 4.695 1.85738 4.751 1.69738 4.831C1.54486 4.90638 1.40941 5.01223 1.29938 5.142C1.1957 5.2675 1.11787 5.41228 1.07038 5.568C0.972926 5.89751 0.976758 6.2487 1.08138 6.576C1.13245 6.72744 1.21601 6.86588 1.32622 6.98162C1.43643 7.09736 1.57062 7.18759 1.71938 7.246C1.87438 7.309 2.04738 7.339 2.24738 7.339C2.43291 7.3427 2.61694 7.30504 2.7861 7.22876C2.95526 7.15248 3.10532 7.03949 3.22538 6.898V7.243H4.23238V4.65C4.23238 4.395 4.20238 4.166 4.14338 3.969C4.08893 3.7784 3.99527 3.60129 3.86838 3.449ZM3.23238 5.345V5.581C3.23238 5.7 3.21438 5.812 3.17738 5.922C3.14794 6.01808 3.09936 6.10722 3.03457 6.18403C2.96978 6.26085 2.89012 6.32377 2.80038 6.369C2.63942 6.44302 2.45624 6.45268 2.28838 6.396C2.23057 6.37553 2.1775 6.34355 2.13238 6.302C2.09131 6.26306 2.05923 6.21562 2.03838 6.163C2.01433 6.10398 2.00243 6.04072 2.00338 5.977C2.00338 5.9 2.01238 5.83 2.02738 5.765C2.04133 5.71228 2.06813 5.66383 2.10538 5.624C2.15016 5.57601 2.2052 5.53875 2.26638 5.515C2.36473 5.47845 2.46714 5.45394 2.57138 5.442L3.23238 5.345ZM8.28338 4.278C8.23672 4.04796 8.15439 3.82662 8.03938 3.622C7.93236 3.4367 7.78294 3.2794 7.60338 3.163C7.41073 3.04419 7.18764 2.98408 6.96138 2.99C6.7132 2.98696 6.47084 3.06528 6.27138 3.213C6.17111 3.28858 6.0822 3.37816 6.00738 3.479V1H5.08938V7.224H6.00738V6.943C6.13014 7.09519 6.29394 7.20902 6.47938 7.271C6.57738 7.303 6.68738 7.318 6.80938 7.318C7.06438 7.318 7.29238 7.258 7.48638 7.141C7.67838 7.026 7.84138 6.863 7.97238 6.655C8.11016 6.43406 8.20924 6.19125 8.26538 5.937C8.33139 5.64635 8.36361 5.34904 8.36138 5.051C8.36214 4.79133 8.336 4.53228 8.28338 4.278ZM7.42238 5.036C7.42238 5.268 7.40238 5.475 7.36338 5.649C7.32738 5.821 7.27338 5.964 7.20438 6.073C7.14898 6.17117 7.06859 6.25293 6.97138 6.31C6.88615 6.36014 6.78955 6.38774 6.6907 6.39019C6.59184 6.39264 6.49399 6.36986 6.40638 6.324C6.32419 6.27819 6.25236 6.21588 6.19538 6.141C6.13249 6.05546 6.08479 5.95973 6.05438 5.858C6.01818 5.74213 5.99997 5.62139 6.00038 5.5V4.983C6.00038 4.819 6.02038 4.669 6.05938 4.536C6.09638 4.404 6.14738 4.294 6.21638 4.2C6.2751 4.11382 6.35319 4.04259 6.44438 3.992C6.53297 3.94377 6.63253 3.91931 6.73338 3.921C6.83373 3.91811 6.93297 3.94254 7.02051 3.99168C7.10805 4.04083 7.18059 4.11283 7.23038 4.2C7.29338 4.299 7.33838 4.414 7.37338 4.554C7.40438 4.697 7.42238 4.86 7.42238 5.036ZM2.40838 9.9C2.49495 9.79816 2.60282 9.71657 2.72438 9.661C2.94238 9.561 3.27138 9.556 3.49038 9.643C3.59438 9.685 3.69438 9.743 3.81038 9.827L4.13938 10.087V8.945L4.04338 8.883C3.76373 8.7387 3.45306 8.66489 3.13838 8.668C2.83038 8.668 2.54538 8.725 2.29238 8.836C2.04238 8.946 1.82538 9.106 1.64538 9.311C1.46449 9.52067 1.32745 9.76447 1.24238 10.028C1.15238 10.3 1.10538 10.598 1.10538 10.923C1.10538 11.212 1.14838 11.484 1.23438 11.731C1.32138 11.98 1.44638 12.202 1.60838 12.383C1.76938 12.568 1.96938 12.716 2.20538 12.824C2.43738 12.928 2.69838 12.979 2.98338 12.979C3.21638 12.979 3.41738 12.951 3.59638 12.895C3.76106 12.8447 3.9179 12.7717 4.06238 12.678L4.14038 12.617V11.728L3.94038 11.823C3.91598 11.8342 3.89052 11.8429 3.86438 11.849C3.81438 11.866 3.76538 11.884 3.73638 11.898C3.70038 11.921 3.50938 11.988 3.50938 11.988C3.44938 12.012 3.36938 12.031 3.29138 12.047C3.09069 12.0915 2.88108 12.0715 2.69238 11.99C2.57431 11.9398 2.46955 11.8627 2.38638 11.765C2.29381 11.6545 2.22413 11.5267 2.18138 11.389C2.12877 11.2177 2.10313 11.0392 2.10538 10.86C2.10538 10.65 2.13338 10.461 2.18838 10.3C2.24238 10.142 2.31738 10.006 2.40838 9.9ZM14 6H10V5H14.5L15 5.5V11.5L14.5 12H7.87869L9.94976 14.0711L9.24265 14.7782L6.35356 11.8891V11.182L9.24265 8.2929L9.94976 9L7.94975 11H14V6Z" fill="#C5C5C5"/>
+</svg>
diff --git a/src/vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg b/src/vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg
new file mode 100644
index 00000000000..6a8e3fdf933
--- /dev/null
+++ b/src/vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.86838 3.449C3.73951 3.30285 3.57724 3.18998 3.39538 3.12C3.12138 3.009 2.77238 2.97 2.34038 3.044C2.09669 3.08799 1.85836 3.15771 1.62938 3.252C1.54785 3.28668 1.46954 3.32851 1.39538 3.377L1.35238 3.407V4.463L1.52038 4.324C1.66938 4.2 1.84638 4.099 2.04738 4.021C2.24338 3.947 2.44638 3.908 2.65138 3.908C2.83938 3.908 2.98138 3.959 3.08238 4.065C3.16938 4.16 3.21938 4.313 3.22938 4.521L2.26738 4.665C2.04838 4.695 1.85738 4.751 1.69738 4.831C1.54486 4.90638 1.40941 5.01223 1.29938 5.142C1.1957 5.2675 1.11787 5.41228 1.07038 5.568C0.972926 5.89751 0.976758 6.2487 1.08138 6.576C1.13245 6.72744 1.21601 6.86588 1.32622 6.98162C1.43643 7.09736 1.57062 7.18759 1.71938 7.246C1.87438 7.309 2.04738 7.339 2.24738 7.339C2.43291 7.3427 2.61694 7.30504 2.7861 7.22876C2.95526 7.15248 3.10532 7.03949 3.22538 6.898V7.243H4.23238V4.65C4.23238 4.395 4.20238 4.166 4.14338 3.969C4.08893 3.7784 3.99527 3.60129 3.86838 3.449ZM3.23238 5.345V5.581C3.23238 5.7 3.21438 5.812 3.17738 5.922C3.14794 6.01808 3.09936 6.10722 3.03457 6.18403C2.96978 6.26085 2.89012 6.32377 2.80038 6.369C2.63942 6.44302 2.45624 6.45268 2.28838 6.396C2.23057 6.37553 2.1775 6.34355 2.13238 6.302C2.09131 6.26306 2.05923 6.21562 2.03838 6.163C2.01433 6.10398 2.00243 6.04072 2.00338 5.977C2.00338 5.9 2.01238 5.83 2.02738 5.765C2.04133 5.71228 2.06813 5.66383 2.10538 5.624C2.15016 5.57601 2.2052 5.53875 2.26638 5.515C2.36473 5.47845 2.46714 5.45394 2.57138 5.442L3.23238 5.345ZM8.28338 4.278C8.23672 4.04796 8.15439 3.82662 8.03938 3.622C7.93236 3.4367 7.78294 3.2794 7.60338 3.163C7.41073 3.04419 7.18764 2.98408 6.96138 2.99C6.7132 2.98696 6.47084 3.06528 6.27138 3.213C6.17111 3.28858 6.0822 3.37816 6.00738 3.479V1H5.08938V7.224H6.00738V6.943C6.13014 7.09519 6.29394 7.20902 6.47938 7.271C6.57738 7.303 6.68738 7.318 6.80938 7.318C7.06438 7.318 7.29238 7.258 7.48638 7.141C7.67838 7.026 7.84138 6.863 7.97238 6.655C8.11016 6.43406 8.20924 6.19125 8.26538 5.937C8.33139 5.64635 8.36361 5.34904 8.36138 5.051C8.36214 4.79133 8.336 4.53228 8.28338 4.278ZM7.42238 5.036C7.42238 5.268 7.40238 5.475 7.36338 5.649C7.32738 5.821 7.27338 5.964 7.20438 6.073C7.14898 6.17117 7.06859 6.25293 6.97138 6.31C6.88615 6.36014 6.78955 6.38774 6.6907 6.39019C6.59184 6.39264 6.49399 6.36986 6.40638 6.324C6.32419 6.27819 6.25236 6.21588 6.19538 6.141C6.13249 6.05546 6.08479 5.95973 6.05438 5.858C6.01818 5.74213 5.99997 5.62139 6.00038 5.5V4.983C6.00038 4.819 6.02038 4.669 6.05938 4.536C6.09638 4.404 6.14738 4.294 6.21638 4.2C6.2751 4.11382 6.35319 4.04259 6.44438 3.992C6.53297 3.94377 6.63253 3.91931 6.73338 3.921C6.83373 3.91811 6.93297 3.94254 7.02051 3.99168C7.10805 4.04083 7.18059 4.11283 7.23038 4.2C7.29338 4.299 7.33838 4.414 7.37338 4.554C7.40438 4.697 7.42238 4.86 7.42238 5.036ZM2.40838 9.9C2.49495 9.79816 2.60282 9.71657 2.72438 9.661C2.94238 9.561 3.27138 9.556 3.49038 9.643C3.59438 9.685 3.69438 9.743 3.81038 9.827L4.13938 10.087V8.945L4.04338 8.883C3.76373 8.7387 3.45306 8.66489 3.13838 8.668C2.83038 8.668 2.54538 8.725 2.29238 8.836C2.04238 8.946 1.82538 9.106 1.64538 9.311C1.46449 9.52067 1.32745 9.76447 1.24238 10.028C1.15238 10.3 1.10538 10.598 1.10538 10.923C1.10538 11.212 1.14838 11.484 1.23438 11.731C1.32138 11.98 1.44638 12.202 1.60838 12.383C1.76938 12.568 1.96938 12.716 2.20538 12.824C2.43738 12.928 2.69838 12.979 2.98338 12.979C3.21638 12.979 3.41738 12.951 3.59638 12.895C3.76106 12.8447 3.9179 12.7717 4.06238 12.678L4.14038 12.617V11.728L3.94038 11.823C3.91598 11.8342 3.89052 11.8429 3.86438 11.849C3.81438 11.866 3.76538 11.884 3.73638 11.898C3.70038 11.921 3.50938 11.988 3.50938 11.988C3.44938 12.012 3.36938 12.031 3.29138 12.047C3.09069 12.0915 2.88108 12.0715 2.69238 11.99C2.57431 11.9398 2.46955 11.8627 2.38638 11.765C2.29381 11.6545 2.22413 11.5267 2.18138 11.389C2.12877 11.2177 2.10313 11.0392 2.10538 10.86C2.10538 10.65 2.13338 10.461 2.18838 10.3C2.24238 10.142 2.31738 10.006 2.40838 9.9ZM14 6H10V5H14.5L15 5.5V11.5L14.5 12H7.87869L9.94976 14.0711L9.24265 14.7782L6.35356 11.8891V11.182L9.24265 8.2929L9.94976 9L7.94975 11H14V6Z" fill="#424242"/>
+</svg>
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
index 26c32a87835..b7c1ea6f12a 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
@@ -311,7 +311,6 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 			let currentComment = commentThread.comments![i];
 			let oldCommentNode = this._commentElements.filter(commentNode => commentNode.comment.uniqueIdInThread === currentComment.uniqueIdInThread);
 			if (oldCommentNode.length) {
-				oldCommentNode[0].update(currentComment);
 				lastCommentElement = oldCommentNode[0].domNode;
 				newCommentNodeList.unshift(oldCommentNode[0]);
 			} else {
diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
index 91370417b61..86ade2f8f53 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -20,10 +20,10 @@ export class CommentsDataSource implements IDataSource {
 			return 'root';
 		}
 		if (element instanceof ResourceWithCommentThreads) {
-			return element.id;
+			return `${element.owner}-${element.id}`;
 		}
 		if (element instanceof CommentNode) {
-			return `${element.resource.toString()}-${element.comment.uniqueIdInThread}`;
+			return `${element.owner}-${element.resource.toString()}-${element.threadId}-${element.comment.uniqueIdInThread}`;
 		}
 		return '';
 	}
diff --git a/src/vs/workbench/contrib/comments/browser/media/review.css b/src/vs/workbench/contrib/comments/browser/media/review.css
index dd292251cd6..767e4c97057 100644
--- a/src/vs/workbench/contrib/comments/browser/media/review.css
+++ b/src/vs/workbench/contrib/comments/browser/media/review.css
@@ -399,7 +399,8 @@
 }
 
 .monaco-editor .review-widget .action-item {
-	min-width: 16px;
+	min-width: 18px;
+	min-height: 18px;
 	margin-left: 4px;
 }
 
diff --git a/src/vs/workbench/contrib/comments/common/commentModel.ts b/src/vs/workbench/contrib/comments/common/commentModel.ts
index d2a03f5ccd5..b4e40ddca1b 100644
--- a/src/vs/workbench/contrib/comments/common/commentModel.ts
+++ b/src/vs/workbench/contrib/comments/common/commentModel.ts
@@ -15,13 +15,15 @@ export interface ICommentThreadChangedEvent extends CommentThreadChangedEvent {
 }
 
 export class CommentNode {
+	owner: string;
 	threadId: string;
 	range: IRange;
 	comment: Comment;
 	replies: CommentNode[] = [];
 	resource: URI;
 
-	constructor(threadId: string, resource: URI, comment: Comment, range: IRange) {
+	constructor(owner: string, threadId: string, resource: URI, comment: Comment, range: IRange) {
+		this.owner = owner;
 		this.threadId = threadId;
 		this.comment = comment;
 		this.resource = resource;
@@ -35,18 +37,20 @@ export class CommentNode {
 
 export class ResourceWithCommentThreads {
 	id: string;
+	owner: string;
 	commentThreads: CommentNode[]; // The top level comments on the file. Replys are nested under each node.
 	resource: URI;
 
-	constructor(resource: URI, commentThreads: CommentThread[]) {
+	constructor(owner: string, resource: URI, commentThreads: CommentThread[]) {
+		this.owner = owner;
 		this.id = resource.toString();
 		this.resource = resource;
-		this.commentThreads = commentThreads.filter(thread => thread.comments && thread.comments.length).map(thread => ResourceWithCommentThreads.createCommentNode(resource, thread));
+		this.commentThreads = commentThreads.filter(thread => thread.comments && thread.comments.length).map(thread => ResourceWithCommentThreads.createCommentNode(owner, resource, thread));
 	}
 
-	public static createCommentNode(resource: URI, commentThread: CommentThread): CommentNode {
+	public static createCommentNode(owner: string, resource: URI, commentThread: CommentThread): CommentNode {
 		const { threadId, comments, range } = commentThread;
-		const commentNodes: CommentNode[] = comments!.map(comment => new CommentNode(threadId!, resource, comment, range));
+		const commentNodes: CommentNode[] = comments!.map(comment => new CommentNode(owner, threadId!, resource, comment, range));
 		if (commentNodes.length > 1) {
 			commentNodes[0].replies = commentNodes.slice(1, commentNodes.length);
 		}
@@ -65,7 +69,7 @@ export class CommentsModel {
 	}
 
 	public setCommentThreads(owner: string, commentThreads: CommentThread[]): void {
-		this.commentThreadsMap.set(owner, this.groupByResource(commentThreads));
+		this.commentThreadsMap.set(owner, this.groupByResource(owner, commentThreads));
 		this.resourceCommentThreads = flatten(values(this.commentThreadsMap));
 	}
 
@@ -97,9 +101,9 @@ export class CommentsModel {
 			// Find comment node on resource that is that thread and replace it
 			const index = firstIndex(matchingResourceData.commentThreads, (commentThread) => commentThread.threadId === thread.threadId);
 			if (index >= 0) {
-				matchingResourceData.commentThreads[index] = ResourceWithCommentThreads.createCommentNode(URI.parse(matchingResourceData.id), thread);
+				matchingResourceData.commentThreads[index] = ResourceWithCommentThreads.createCommentNode(owner, URI.parse(matchingResourceData.id), thread);
 			} else if (thread.comments && thread.comments.length) {
-				matchingResourceData.commentThreads.push(ResourceWithCommentThreads.createCommentNode(URI.parse(matchingResourceData.id), thread));
+				matchingResourceData.commentThreads.push(ResourceWithCommentThreads.createCommentNode(owner, URI.parse(matchingResourceData.id), thread));
 			}
 		});
 
@@ -108,10 +112,10 @@ export class CommentsModel {
 			if (existingResource.length) {
 				const resource = existingResource[0];
 				if (thread.comments && thread.comments.length) {
-					resource.commentThreads.push(ResourceWithCommentThreads.createCommentNode(resource.resource, thread));
+					resource.commentThreads.push(ResourceWithCommentThreads.createCommentNode(owner, resource.resource, thread));
 				}
 			} else {
-				threadsForOwner.push(new ResourceWithCommentThreads(URI.parse(thread.resource!), [thread]));
+				threadsForOwner.push(new ResourceWithCommentThreads(owner, URI.parse(thread.resource!), [thread]));
 			}
 		});
 
@@ -133,11 +137,11 @@ export class CommentsModel {
 		}
 	}
 
-	private groupByResource(commentThreads: CommentThread[]): ResourceWithCommentThreads[] {
+	private groupByResource(owner: string, commentThreads: CommentThread[]): ResourceWithCommentThreads[] {
 		const resourceCommentThreads: ResourceWithCommentThreads[] = [];
 		const commentThreadsByResource = new Map<string, ResourceWithCommentThreads>();
 		for (const group of groupBy(commentThreads, CommentsModel._compareURIs)) {
-			commentThreadsByResource.set(group[0].resource!, new ResourceWithCommentThreads(URI.parse(group[0].resource!), group));
+			commentThreadsByResource.set(group[0].resource!, new ResourceWithCommentThreads(owner, URI.parse(group[0].resource!), group));
 		}
 
 		commentThreadsByResource.forEach((v, i, m) => {
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index e0fa0e6c9f3..9114575d433 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -83,7 +83,7 @@ export class BreakpointsView extends ViewletPanel {
 					getRole: (breakpoint: IEnablement) => 'checkbox',
 					isChecked: (breakpoint: IEnablement) => breakpoint.enabled
 				}
-			}) as WorkbenchList<IEnablement>;
+			});
 
 		CONTEXT_BREAKPOINTS_FOCUSED.bindTo(this.list.contextKeyService);
 
diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts
index 6d94222b5b8..e8eac6f7d23 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackView.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackView.ts
@@ -145,7 +145,7 @@ export class CallStackView extends ViewletPanel {
 						return nls.localize('showMoreStackFrames2', "Show More Stack Frames");
 					}
 				}
-			}) as WorkbenchAsyncDataTree<CallStackItem | IDebugModel, CallStackItem, FuzzyScore>;
+			});
 
 		this.tree.setInput(this.debugService.getModel()).then(undefined, onUnexpectedError);
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugHover.ts b/src/vs/workbench/contrib/debug/browser/debugHover.ts
index ff64d75d22b..b198f1d9e15 100644
--- a/src/vs/workbench/contrib/debug/browser/debugHover.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugHover.ts
@@ -80,7 +80,7 @@ export class DebugHoverWidget implements IContentWidget {
 				accessibilityProvider: new DebugHoverAccessibilityProvider(),
 				mouseSupport: false,
 				horizontalScrolling: true
-			}) as any as AsyncDataTree<IExpression, IExpression, any>;
+			});
 
 		this.valueContainer = $('.value');
 		this.valueContainer.tabIndex = 0;
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
index ca53f26dbf5..603797e9d04 100644
--- a/src/vs/workbench/contrib/debug/browser/debugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -31,7 +31,6 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { ReplModel } from 'vs/workbench/contrib/debug/common/replModel';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ISignService } from 'vs/platform/sign/common/sign';
 
 export class DebugSession implements IDebugSession {
 
@@ -66,7 +65,6 @@ export class DebugSession implements IDebugSession {
 		@IViewletService private readonly viewletService: IViewletService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@INotificationService private readonly notificationService: INotificationService,
-		@ISignService private readonly signService: ISignService,
 		@IProductService private readonly productService: IProductService,
 		@IWindowsService private readonly windowsService: IWindowsService
 	) {
@@ -169,7 +167,7 @@ export class DebugSession implements IDebugSession {
 
 			return dbgr.createDebugAdapter(this).then(debugAdapter => {
 
-				this.raw = new RawDebugSession(debugAdapter, dbgr, this.telemetryService, customTelemetryService, this.signService, this.windowsService);
+				this.raw = new RawDebugSession(debugAdapter, dbgr, this.telemetryService, customTelemetryService, this.windowsService);
 
 				return this.raw!.start().then(() => {
 
diff --git a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
index 8d31338c44e..ef9f3cb5d37 100644
--- a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
@@ -433,7 +433,7 @@ export class LoadedScriptsView extends ViewletPanel {
 				accessibilityProvider: new LoadedSciptsAccessibilityProvider(),
 				ariaLabel: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'loadedScriptsAriaLabel' }, "Debug Loaded Scripts"),
 			}
-		) as WorkbenchAsyncDataTree<LoadedScriptsItem, LoadedScriptsItem, FuzzyScore>;
+		);
 
 		this.tree.setInput(root);
 
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
index 0550ddd64e9..b67785c3d98 100644
--- a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -12,7 +12,6 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { formatPII, isUri } from 'vs/workbench/contrib/debug/common/debugUtils';
 import { IDebugAdapter, IConfig, AdapterEndEvent, IDebugger } from 'vs/workbench/contrib/debug/common/debug';
 import { createErrorWithActions } from 'vs/base/common/errorsWithActions';
-import { ISignService } from 'vs/platform/sign/common/sign';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { URI } from 'vs/base/common/uri';
@@ -74,7 +73,6 @@ export class RawDebugSession {
 		dbgr: IDebugger,
 		private readonly telemetryService: ITelemetryService,
 		public readonly customTelemetryService: ITelemetryService | undefined,
-		private readonly signService: ISignService,
 		private readonly windowsService: IWindowsService
 
 	) {
@@ -548,19 +546,6 @@ export class RawDebugSession {
 					safeSendResponse(response);
 				});
 				break;
-			case 'handshake':
-				try {
-					const signature = await this.signService.sign(request.arguments.value);
-					response.body = {
-						signature: signature
-					};
-					safeSendResponse(response);
-				} catch (e) {
-					response.success = false;
-					response.message = e.message;
-					safeSendResponse(response);
-				}
-				break;
 			default:
 				response.success = false;
 				response.message = `unknown request '${request.command}'`;
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index c099ec691a9..922de4fe53a 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -378,12 +378,19 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 		this.replDelegate = new ReplDelegate(this.configurationService);
 		const wordWrap = this.configurationService.getValue<IDebugConfiguration>('debug').console.wordWrap;
 		dom.toggleClass(treeContainer, 'word-wrap', wordWrap);
-		this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, treeContainer, this.replDelegate, [
-			this.instantiationService.createInstance(VariablesRenderer),
-			this.instantiationService.createInstance(ReplSimpleElementsRenderer),
-			new ReplExpressionsRenderer(),
-			new ReplRawObjectsRenderer()
-		], new ReplDataSource(), {
+		this.tree = this.instantiationService.createInstance(
+			WorkbenchAsyncDataTree,
+			treeContainer,
+			this.replDelegate,
+			[
+				this.instantiationService.createInstance(VariablesRenderer),
+				this.instantiationService.createInstance(ReplSimpleElementsRenderer),
+				new ReplExpressionsRenderer(),
+				new ReplRawObjectsRenderer()
+			],
+			// https://github.com/microsoft/TypeScript/issues/32526
+			new ReplDataSource() as IAsyncDataSource<IDebugSession, IReplElement>,
+			{
 				ariaLabel: nls.localize('replAriaLabel', "Read Eval Print Loop Panel"),
 				accessibilityProvider: new ReplAccessibilityProvider(),
 				identityProvider: { getId: (element: IReplElement) => element.getId() },
@@ -392,7 +399,7 @@ export class Repl extends Panel implements IPrivateReplService, IHistoryNavigati
 				horizontalScrolling: !wordWrap,
 				setRowLineHeight: false,
 				supportDynamicHeights: wordWrap
-			}) as WorkbenchAsyncDataTree<IDebugSession, IReplElement, FuzzyScore>;
+			});
 		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
 		let lastSelectedString: string;
 		this._register(this.tree.onMouseClick(() => {
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index 6b51044d076..581042b38cc 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -91,7 +91,7 @@ export class VariablesView extends ViewletPanel {
 				accessibilityProvider: new VariablesAccessibilityProvider(),
 				identityProvider: { getId: (element: IExpression | IScope) => element.getId() },
 				keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e: IExpression | IScope) => e }
-			}) as WorkbenchAsyncDataTree<IViewModel | IExpression | IScope, IExpression | IScope, FuzzyScore>;
+			});
 
 		this.tree.setInput(this.debugService.getViewModel()).then(null, onUnexpectedError);
 
diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
index 53549128538..970b8abfa7d 100644
--- a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -66,7 +66,7 @@ export class WatchExpressionsView extends ViewletPanel {
 				identityProvider: { getId: (element: IExpression) => element.getId() },
 				keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e: IExpression) => e },
 				dnd: new WatchExpressionsDragAndDrop(this.debugService),
-			}) as WorkbenchAsyncDataTree<IDebugService | IExpression, IExpression, FuzzyScore>;
+			});
 
 		this.tree.setInput(this.debugService).then(undefined, onUnexpectedError);
 		CONTEXT_WATCH_EXPRESSIONS_FOCUSED.bindTo(this.tree.contextKeyService);
diff --git a/src/vs/workbench/contrib/debug/node/telemetryApp.ts b/src/vs/workbench/contrib/debug/node/telemetryApp.ts
index affab685550..52507e4fd20 100644
--- a/src/vs/workbench/contrib/debug/node/telemetryApp.ts
+++ b/src/vs/workbench/contrib/debug/node/telemetryApp.ts
@@ -8,7 +8,7 @@ import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppen
 import { TelemetryAppenderChannel } from 'vs/platform/telemetry/node/telemetryIpc';
 
 const appender = new AppInsightsAppender(process.argv[2], JSON.parse(process.argv[3]), process.argv[4]);
-process.once('exit', () => appender.dispose());
+process.once('exit', () => appender.flush());
 
 const channel = new TelemetryAppenderChannel(appender);
 const server = new Server('telemetry');
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugModel.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugModel.test.ts
index 7aafdc899f3..6b313596ca6 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugModel.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugModel.test.ts
@@ -15,7 +15,7 @@ import { ReplModel } from 'vs/workbench/contrib/debug/common/replModel';
 import { IBreakpointUpdateData } from 'vs/workbench/contrib/debug/common/debug';
 
 function createMockSession(model: DebugModel, name = 'mockSession', parentSession?: DebugSession | undefined): DebugSession {
-	return new DebugSession({ resolved: { name, type: 'node', request: 'launch' }, unresolved: undefined }, undefined!, model, parentSession, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!);
+	return new DebugSession({ resolved: { name, type: 'node', request: 'launch' }, unresolved: undefined }, undefined!, model, parentSession, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!);
 }
 
 suite('Debug - Model', () => {
@@ -427,7 +427,7 @@ suite('Debug - Model', () => {
 	// Repl output
 
 	test('repl output', () => {
-		const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined!, model, undefined, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!);
+		const session = new DebugSession({ resolved: { name: 'mockSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined!, model, undefined, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!);
 		const repl = new ReplModel(session);
 		repl.appendToRepl('first line\n', severity.Error);
 		repl.appendToRepl('second line ', severity.Error);
diff --git a/src/vs/workbench/contrib/experiments/electron-browser/experimentService.ts b/src/vs/workbench/contrib/experiments/electron-browser/experimentService.ts
index 643b404f191..79dd609cb60 100644
--- a/src/vs/workbench/contrib/experiments/electron-browser/experimentService.ts
+++ b/src/vs/workbench/contrib/experiments/electron-browser/experimentService.ts
@@ -10,17 +10,17 @@ import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { language } from 'vs/base/common/platform';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { match } from 'vs/base/common/glob';
 import { IRequestService, asJson } from 'vs/platform/request/common/request';
 import { Emitter, Event } from 'vs/base/common/event';
 import { ITextFileService, StateChange } from 'vs/workbench/services/textfile/common/textfiles';
-import { WorkspaceStats } from 'vs/workbench/contrib/stats/electron-browser/workspaceStats';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { distinct } from 'vs/base/common/arrays';
 import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { ExperimentState, IExperimentAction, IExperimentService, IExperiment, ExperimentActionType, IExperimentActionPromptProperties } from 'vs/workbench/contrib/experiments/common/experimentService';
 import { IProductService } from 'vs/platform/product/common/product';
+import { IWorkspaceStatsService } from 'vs/workbench/contrib/stats/electron-browser/workspaceStatsService';
 
 interface IExperimentStorageState {
 	enabled: boolean;
@@ -60,7 +60,6 @@ export class ExperimentService extends Disposable implements IExperimentService
 	private _experiments: IExperiment[] = [];
 	private _loadExperimentsPromise: Promise<void>;
 	private _curatedMapping = Object.create(null);
-	private _disposables: IDisposable[] = [];
 
 	private readonly _onExperimentEnabled = this._register(new Emitter<IExperiment>());
 	onExperimentEnabled: Event<IExperiment> = this._onExperimentEnabled.event;
@@ -74,7 +73,8 @@ export class ExperimentService extends Disposable implements IExperimentService
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
 		@IRequestService private readonly requestService: IRequestService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IProductService private readonly productService: IProductService
+		@IProductService private readonly productService: IProductService,
+		@IWorkspaceStatsService private readonly workspaceStatsService: IWorkspaceStatsService
 	) {
 		super();
 
@@ -355,7 +355,7 @@ export class ExperimentService extends Disposable implements IExperimentService
 					onSaveHandler.dispose();
 					return;
 				}
-				e.forEach(event => {
+				e.forEach(async event => {
 					if (event.kind !== StateChange.SAVED
 						|| latestExperimentState.state !== ExperimentState.Evaluating
 						|| date === latestExperimentState.lastEditedDate
@@ -370,10 +370,12 @@ export class ExperimentService extends Disposable implements IExperimentService
 						filePathCheck = match(fileEdits.filePathPattern, event.resource.fsPath);
 					}
 					if (Array.isArray(fileEdits.workspaceIncludes) && fileEdits.workspaceIncludes.length) {
-						workspaceCheck = !!WorkspaceStats.TAGS && fileEdits.workspaceIncludes.some(x => !!WorkspaceStats.TAGS[x]);
+						const tags = await this.workspaceStatsService.getTags();
+						workspaceCheck = !!tags && fileEdits.workspaceIncludes.some(x => !!tags[x]);
 					}
 					if (workspaceCheck && Array.isArray(fileEdits.workspaceExcludes) && fileEdits.workspaceExcludes.length) {
-						workspaceCheck = !!WorkspaceStats.TAGS && !fileEdits.workspaceExcludes.some(x => !!WorkspaceStats.TAGS[x]);
+						const tags = await this.workspaceStatsService.getTags();
+						workspaceCheck = !!tags && !fileEdits.workspaceExcludes.some(x => !!tags[x]);
 					}
 					if (filePathCheck && workspaceCheck) {
 						latestExperimentState.editCount = (latestExperimentState.editCount || 0) + 1;
@@ -389,14 +391,10 @@ export class ExperimentService extends Disposable implements IExperimentService
 					}
 				}
 			});
-			this._disposables.push(onSaveHandler);
+			this._register(onSaveHandler);
 			return ExperimentState.Evaluating;
 		});
 	}
-
-	dispose() {
-		this._disposables = dispose(this._disposables);
-	}
 }
 
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index 5456cb5f4a7..e2c7032f0f6 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -28,7 +28,7 @@ import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, IExtension
 import { RatingsWidget, InstallCountWidget, RemoteBadgeWidget } from 'vs/workbench/contrib/extensions/browser/extensionsWidgets';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { CombinedInstallAction, UpdateAction, ExtensionEditorDropDownAction, ReloadAction, MaliciousStatusLabelAction, IgnoreExtensionRecommendationAction, UndoIgnoreExtensionRecommendationAction, EnableDropDownAction, DisableDropDownAction, StatusLabelAction, SetFileIconThemeAction, SetColorThemeAction, RemoteInstallAction, DisabledLabelAction, SystemDisabledWarningAction, LocalInstallAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
+import { CombinedInstallAction, UpdateAction, ExtensionEditorDropDownAction, ReloadAction, MaliciousStatusLabelAction, IgnoreExtensionRecommendationAction, UndoIgnoreExtensionRecommendationAction, EnableDropDownAction, DisableDropDownAction, StatusLabelAction, SetFileIconThemeAction, SetColorThemeAction, RemoteInstallAction, ExtensionToolTipAction, SystemDisabledWarningAction, LocalInstallAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -376,7 +376,7 @@ export class ExtensionEditor extends BaseEditor {
 			this.instantiationService.createInstance(LocalInstallAction),
 			combinedInstallAction,
 			systemDisabledWarningAction,
-			this.instantiationService.createInstance(DisabledLabelAction, systemDisabledWarningAction),
+			this.instantiationService.createInstance(ExtensionToolTipAction, systemDisabledWarningAction, reloadAction),
 			this.instantiationService.createInstance(MaliciousStatusLabelAction, true),
 		];
 		const extensionContainers: ExtensionContainers = this.instantiationService.createInstance(ExtensionContainers, [...actions, ...widgets]);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index eb55efed49b..39b348072b9 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -44,6 +44,7 @@ import { ExtensionDependencyChecker } from 'vs/workbench/contrib/extensions/brow
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { RemoteExtensionsInstaller } from 'vs/workbench/contrib/extensions/browser/remoteExtensionsInstaller';
 
 // Singletons
 registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService);
@@ -64,14 +65,15 @@ Registry.as<IQuickOpenRegistry>(Extensions.Quickopen).registerQuickOpenHandler(
 );
 
 // Editor
-const editorDescriptor = new EditorDescriptor(
-	ExtensionEditor,
-	ExtensionEditor.ID,
-	localize('extension', "Extension")
-);
-
-Registry.as<IEditorRegistry>(EditorExtensions.Editors)
-	.registerEditor(editorDescriptor, [new SyncDescriptor(ExtensionsInput)]);
+Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
+	new EditorDescriptor(
+		ExtensionEditor,
+		ExtensionEditor.ID,
+		localize('extension', "Extension")
+	),
+	[
+		new SyncDescriptor(ExtensionsInput)
+	]);
 
 // Viewlet
 const viewletDescriptor = new ViewletDescriptor(
@@ -371,3 +373,4 @@ workbenchRegistry.registerWorkbenchContribution(KeymapExtensions, LifecyclePhase
 workbenchRegistry.registerWorkbenchContribution(ExtensionsViewletViewsContribution, LifecyclePhase.Starting);
 workbenchRegistry.registerWorkbenchContribution(ExtensionActivationProgress, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(ExtensionDependencyChecker, LifecyclePhase.Eventually);
+workbenchRegistry.registerWorkbenchContribution(RemoteExtensionsInstaller, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index f68a840c9ad..df4be0957a3 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -60,8 +60,10 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IProductService } from 'vs/platform/product/common/product';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 
-function toExtensionDescription(local: ILocalExtension): IExtensionDescription {
+export function toExtensionDescription(local: ILocalExtension): IExtensionDescription {
 	return {
 		identifier: new ExtensionIdentifier(local.identifier.id),
 		isBuiltin: local.type === ExtensionType.System,
@@ -72,7 +74,8 @@ function toExtensionDescription(local: ILocalExtension): IExtensionDescription {
 	};
 }
 
-const promptDownloadManually = (extension: IGalleryExtension | undefined, message: string, error: Error, instantiationService: IInstantiationService, notificationService: INotificationService, openerService: IOpenerService, productService: IProductService) => {
+const promptDownloadManually = (extension: IGalleryExtension | undefined, message: string, error: Error,
+	instantiationService: IInstantiationService, notificationService: INotificationService, openerService: IOpenerService, productService: IProductService) => {
 	if (!extension || error.name === INSTALL_ERROR_INCOMPATIBLE || error.name === INSTALL_ERROR_MALICIOUS || !productService.extensionsGallery) {
 		return Promise.reject(error);
 	} else {
@@ -273,7 +276,7 @@ export class InstallAction extends ExtensionAction {
 	}
 }
 
-export class InstallInOtherServerAction extends ExtensionAction {
+export abstract class InstallInOtherServerAction extends ExtensionAction {
 
 	protected static INSTALL_LABEL = localize('install', "Install");
 	protected static INSTALLING_LABEL = localize('installing', "Installing");
@@ -282,7 +285,6 @@ export class InstallInOtherServerAction extends ExtensionAction {
 	private static readonly InstallingClass = 'extension-action install installing';
 
 	updateWhenCounterExtensionChanges: boolean = true;
-	protected installing: boolean = false;
 
 	constructor(
 		id: string,
@@ -290,70 +292,63 @@ export class InstallInOtherServerAction extends ExtensionAction {
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 	) {
 		super(id, InstallInOtherServerAction.INSTALL_LABEL, InstallInOtherServerAction.Class, false);
-		this.updateLabel();
 		this.update();
 	}
 
-	private updateLabel(): void {
-		this.label = this.getLabel();
-		this.tooltip = this.label;
-	}
-
-	protected getLabel(): string {
-		return this.installing ? InstallInOtherServerAction.INSTALLING_LABEL :
-			this.server ? `${InstallInOtherServerAction.INSTALL_LABEL} on ${this.server.label}`
-				: InstallInOtherServerAction.INSTALL_LABEL;
-
-	}
-
 	update(): void {
 		this.enabled = false;
 		this.class = InstallInOtherServerAction.Class;
-		if (this.installing) {
-			this.enabled = true;
-			this.class = InstallInOtherServerAction.InstallingClass;
-			this.updateLabel();
-			return;
-		}
 
 		if (
-			this.extension && this.extension.local && this.server && this.extension.state === ExtensionState.Installed
+			this.extension && this.extension.local && this.server && this.extension.state === ExtensionState.Installed && this.extension.type === ExtensionType.User
 			// disabled by extension kind or it is a language pack extension
 			&& (this.extension.enablementState === EnablementState.DisabledByExtensionKind || isLanguagePackExtension(this.extension.local.manifest))
-			// Not installed in other server and can install in other server
-			&& !this.extensionsWorkbenchService.installed.some(e => areSameExtensions(e.identifier, this.extension.identifier) && e.server === this.server)
-			&& this.extensionsWorkbenchService.canInstall(this.extension)
 		) {
-			this.enabled = true;
-			this.updateLabel();
-			return;
+			const extensionInOtherServer = this.extensionsWorkbenchService.installed.filter(e => areSameExtensions(e.identifier, this.extension.identifier) && e.server === this.server)[0];
+			if (extensionInOtherServer) {
+				// Getting installed in other server
+				if (extensionInOtherServer.state === ExtensionState.Installing && !extensionInOtherServer.local) {
+					this.enabled = true;
+					this.label = InstallInOtherServerAction.INSTALLING_LABEL;
+					this.class = InstallInOtherServerAction.InstallingClass;
+				}
+			} else {
+				// Not installed in other server
+				this.enabled = true;
+				this.label = this.getInstallLabel();
+			}
 		}
 	}
 
 	async run(): Promise<void> {
-		if (this.server && !this.installing) {
-			this.installing = true;
-			this.update();
+		if (this.server) {
 			this.extensionsWorkbenchService.open(this.extension);
 			alert(localize('installExtensionStart', "Installing extension {0} started. An editor is now open with more details on this extension", this.extension.displayName));
 			if (this.extension.gallery) {
 				await this.server.extensionManagementService.installFromGallery(this.extension.gallery);
-				this.installing = false;
-				this.update();
+			} else {
+				const vsix = await this.extension.server!.extensionManagementService.zip(this.extension.local!);
+				await this.server.extensionManagementService.install(vsix);
 			}
 		}
 	}
+
+	protected abstract getInstallLabel(): string;
 }
 
 export class RemoteInstallAction extends InstallInOtherServerAction {
 
 	constructor(
 		@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionManagementServerService extensionManagementServerService: IExtensionManagementServerService
+		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService
 	) {
 		super(`extensions.remoteinstall`, extensionManagementServerService.remoteExtensionManagementServer, extensionsWorkbenchService);
 	}
 
+	protected getInstallLabel(): string {
+		return this.extensionManagementServerService.remoteExtensionManagementServer ? localize('Install on Server', "Install on {0}", this.extensionManagementServerService.remoteExtensionManagementServer.label) : InstallInOtherServerAction.INSTALL_LABEL;
+	}
+
 }
 
 export class LocalInstallAction extends InstallInOtherServerAction {
@@ -365,8 +360,8 @@ export class LocalInstallAction extends InstallInOtherServerAction {
 		super(`extensions.localinstall`, extensionManagementServerService.localExtensionManagementServer, extensionsWorkbenchService);
 	}
 
-	protected getLabel(): string {
-		return this.installing ? InstallInOtherServerAction.INSTALLING_LABEL : localize('install locally', "Install Locally");
+	protected getInstallLabel(): string {
+		return localize('install locally', "Install Locally");
 	}
 
 }
@@ -1161,9 +1156,7 @@ export class ReloadAction extends ExtensionAction {
 		@IWindowService private readonly windowService: IWindowService,
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService,
-		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IProductService private readonly productService: IProductService,
+		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService
 	) {
 		super('extensions.reload', localize('reloadAction', "Reload"), ReloadAction.DisabledClass, false);
 		this._register(this.extensionService.onDidChangeExtensions(this.updateRunningExtensions, this));
@@ -1200,7 +1193,7 @@ export class ReloadAction extends ExtensionAction {
 		const isSameExtensionRunning = runningExtension && this.extension.server === this.extensionManagementServerService.getExtensionManagementServer(runningExtension.extensionLocation);
 
 		if (isUninstalled) {
-			if (isSameExtensionRunning) {
+			if (isSameExtensionRunning && !this.extensionService.canRemoveExtension(runningExtension)) {
 				this.enabled = true;
 				this.label = localize('reloadRequired', "Reload Required");
 				this.tooltip = localize('postUninstallTooltip', "Please reload Visual Studio Code to complete the uninstallation of this extension.");
@@ -1210,8 +1203,9 @@ export class ReloadAction extends ExtensionAction {
 		}
 		if (this.extension.local) {
 			const isEnabled = this.extensionEnablementService.isEnabled(this.extension.local);
+
+			// Extension is runningÎ
 			if (runningExtension) {
-				// Extension is running
 				if (isEnabled) {
 					if (!this.extensionService.canAddExtension(toExtensionDescription(this.extension.local))) {
 						if (isSameExtensionRunning) {
@@ -1234,39 +1228,27 @@ export class ReloadAction extends ExtensionAction {
 					}
 				}
 				return;
-			} else {
-				// Extension is not running
+			}
+
+			// Extension is not running
+			else {
 				if (isEnabled && !this.extensionService.canAddExtension(toExtensionDescription(this.extension.local))) {
 					this.enabled = true;
 					this.label = localize('reloadRequired', "Reload Required");
 					this.tooltip = localize('postEnableTooltip', "Please reload Visual Studio Code to enable this extension.");
 					return;
 				}
-				if (this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer) {
-					const uiExtension = isUIExtension(this.extension.local.manifest, this.productService, this.configurationService);
-					// Local Workspace Extension
-					if (!uiExtension && this.extension.server === this.extensionManagementServerService.localExtensionManagementServer) {
-						const remoteExtension = this.extensionsWorkbenchService.local.filter(e => areSameExtensions(e.identifier, this.extension.identifier) && e.server === this.extensionManagementServerService.remoteExtensionManagementServer)[0];
-						// Extension exist in remote and enabled
-						if (remoteExtension && remoteExtension.local && this.extensionEnablementService.isEnabled(remoteExtension.local)) {
-							this.enabled = true;
-							this.label = localize('reloadRequired', "Reload Required");
-							this.tooltip = localize('postEnableTooltip', "Please reload Visual Studio Code to enable this extension.");
-							alert(localize('installExtensionComplete', "Installing extension {0} is completed. Please reload Visual Studio Code to enable it.", this.extension.displayName));
-							return;
-						}
-					}
-					// Remote UI Extension
-					if (uiExtension && this.extension.server === this.extensionManagementServerService.remoteExtensionManagementServer) {
-						const localExtension = this.extensionsWorkbenchService.local.filter(e => areSameExtensions(e.identifier, this.extension.identifier) && e.server === this.extensionManagementServerService.localExtensionManagementServer)[0];
-						// Extension exist in local and enabled
-						if (localExtension && localExtension.local && this.extensionEnablementService.isEnabled(localExtension.local)) {
-							this.enabled = true;
-							this.label = localize('reloadRequired', "Reload Required");
-							this.tooltip = localize('postEnableTooltip', "Please reload Visual Studio Code to enable this extension.");
-							alert(localize('installExtensionComplete', "Installing extension {0} is completed. Please reload Visual Studio Code to enable it.", this.extension.displayName));
-							return;
-						}
+
+				const otherServer = this.extension.server ? this.extension.server === this.extensionManagementServerService.localExtensionManagementServer ? this.extensionManagementServerService.remoteExtensionManagementServer : this.extensionManagementServerService.localExtensionManagementServer : null;
+				if (otherServer && this.extension.enablementState === EnablementState.DisabledByExtensionKind) {
+					const extensionInOtherServer = this.extensionsWorkbenchService.local.filter(e => areSameExtensions(e.identifier, this.extension.identifier) && e.server === otherServer)[0];
+					// Same extension in other server exists and
+					if (extensionInOtherServer && extensionInOtherServer.local && this.extensionEnablementService.isEnabled(extensionInOtherServer.local)) {
+						this.enabled = true;
+						this.label = localize('reloadRequired', "Reload Required");
+						this.tooltip = localize('postEnableTooltip', "Please reload Visual Studio Code to enable this extension.");
+						alert(localize('installExtensionComplete', "Installing extension {0} is completed. Please reload Visual Studio Code to enable it.", this.extension.displayName));
+						return;
 					}
 				}
 			}
@@ -2523,7 +2505,7 @@ export class MaliciousStatusLabelAction extends ExtensionAction {
 	}
 }
 
-export class DisabledLabelAction extends ExtensionAction {
+export class ExtensionToolTipAction extends ExtensionAction {
 
 	private static readonly Class = 'disable-status';
 
@@ -2532,10 +2514,12 @@ export class DisabledLabelAction extends ExtensionAction {
 
 	constructor(
 		private readonly warningAction: SystemDisabledWarningAction,
+		private readonly reloadAction: ReloadAction,
 		@IExtensionEnablementService private readonly extensionEnablementService: IExtensionEnablementService,
 		@IExtensionService private readonly extensionService: IExtensionService,
+		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService
 	) {
-		super('extensions.disabledLabel', warningAction.tooltip, `${DisabledLabelAction.Class} hide`, false);
+		super('extensions.tooltip', warningAction.tooltip, `${ExtensionToolTipAction.Class} hide`, false);
 		this._register(warningAction.onDidChange(() => this.update(), this));
 		this._register(this.extensionService.onDidChangeExtensions(this.updateRunningExtensions, this));
 		this.updateRunningExtensions();
@@ -2546,25 +2530,51 @@ export class DisabledLabelAction extends ExtensionAction {
 	}
 
 	update(): void {
-		this.class = `${DisabledLabelAction.Class} hide`;
-		this.label = '';
+		this.label = this.getTooltip();
+		this.class = ExtensionToolTipAction.Class;
+		if (!this.label) {
+			this.class = `${ExtensionToolTipAction.Class} hide`;
+		}
+	}
+
+	private getTooltip(): string {
+		if (!this.extension) {
+			return '';
+		}
+		if (this.reloadAction.enabled) {
+			return this.reloadAction.tooltip;
+		}
 		if (this.warningAction.tooltip) {
-			this.class = DisabledLabelAction.Class;
-			this.label = this.warningAction.tooltip;
-			return;
+			return this.warningAction.tooltip;
 		}
-		if (this.extension && this.extension.local && isLanguagePackExtension(this.extension.local.manifest)) {
-			return;
-		}
-		if (this.extension && this.extension.local && this._runningExtensions) {
+		if (this.extension && this.extension.local && this.extension.state === ExtensionState.Installed && this._runningExtensions) {
+			const isRunning = this._runningExtensions.some(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension.identifier));
 			const isEnabled = this.extensionEnablementService.isEnabled(this.extension.local);
-			const isExtensionRunning = this._runningExtensions.some(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension.identifier));
-			if (!isExtensionRunning && !isEnabled && this.extensionEnablementService.canChangeEnablement(this.extension.local)) {
-				this.class = DisabledLabelAction.Class;
-				this.label = localize('disabled by user', "This extension is disabled by the user.");
-				return;
+
+			if (isEnabled && isRunning) {
+				if (this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer) {
+					if (this.extension.server === this.extensionManagementServerService.remoteExtensionManagementServer) {
+						return localize('extension enabled on remote', "Extension is enabled on '{0}'", this.extension.server.label);
+					}
+				}
+				if (this.extension.enablementState === EnablementState.EnabledGlobally) {
+					return localize('globally enabled', "This extension is enabled globally.");
+				}
+				if (this.extension.enablementState === EnablementState.EnabledWorkspace) {
+					return localize('workspace enabled', "This extension is enabled for this workspace by the user.");
+				}
+			}
+
+			if (!isEnabled && !isRunning) {
+				if (this.extension.enablementState === EnablementState.DisabledGlobally) {
+					return localize('globally disabled', "This extension is disabled globally by the user.");
+				}
+				if (this.extension.enablementState === EnablementState.DisabledWorkspace) {
+					return localize('workspace disabled', "This extension is disabled for this workspace by the user.");
+				}
 			}
 		}
+		return '';
 	}
 
 	run(): Promise<any> {
@@ -2807,6 +2817,7 @@ export class InstallVSIXAction extends Action {
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IWindowService private readonly windowService: IWindowService,
+		@IFileDialogService private readonly fileDialogService: IFileDialogService,
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
@@ -2814,17 +2825,17 @@ export class InstallVSIXAction extends Action {
 	}
 
 	run(): Promise<any> {
-		return Promise.resolve(this.windowService.showOpenDialog({
+		return Promise.resolve(this.fileDialogService.showOpenDialog({
 			title: localize('installFromVSIX', "Install from VSIX"),
 			filters: [{ name: 'VSIX Extensions', extensions: ['vsix'] }],
-			properties: ['openFile'],
-			buttonLabel: mnemonicButtonLabel(localize({ key: 'installButton', comment: ['&& denotes a mnemonic'] }, "&&Install"))
+			canSelectFiles: true,
+			openLabel: mnemonicButtonLabel(localize({ key: 'installButton', comment: ['&& denotes a mnemonic'] }, "&&Install"))
 		})).then(result => {
 			if (!result) {
 				return Promise.resolve();
 			}
 
-			return Promise.all(result.map(vsix => this.extensionsWorkbenchService.install(URI.file(vsix))))
+			return Promise.all(result.map(vsix => this.extensionsWorkbenchService.install(vsix)))
 				.then(extensions => {
 					for (const extension of extensions) {
 						const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));
@@ -2999,6 +3010,119 @@ export class InstallSpecificVersionOfExtensionAction extends Action {
 	}
 }
 
+interface IExtensionPickItem extends IQuickPickItem {
+	extension?: IExtension;
+}
+
+export class InstallLocalExtensionsOnRemoteAction extends Action {
+
+	constructor(
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
+		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@INotificationService private readonly notificationService: INotificationService,
+		@IWindowService private readonly windowService: IWindowService,
+		@IProgressService private readonly progressService: IProgressService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService
+	) {
+		super('workbench.extensions.actions.installLocalExtensionsOnRemote');
+		this.update();
+		this._register(this.extensionsWorkbenchService.onChange(() => this.update()));
+	}
+
+	get label(): string {
+		return this.extensionManagementServerService.remoteExtensionManagementServer ?
+			localize('install local extensions', "Install Local Extensions on {0}", this.extensionManagementServerService.remoteExtensionManagementServer.label) : '';
+	}
+
+	private update(): void {
+		this.enabled = this.getLocalExtensionsToInstall().length > 0;
+	}
+
+	private getLocalExtensionsToInstall(): IExtension[] {
+		return this.extensionsWorkbenchService.local.filter(extension => {
+			const action = this.instantiationService.createInstance(RemoteInstallAction);
+			action.extension = extension;
+			return action.enabled;
+		});
+	}
+
+	async run(): Promise<void> {
+		this.selectAndInstallLocalExtensions();
+		return Promise.resolve();
+	}
+
+	private selectAndInstallLocalExtensions(): void {
+		const quickPick = this.quickInputService.createQuickPick<IExtensionPickItem>();
+		quickPick.busy = true;
+		const disposable = quickPick.onDidAccept(() => {
+			disposable.dispose();
+			quickPick.hide();
+			quickPick.dispose();
+			this.onDidAccept(quickPick.selectedItems);
+		});
+		quickPick.show();
+		const localExtensionsToInstall = this.getLocalExtensionsToInstall();
+		quickPick.busy = false;
+		if (localExtensionsToInstall.length) {
+			quickPick.placeholder = localize('select extensions to install', "Select extensions to install");
+			quickPick.canSelectMany = true;
+			localExtensionsToInstall.sort((e1, e2) => e1.displayName.localeCompare(e2.displayName));
+			quickPick.items = localExtensionsToInstall.map<IExtensionPickItem>(extension => ({ extension, label: extension.displayName, description: extension.version }));
+		} else {
+			quickPick.hide();
+			quickPick.dispose();
+			this.notificationService.notify({
+				severity: Severity.Info,
+				message: localize('no local extensions', "There are no extensions to install.")
+			});
+		}
+	}
+
+	private onDidAccept(selectedItems: ReadonlyArray<IExtensionPickItem>): void {
+		if (selectedItems.length) {
+			const localExtensionsToInstall = selectedItems.filter(r => !!r.extension).map(r => r.extension!);
+			if (localExtensionsToInstall.length) {
+				this.progressService.withProgress(
+					{
+						location: ProgressLocation.Notification,
+						title: localize('installing extensions', "Installing Extensions...")
+					},
+					() => this.installLocalExtensions(localExtensionsToInstall));
+			}
+		}
+	}
+
+	private async installLocalExtensions(localExtensionsToInstall: IExtension[]): Promise<void> {
+		const galleryExtensions: IGalleryExtension[] = [];
+		const vsixs: URI[] = [];
+		await Promise.all(localExtensionsToInstall.map(async extension => {
+			if (this.extensionGalleryService.isEnabled()) {
+				const gallery = await this.extensionGalleryService.getCompatibleExtension(extension.identifier, extension.version);
+				if (gallery) {
+					galleryExtensions.push(gallery);
+					return;
+				}
+			}
+			const vsix = await this.extensionManagementServerService.localExtensionManagementServer!.extensionManagementService.zip(extension.local!);
+			vsixs.push(vsix);
+		}));
+
+		await Promise.all(galleryExtensions.map(gallery => this.extensionManagementServerService.remoteExtensionManagementServer!.extensionManagementService.installFromGallery(gallery)));
+		await Promise.all(vsixs.map(vsix => this.extensionManagementServerService.remoteExtensionManagementServer!.extensionManagementService.install(vsix)));
+
+		this.notificationService.notify({
+			severity: Severity.Info,
+			message: localize('finished installing', "Completed installing the extensions. Please reload the window now."),
+			actions: {
+				primary: [new Action('realod', localize('reload', "Realod Window"), '', true,
+					() => this.windowService.reloadWindow())]
+			}
+		});
+	}
+}
+
 CommandsRegistry.registerCommand('workbench.extensions.action.showExtensionsForLanguage', function (accessor: ServicesAccessor, fileExtension: string) {
 	const viewletService = accessor.get(IViewletService);
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
index cbb9f190f03..3d9bf40bf98 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
@@ -13,7 +13,7 @@ import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging';
 import { Event } from 'vs/base/common/event';
 import { domEvent } from 'vs/base/browser/event';
 import { IExtension, ExtensionContainers, ExtensionState, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
-import { InstallAction, UpdateAction, ManageExtensionAction, ReloadAction, MaliciousStatusLabelAction, ExtensionActionViewItem, StatusLabelAction, RemoteInstallAction, SystemDisabledWarningAction, DisabledLabelAction, LocalInstallAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
+import { InstallAction, UpdateAction, ManageExtensionAction, ReloadAction, MaliciousStatusLabelAction, ExtensionActionViewItem, StatusLabelAction, RemoteInstallAction, SystemDisabledWarningAction, ExtensionToolTipAction, LocalInstallAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { Label, RatingsWidget, InstallCountWidget, RecommendationWidget, RemoteBadgeWidget, TooltipWidget } from 'vs/workbench/contrib/extensions/browser/extensionsWidgets';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -102,8 +102,8 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 			systemDisabledWarningAction,
 			this.instantiationService.createInstance(ManageExtensionAction)
 		];
-		const disabledLabelAction = this.instantiationService.createInstance(DisabledLabelAction, systemDisabledWarningAction);
-		const tooltipWidget = this.instantiationService.createInstance(TooltipWidget, root, disabledLabelAction, recommendationWidget, reloadAction);
+		const extensionTooltipAction = this.instantiationService.createInstance(ExtensionToolTipAction, systemDisabledWarningAction, reloadAction);
+		const tooltipWidget = this.instantiationService.createInstance(TooltipWidget, root, extensionTooltipAction, recommendationWidget);
 		const widgets = [
 			recommendationWidget,
 			iconRemoteBadgeWidget,
@@ -113,10 +113,10 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 			this.instantiationService.createInstance(InstallCountWidget, installCount, true),
 			this.instantiationService.createInstance(RatingsWidget, ratings, true)
 		];
-		const extensionContainers: ExtensionContainers = this.instantiationService.createInstance(ExtensionContainers, [...actions, ...widgets, disabledLabelAction]);
+		const extensionContainers: ExtensionContainers = this.instantiationService.createInstance(ExtensionContainers, [...actions, ...widgets, extensionTooltipAction]);
 
 		actionbar.push(actions, actionOptions);
-		const disposables = combinedDisposable(...actions, ...widgets, actionbar, extensionContainers, disabledLabelAction);
+		const disposables = combinedDisposable(...actions, ...widgets, actionbar, extensionContainers, extensionTooltipAction);
 
 		return {
 			root, element, icon, name, installCount, ratings, author, description, disposables: [disposables], actionbar,
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index 9d24e8584de..9bed184ac05 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -18,11 +18,11 @@ import { append, $, addClass, toggleClass, Dimension } from 'vs/base/browser/dom
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, ExtensionState, AutoUpdateConfigurationKey, ShowRecommendationsOnlyOnDemandKey, CloseExtensionDetailsOnViewChangeKey, VIEW_CONTAINER } from '../common/extensions';
+import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, AutoUpdateConfigurationKey, ShowRecommendationsOnlyOnDemandKey, CloseExtensionDetailsOnViewChangeKey, VIEW_CONTAINER } from '../common/extensions';
 import {
 	ShowEnabledExtensionsAction, ShowInstalledExtensionsAction, ShowRecommendedExtensionsAction, ShowPopularExtensionsAction, ShowDisabledExtensionsAction,
 	ShowOutdatedExtensionsAction, ClearExtensionsInputAction, ChangeSortAction, UpdateAllAction, CheckForUpdatesAction, DisableAllAction, EnableAllAction,
-	EnableAutoUpdateAction, DisableAutoUpdateAction, ShowBuiltInExtensionsAction, InstallVSIXAction
+	EnableAutoUpdateAction, DisableAutoUpdateAction, ShowBuiltInExtensionsAction, InstallVSIXAction, InstallLocalExtensionsOnRemoteAction
 } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
@@ -32,7 +32,7 @@ import { OpenGlobalSettingsAction } from 'vs/workbench/contrib/preferences/brows
 import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import Severity from 'vs/base/common/severity';
-import { IActivityService, ProgressBadge, NumberBadge } from 'vs/workbench/services/activity/common/activity';
+import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IViewsRegistry, IViewDescriptor, Extensions } from 'vs/workbench/common/views';
@@ -55,7 +55,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ViewContainerViewlet } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { RemoteAuthorityContext } from 'vs/workbench/browser/contextkeys';
+import { RemoteNameContext } from 'vs/workbench/browser/contextkeys';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { MementoObject } from 'vs/workbench/common/memento';
 
@@ -144,7 +144,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 			id,
 			name: viewIdNameMappings[id],
 			ctorDescriptor: { ctor: EnabledExtensionsView },
-			when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.has('hasInstalledExtensions'), RemoteAuthorityContext.isEqualTo('')),
+			when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.has('hasInstalledExtensions'), RemoteNameContext.isEqualTo('')),
 			weight: 40,
 			canToggleVisibility: true,
 			order: 1
@@ -159,7 +159,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 			id,
 			name: viewIdNameMappings[id],
 			ctorDescriptor: { ctor: DisabledExtensionsView },
-			when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.has('hasInstalledExtensions'), RemoteAuthorityContext.isEqualTo('')),
+			when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.has('hasInstalledExtensions'), RemoteNameContext.isEqualTo('')),
 			weight: 10,
 			canToggleVisibility: true,
 			order: 3,
@@ -208,7 +208,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 			id: `extensions.${server.authority}.default`,
 			get name() { return getInstalledViewName(); },
 			ctorDescriptor: { ctor: ServerExtensionsView, arguments: [server, EventOf.map<void, string>(onDidChangeServerLabel, () => getInstalledViewName())] },
-			when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.has('hasInstalledExtensions'), RemoteAuthorityContext.notEqualsTo('')),
+			when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.has('hasInstalledExtensions'), RemoteNameContext.notEqualsTo('')),
 			weight: 40,
 			order: 1
 		}];
@@ -348,6 +348,7 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
+		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IViewletService private readonly viewletService: IViewletService,
 		@IThemeService themeService: IThemeService,
@@ -477,6 +478,7 @@ export class ExtensionsViewlet extends ViewContainerViewlet implements IExtensio
 				this.instantiationService.createInstance(CheckForUpdatesAction, CheckForUpdatesAction.ID, CheckForUpdatesAction.LABEL),
 				...(this.configurationService.getValue(AutoUpdateConfigurationKey) ? [this.instantiationService.createInstance(DisableAutoUpdateAction, DisableAutoUpdateAction.ID, DisableAutoUpdateAction.LABEL)] : [this.instantiationService.createInstance(UpdateAllAction, UpdateAllAction.ID, UpdateAllAction.LABEL), this.instantiationService.createInstance(EnableAutoUpdateAction, EnableAutoUpdateAction.ID, EnableAutoUpdateAction.LABEL)]),
 				this.instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL),
+				...(this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer ? [this.instantiationService.createInstance(InstallLocalExtensionsOnRemoteAction)] : []),
 				new Separator(),
 				this.instantiationService.createInstance(DisableAllAction, DisableAllAction.ID, DisableAllAction.LABEL),
 				this.instantiationService.createInstance(EnableAllAction, EnableAllAction.ID, EnableAllAction.LABEL)
@@ -629,11 +631,6 @@ export class StatusUpdater extends Disposable implements IWorkbenchContribution
 	private onServiceChange(): void {
 		this.badgeHandle.clear();
 
-		if (this.extensionsWorkbenchService.local.some(e => e.state === ExtensionState.Installing)) {
-			this.badgeHandle.value = this.activityService.showActivity(VIEWLET_ID, new ProgressBadge(() => localize('extensions', "Extensions")), 'extensions-badge progress-badge');
-			return;
-		}
-
 		const outdated = this.extensionsWorkbenchService.outdated.reduce((r, e) => r + (this.extensionEnablementService.isEnabled(e.local!) ? 1 : 0), 0);
 		if (outdated > 0) {
 			const badge = new NumberBadge(outdated, n => localize('outdatedExtensions', '{0} Outdated Extensions', n));
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
index fd3ec77d79d..e27cc72e7d1 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
@@ -5,13 +5,13 @@
 
 import 'vs/css!./media/extensionsWidgets';
 import { Disposable, toDisposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IExtension, IExtensionsWorkbenchService, IExtensionContainer, ExtensionState } from '../common/extensions';
+import { IExtension, IExtensionsWorkbenchService, IExtensionContainer } from 'vs/workbench/contrib/extensions/common/extensions';
 import { append, $, addClass } from 'vs/base/browser/dom';
 import * as platform from 'vs/base/common/platform';
 import { localize } from 'vs/nls';
 import { IExtensionTipsService, IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { extensionButtonProminentBackground, extensionButtonProminentForeground, DisabledLabelAction, ReloadAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
+import { extensionButtonProminentBackground, extensionButtonProminentForeground, ExtensionToolTipAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { EXTENSION_BADGE_REMOTE_BACKGROUND, EXTENSION_BADGE_REMOTE_FOREGROUND } from 'vs/workbench/common/theme';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -145,16 +145,13 @@ export class TooltipWidget extends ExtensionWidget {
 
 	constructor(
 		private readonly parent: HTMLElement,
-		private readonly disabledLabelAction: DisabledLabelAction,
+		private readonly tooltipAction: ExtensionToolTipAction,
 		private readonly recommendationWidget: RecommendationWidget,
-		private readonly reloadAction: ReloadAction,
-		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
 		@ILabelService private readonly labelService: ILabelService
 	) {
 		super();
 		this._register(Event.any<any>(
-			this.disabledLabelAction.onDidChange,
-			this.reloadAction.onDidChange,
+			this.tooltipAction.onDidChange,
 			this.recommendationWidget.onDidChangeTooltip,
 			this.labelService.onDidChangeFormatters
 		)(() => this.render()));
@@ -173,17 +170,8 @@ export class TooltipWidget extends ExtensionWidget {
 		if (!this.extension) {
 			return '';
 		}
-		if (this.reloadAction.enabled) {
-			return this.reloadAction.tooltip;
-		}
-		if (this.disabledLabelAction.label) {
-			return this.disabledLabelAction.label;
-		}
-		if (this.extension.local && this.extension.state === ExtensionState.Installed) {
-			if (this.extension.server === this.extensionManagementServerService.remoteExtensionManagementServer) {
-				return localize('extension enabled on remote', "Extension is enabled on '{0}'", this.extension.server.label);
-			}
-			return localize('extension enabled locally', "Extension is enabled locally.");
+		if (this.tooltipAction.tooltip) {
+			return this.tooltipAction.tooltip;
 		}
 		return this.recommendationWidget.tooltip;
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index c0e396c38b4..7ddf7c7fa70 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -406,7 +406,9 @@ class Extensions extends Disposable {
 		const installingExtension = gallery ? this.installing.filter(e => areSameExtensions(e.identifier, gallery.identifier))[0] : null;
 		this.installing = installingExtension ? this.installing.filter(e => e !== installingExtension) : this.installing;
 
-		let extension: Extension | undefined = installingExtension ? installingExtension : zipPath ? this.instantiationService.createInstance(Extension, this.stateProvider, this.server, local, undefined) : undefined;
+		let extension: Extension | undefined = installingExtension ? installingExtension
+			: (zipPath || local) ? this.instantiationService.createInstance(Extension, this.stateProvider, this.server, local, undefined)
+				: undefined;
 		if (extension) {
 			if (local) {
 				const installed = this.installed.filter(e => areSameExtensions(e.identifier, extension!.identifier))[0];
@@ -534,6 +536,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			this.resetIgnoreAutoUpdateExtensions();
 			this.eventuallySyncWithGallery(true);
 		});
+
+		this._register(this.onChange(() => this.updateActivity()));
 	}
 
 	get local(): IExtension[] {
@@ -1023,6 +1027,21 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return this._extensionAllowedBadgeProviders;
 	}
 
+	private _activityCallBack: (() => void) | null = null;
+	private updateActivity(): void {
+		if ((this.localExtensions && this.localExtensions.local.some(e => e.state === ExtensionState.Installing || e.state === ExtensionState.Uninstalling))
+			|| (this.remoteExtensions && this.remoteExtensions.local.some(e => e.state === ExtensionState.Installing || e.state === ExtensionState.Uninstalling))) {
+			if (!this._activityCallBack) {
+				this.progressService.withProgress({ location: ProgressLocation.Extensions }, () => new Promise(c => this._activityCallBack = c));
+			}
+		} else {
+			if (this._activityCallBack) {
+				this._activityCallBack();
+			}
+			this._activityCallBack = null;
+		}
+	}
+
 	private onError(err: any): void {
 		if (isPromiseCanceledError(err)) {
 			return;
diff --git a/src/vs/workbench/contrib/extensions/browser/remoteExtensionsInstaller.ts b/src/vs/workbench/contrib/extensions/browser/remoteExtensionsInstaller.ts
new file mode 100644
index 00000000000..19e4a47c99c
--- /dev/null
+++ b/src/vs/workbench/contrib/extensions/browser/remoteExtensionsInstaller.ts
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { localize } from 'vs/nls';
+import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { InstallLocalExtensionsOnRemoteAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
+
+export class RemoteExtensionsInstaller extends Disposable implements IWorkbenchContribution {
+
+	constructor(
+		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
+		@ILabelService labelService: ILabelService,
+		@IInstantiationService instantiationService: IInstantiationService
+	) {
+		super();
+		if (this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer) {
+			const installLocalExtensionsOnRemoteAction = instantiationService.createInstance(InstallLocalExtensionsOnRemoteAction);
+			CommandsRegistry.registerCommand('workbench.extensions.installLocalExtensions', () => installLocalExtensionsOnRemoteAction.run());
+			let disposable = Disposable.None;
+			const appendMenuItem = () => {
+				disposable.dispose();
+				disposable = MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+					command: {
+						id: 'workbench.extensions.installLocalExtensions',
+						category: localize('extensions', "Extensions"),
+						title: installLocalExtensionsOnRemoteAction.label
+					}
+				});
+			};
+			appendMenuItem();
+			this._register(labelService.onDidChangeFormatters(e => appendMenuItem()));
+			this._register(toDisposable(() => disposable.dispose()));
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts
index 1366ea7ebd8..1cc01b85802 100644
--- a/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -405,7 +405,7 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 			multipleSelectionSupport: false,
 			setRowLineHeight: false,
 			horizontalScrolling: false
-		}) as WorkbenchList<IRuntimeExtension>;
+		});
 
 		this._list.splice(0, this._list.length, this._elements || undefined);
 
diff --git a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
index 5c4b51aa788..2334ecebeec 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
@@ -45,6 +45,8 @@ import { IProductService } from 'vs/platform/product/common/product';
 import { Schemas } from 'vs/base/common/network';
 import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { IProgressService } from 'vs/platform/progress/common/progress';
+import { ProgressService } from 'vs/workbench/services/progress/browser/progressService';
 
 suite('ExtensionsActions Test', () => {
 
@@ -69,6 +71,7 @@ suite('ExtensionsActions Test', () => {
 
 		instantiationService.stub(IWorkspaceContextService, new TestContextService());
 		instantiationService.stub(IConfigurationService, new TestConfigurationService());
+		instantiationService.stub(IProgressService, ProgressService);
 
 		instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService);
 		instantiationService.stub(ISharedProcessService, TestSharedProcessService);
@@ -1063,37 +1066,39 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test ReloadAction when extension state is installing', () => {
+	test('Test ReloadAction when extension state is installing', async () => {
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-		return workbenchService.queryGallery(CancellationToken.None)
-			.then((paged) => {
-				testObject.extension = paged.firstPage[0];
-				installEvent.fire({ identifier: gallery.identifier, gallery });
+		const paged = await workbenchService.queryGallery(CancellationToken.None);
+		testObject.extension = paged.firstPage[0];
+		installEvent.fire({ identifier: gallery.identifier, gallery });
 
-				assert.ok(!testObject.enabled);
-			});
+		assert.ok(!testObject.enabled);
 	});
 
-	test('Test ReloadAction when extension state is uninstalling', () => {
+	test('Test ReloadAction when extension state is uninstalling', async () => {
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
-			.then(extensions => {
-				testObject.extension = extensions[0];
-				uninstallEvent.fire(local.identifier);
-				assert.ok(!testObject.enabled);
-			});
+		const extensions = await instantiationService.get(IExtensionsWorkbenchService).queryLocal();
+		testObject.extension = extensions[0];
+		uninstallEvent.fire(local.identifier);
+		assert.ok(!testObject.enabled);
 	});
 
 	test('Test ReloadAction when extension is newly installed', async () => {
-		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ identifier: new ExtensionIdentifier('pub.b'), extensionLocation: URI.file('pub.b') }]);
+		const onDidChangeExtensionsEmitter: Emitter<void> = new Emitter<void>();
+		const runningExtensions = [{ identifier: new ExtensionIdentifier('pub.b'), extensionLocation: URI.file('pub.b') }];
+		instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
+			getExtensions: () => Promise.resolve(runningExtensions),
+			onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
+			canAddExtension: (extension) => false
+		});
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 		const gallery = aGalleryExtension('a');
@@ -1103,34 +1108,50 @@ suite('ExtensionsActions Test', () => {
 		testObject.extension = paged.firstPage[0];
 		assert.ok(!testObject.enabled);
 
-		return new Promise(c => {
-			testObject.onDidChange(() => {
-				if (testObject.enabled && testObject.tooltip === 'Please reload Visual Studio Code to enable this extension.') {
-					c();
-				}
-			});
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			didInstallEvent.fire({ identifier: gallery.identifier, gallery, operation: InstallOperation.Install, local: aLocalExtension('a', gallery, gallery) });
-		});
+		installEvent.fire({ identifier: gallery.identifier, gallery });
+		didInstallEvent.fire({ identifier: gallery.identifier, gallery, operation: InstallOperation.Install, local: aLocalExtension('a', gallery, gallery) });
+		assert.ok(testObject.enabled);
+		assert.equal(testObject.tooltip, 'Please reload Visual Studio Code to enable this extension.');
 	});
 
-	test('Test ReloadAction when extension is installed and uninstalled', () => {
+	test('Test ReloadAction when extension is newly installed and reload is not required', async () => {
+		const onDidChangeExtensionsEmitter: Emitter<void> = new Emitter<void>();
+		const runningExtensions = [{ identifier: new ExtensionIdentifier('pub.b'), extensionLocation: URI.file('pub.b') }];
+		instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
+			getExtensions: () => Promise.resolve(runningExtensions),
+			onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
+			canAddExtension: (extension) => true
+		});
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		const gallery = aGalleryExtension('a');
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
+
+		const paged = await instantiationService.get(IExtensionsWorkbenchService).queryGallery(CancellationToken.None);
+		testObject.extension = paged.firstPage[0];
+		assert.ok(!testObject.enabled);
+
+		installEvent.fire({ identifier: gallery.identifier, gallery });
+		didInstallEvent.fire({ identifier: gallery.identifier, gallery, operation: InstallOperation.Install, local: aLocalExtension('a', gallery, gallery) });
+		assert.ok(!testObject.enabled);
+	});
+
+	test('Test ReloadAction when extension is installed and uninstalled', async () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ identifier: new ExtensionIdentifier('pub.b'), extensionLocation: URI.file('pub.b') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-		return instantiationService.get(IExtensionsWorkbenchService).queryGallery(CancellationToken.None)
-			.then((paged) => {
-				testObject.extension = paged.firstPage[0];
-				const identifier = gallery.identifier;
-				installEvent.fire({ identifier, gallery });
-				didInstallEvent.fire({ identifier, gallery, operation: InstallOperation.Install, local: aLocalExtension('a', gallery, { identifier }) });
-				uninstallEvent.fire(identifier);
-				didUninstallEvent.fire({ identifier });
+		const paged = await instantiationService.get(IExtensionsWorkbenchService).queryGallery(CancellationToken.None);
 
-				assert.ok(!testObject.enabled);
-			});
+		testObject.extension = paged.firstPage[0];
+		const identifier = gallery.identifier;
+		installEvent.fire({ identifier, gallery });
+		didInstallEvent.fire({ identifier, gallery, operation: InstallOperation.Install, local: aLocalExtension('a', gallery, { identifier }) });
+		uninstallEvent.fire(identifier);
+		didUninstallEvent.fire({ identifier });
+
+		assert.ok(!testObject.enabled);
 	});
 
 	test('Test ReloadAction when extension is uninstalled', async () => {
@@ -1142,36 +1163,49 @@ suite('ExtensionsActions Test', () => {
 		const extensions = await instantiationService.get(IExtensionsWorkbenchService).queryLocal();
 		testObject.extension = extensions[0];
 
-		return new Promise(c => {
-			testObject.onDidChange(() => {
-				if (testObject.enabled && testObject.tooltip === 'Please reload Visual Studio Code to complete the uninstallation of this extension.') {
-					c();
-				}
-			});
-			uninstallEvent.fire(local.identifier);
-			didUninstallEvent.fire({ identifier: local.identifier });
-		});
+		uninstallEvent.fire(local.identifier);
+		didUninstallEvent.fire({ identifier: local.identifier });
+		assert.ok(testObject.enabled);
+		assert.equal(testObject.tooltip, 'Please reload Visual Studio Code to complete the uninstallation of this extension.');
 	});
 
-	test('Test ReloadAction when extension is uninstalled and installed', () => {
+	test('Test ReloadAction when extension is uninstalled and can be removed', async () => {
+		const local = aLocalExtension('a');
+		instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
+			getExtensions: () => Promise.resolve([ExtensionsActions.toExtensionDescription(local)]),
+			onDidChangeExtensions: new Emitter<void>().event,
+			canRemoveExtension: (extension) => true,
+			canAddExtension: (extension) => true
+		});
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		const extensions = await instantiationService.get(IExtensionsWorkbenchService).queryLocal();
+		testObject.extension = extensions[0];
+
+		uninstallEvent.fire(local.identifier);
+		didUninstallEvent.fire({ identifier: local.identifier });
+		assert.ok(!testObject.enabled);
+	});
+
+	test('Test ReloadAction when extension is uninstalled and installed', async () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ identifier: new ExtensionIdentifier('pub.a'), version: '1.0.0', extensionLocation: URI.file('pub.a') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
-			.then(extensions => {
-				testObject.extension = extensions[0];
-				uninstallEvent.fire(local.identifier);
-				didUninstallEvent.fire({ identifier: local.identifier });
+		const extensions = await instantiationService.get(IExtensionsWorkbenchService).queryLocal();
 
-				const gallery = aGalleryExtension('a');
-				const identifier = gallery.identifier;
-				installEvent.fire({ identifier, gallery });
-				didInstallEvent.fire({ identifier, gallery, operation: InstallOperation.Install, local });
+		testObject.extension = extensions[0];
+		uninstallEvent.fire(local.identifier);
+		didUninstallEvent.fire({ identifier: local.identifier });
 
-				assert.ok(!testObject.enabled);
-			});
+		const gallery = aGalleryExtension('a');
+		const identifier = gallery.identifier;
+		installEvent.fire({ identifier, gallery });
+		didInstallEvent.fire({ identifier, gallery, operation: InstallOperation.Install, local });
+
+		assert.ok(!testObject.enabled);
 	});
 
 	test('Test ReloadAction when extension is updated while running', async () => {
@@ -1196,128 +1230,103 @@ suite('ExtensionsActions Test', () => {
 		});
 	});
 
-	test('Test ReloadAction when extension is updated when not running', () => {
+	test('Test ReloadAction when extension is updated when not running', async () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ identifier: new ExtensionIdentifier('pub.b'), extensionLocation: URI.file('pub.b') }]);
 		const local = aLocalExtension('a', { version: '1.0.1' });
-		return instantiationService.get(IExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally)
-			.then(() => {
-				const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
-				instantiationService.createInstance(ExtensionContainers, [testObject]);
-				const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-				return workbenchService.queryLocal()
-					.then(extensions => {
-						testObject.extension = extensions[0];
+		await instantiationService.get(IExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally);
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		const extensions = await workbenchService.queryLocal();
+		testObject.extension = extensions[0];
 
-						const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.2' });
-						installEvent.fire({ identifier: gallery.identifier, gallery });
-						didInstallEvent.fire({ identifier: gallery.identifier, gallery, operation: InstallOperation.Update, local: aLocalExtension('a', gallery, gallery) });
+		const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.2' });
+		installEvent.fire({ identifier: gallery.identifier, gallery });
+		didInstallEvent.fire({ identifier: gallery.identifier, gallery, operation: InstallOperation.Update, local: aLocalExtension('a', gallery, gallery) });
 
-						assert.ok(!testObject.enabled);
-					});
-			});
+		assert.ok(!testObject.enabled);
 	});
 
-	test('Test ReloadAction when extension is disabled when running', () => {
+	test('Test ReloadAction when extension is disabled when running', async () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ identifier: new ExtensionIdentifier('pub.a'), extensionLocation: URI.file('pub.a') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 		const local = aLocalExtension('a');
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		return workbenchService.queryLocal().then(extensions => {
-			testObject.extension = extensions[0];
-			return workbenchService.setEnablement(extensions[0], EnablementState.DisabledGlobally)
-				.then(() => testObject.update())
-				.then(() => {
-					assert.ok(testObject.enabled);
-					assert.equal('Please reload Visual Studio Code to disable this extension.', testObject.tooltip);
-				});
-		});
+		const extensions = await workbenchService.queryLocal();
+		testObject.extension = extensions[0];
+		await workbenchService.setEnablement(extensions[0], EnablementState.DisabledGlobally);
+		await testObject.update();
+
+		assert.ok(testObject.enabled);
+		assert.equal('Please reload Visual Studio Code to disable this extension.', testObject.tooltip);
 	});
 
-	test('Test ReloadAction when extension enablement is toggled when running', () => {
+	test('Test ReloadAction when extension enablement is toggled when running', async () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ identifier: new ExtensionIdentifier('pub.a'), version: '1.0.0', extensionLocation: URI.file('pub.a') }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 		const local = aLocalExtension('a');
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		return workbenchService.queryLocal().
-			then(extensions => {
-				testObject.extension = extensions[0];
-				return workbenchService.setEnablement(extensions[0], EnablementState.DisabledGlobally)
-					.then(() => workbenchService.setEnablement(extensions[0], EnablementState.EnabledGlobally))
-					.then(() => assert.ok(!testObject.enabled));
-			});
+		const extensions = await workbenchService.queryLocal();
+		testObject.extension = extensions[0];
+		await workbenchService.setEnablement(extensions[0], EnablementState.DisabledGlobally);
+		await workbenchService.setEnablement(extensions[0], EnablementState.EnabledGlobally);
+		assert.ok(!testObject.enabled);
 	});
 
-	test('Test ReloadAction when extension is enabled when not running', () => {
+	test('Test ReloadAction when extension is enabled when not running', async () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ identifier: new ExtensionIdentifier('pub.b'), extensionLocation: URI.file('pub.b') }]);
 		const local = aLocalExtension('a');
-		return instantiationService.get(IExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally)
-			.then(() => {
-				const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
-				instantiationService.createInstance(ExtensionContainers, [testObject]);
-				const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-				return workbenchService.queryLocal()
-					.then(extensions => {
-						testObject.extension = extensions[0];
-						return workbenchService.setEnablement(extensions[0], EnablementState.EnabledGlobally)
-							.then(() => testObject.update())
-							.then(() => {
-								assert.ok(testObject.enabled);
-								assert.equal('Please reload Visual Studio Code to enable this extension.', testObject.tooltip);
-							});
-					});
-			});
+		await instantiationService.get(IExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally);
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		const extensions = await workbenchService.queryLocal();
+		testObject.extension = extensions[0];
+		await workbenchService.setEnablement(extensions[0], EnablementState.EnabledGlobally);
+		await testObject.update();
+		assert.ok(testObject.enabled);
+		assert.equal('Please reload Visual Studio Code to enable this extension.', testObject.tooltip);
 	});
 
-	test('Test ReloadAction when extension enablement is toggled when not running', () => {
+	test('Test ReloadAction when extension enablement is toggled when not running', async () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ identifier: new ExtensionIdentifier('pub.b'), extensionLocation: URI.file('pub.b') }]);
 		const local = aLocalExtension('a');
-		return instantiationService.get(IExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally)
-			.then(() => {
-				const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
-				instantiationService.createInstance(ExtensionContainers, [testObject]);
-				const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-				return workbenchService.queryLocal()
-					.then(extensions => {
-						testObject.extension = extensions[0];
-						return workbenchService.setEnablement(extensions[0], EnablementState.EnabledGlobally)
-							.then(() => workbenchService.setEnablement(extensions[0], EnablementState.DisabledGlobally))
-							.then(() => assert.ok(!testObject.enabled));
-					});
-			});
+		await instantiationService.get(IExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally);
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		const extensions = await workbenchService.queryLocal();
+		testObject.extension = extensions[0];
+		await workbenchService.setEnablement(extensions[0], EnablementState.EnabledGlobally);
+		await workbenchService.setEnablement(extensions[0], EnablementState.DisabledGlobally);
+		assert.ok(!testObject.enabled);
 	});
 
-	test('Test ReloadAction when extension is updated when not running and enabled', () => {
+	test('Test ReloadAction when extension is updated when not running and enabled', async () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ identifier: new ExtensionIdentifier('pub.b'), extensionLocation: URI.file('pub.b') }]);
 		const local = aLocalExtension('a', { version: '1.0.1' });
-		return instantiationService.get(IExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally)
-			.then(() => {
-				const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
-				instantiationService.createInstance(ExtensionContainers, [testObject]);
-				const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-				return workbenchService.queryLocal()
-					.then(extensions => {
-						testObject.extension = extensions[0];
+		await instantiationService.get(IExtensionEnablementService).setEnablement([local], EnablementState.DisabledGlobally);
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
+		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		const extensions = await workbenchService.queryLocal();
+		testObject.extension = extensions[0];
 
-						const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.2' });
-						installEvent.fire({ identifier: gallery.identifier, gallery });
-						didInstallEvent.fire({ identifier: gallery.identifier, gallery, operation: InstallOperation.Install, local: aLocalExtension('a', gallery, gallery) });
-						return workbenchService.setEnablement(extensions[0], EnablementState.EnabledGlobally)
-							.then(() => testObject.update())
-							.then(() => {
-								assert.ok(testObject.enabled);
-								assert.equal('Please reload Visual Studio Code to enable this extension.', testObject.tooltip);
-							});
-
-					});
-			});
+		const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.2' });
+		installEvent.fire({ identifier: gallery.identifier, gallery });
+		didInstallEvent.fire({ identifier: gallery.identifier, gallery, operation: InstallOperation.Install, local: aLocalExtension('a', gallery, gallery) });
+		await workbenchService.setEnablement(extensions[0], EnablementState.EnabledGlobally);
+		await testObject.update();
+		assert.ok(testObject.enabled);
+		assert.equal('Please reload Visual Studio Code to enable this extension.', testObject.tooltip);
 	});
 
 	test('Test ReloadAction when a localization extension is newly installed', async () => {
@@ -1352,6 +1361,146 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
+	test('Test ReloadAction when extension is not installed but extension from different server is installed and running', async () => {
+		// multi server setup
+		const gallery = aGalleryExtension('a');
+		const localExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file('pub.a') });
+		const remoteExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file('pub.a').with({ scheme: Schemas.vscodeRemote }) });
+		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService([localExtension]), createExtensionManagementService([remoteExtension]));
+		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
+		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
+		const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
+		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
+
+		const onDidChangeExtensionsEmitter: Emitter<void> = new Emitter<void>();
+		const runningExtensions = [ExtensionsActions.toExtensionDescription(remoteExtension)];
+		instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
+			getExtensions: () => Promise.resolve(runningExtensions),
+			onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
+			canAddExtension: (extension) => false
+		});
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
+
+		await workbenchService.queryGallery(CancellationToken.None);
+		const extensions = await workbenchService.queryLocal(extensionManagementServerService.localExtensionManagementServer!);
+		testObject.extension = extensions[0];
+		assert.ok(testObject.extension);
+		assert.ok(!testObject.enabled);
+	});
+
+	test('Test ReloadAction when extension is uninstalled but extension from different server is installed and running', async () => {
+		// multi server setup
+		const gallery = aGalleryExtension('a');
+		const localExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file('pub.a') });
+		const remoteExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file('pub.a').with({ scheme: Schemas.vscodeRemote }) });
+		const localExtensionManagementService = createExtensionManagementService([localExtension]);
+		const uninstallEvent = new Emitter<IExtensionIdentifier>();
+		const onDidUninstallEvent = new Emitter<{ identifier: IExtensionIdentifier }>();
+		localExtensionManagementService.onUninstallExtension = uninstallEvent.event;
+		localExtensionManagementService.onDidUninstallExtension = onDidUninstallEvent.event;
+		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, localExtensionManagementService, createExtensionManagementService([remoteExtension]));
+		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
+		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
+		const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
+		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
+
+		const onDidChangeExtensionsEmitter: Emitter<void> = new Emitter<void>();
+		const runningExtensions = [ExtensionsActions.toExtensionDescription(remoteExtension)];
+		instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
+			getExtensions: () => Promise.resolve(runningExtensions),
+			onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
+			canAddExtension: (extension) => false
+		});
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
+
+		await workbenchService.queryGallery(CancellationToken.None);
+		const extensions = await workbenchService.queryLocal(extensionManagementServerService.localExtensionManagementServer!);
+		testObject.extension = extensions[0];
+		assert.ok(testObject.extension);
+		assert.ok(!testObject.enabled);
+
+		uninstallEvent.fire(localExtension.identifier);
+		didUninstallEvent.fire({ identifier: localExtension.identifier });
+
+		assert.ok(!testObject.enabled);
+	});
+
+	test('Test ReloadAction when workspace extension is disabled on local server and installed in remote server', async () => {
+		// multi server setup
+		const gallery = aGalleryExtension('a');
+		const remoteExtensionManagementService = createExtensionManagementService([]);
+		const onDidInstallEvent = new Emitter<DidInstallExtensionEvent>();
+		remoteExtensionManagementService.onDidInstallExtension = onDidInstallEvent.event;
+		const localExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file('pub.a') });
+		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService([localExtension]), remoteExtensionManagementService);
+		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
+		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
+		const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
+		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
+
+		const onDidChangeExtensionsEmitter: Emitter<void> = new Emitter<void>();
+		instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
+			getExtensions: () => Promise.resolve([]),
+			onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
+			canAddExtension: (extension) => false
+		});
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
+
+		await workbenchService.queryGallery(CancellationToken.None);
+		const extensions = await workbenchService.queryLocal(extensionManagementServerService.localExtensionManagementServer!);
+		testObject.extension = extensions[0];
+		assert.ok(testObject.extension);
+		assert.ok(!testObject.enabled);
+
+		const remoteExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file('pub.a').with({ scheme: Schemas.vscodeRemote }) });
+		onDidInstallEvent.fire({ identifier: remoteExtension.identifier, local: remoteExtension, operation: InstallOperation.Install });
+
+		assert.ok(testObject.enabled);
+		assert.equal(testObject.tooltip, 'Please reload Visual Studio Code to enable this extension.');
+	});
+
+	test('Test ReloadAction when ui extension is disabled on remote server and installed in local server', async () => {
+		// multi server setup
+		const gallery = aGalleryExtension('a');
+		const localExtensionManagementService = createExtensionManagementService([]);
+		const onDidInstallEvent = new Emitter<DidInstallExtensionEvent>();
+		localExtensionManagementService.onDidInstallExtension = onDidInstallEvent.event;
+		const remoteExtension = aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file('pub.a').with({ scheme: Schemas.vscodeRemote }) });
+		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, localExtensionManagementService, createExtensionManagementService([remoteExtension]));
+		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
+		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
+		const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
+		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
+
+		const onDidChangeExtensionsEmitter: Emitter<void> = new Emitter<void>();
+		instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
+			getExtensions: () => Promise.resolve([]),
+			onDidChangeExtensions: onDidChangeExtensionsEmitter.event,
+			canAddExtension: (extension) => false
+		});
+		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
+
+		await workbenchService.queryGallery(CancellationToken.None);
+		const extensions = await workbenchService.queryLocal(extensionManagementServerService.remoteExtensionManagementServer!);
+		testObject.extension = extensions[0];
+		assert.ok(testObject.extension);
+		assert.ok(!testObject.enabled);
+
+		const localExtension = aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file('pub.a') });
+		onDidInstallEvent.fire({ identifier: localExtension.identifier, local: localExtension, operation: InstallOperation.Install });
+
+		assert.ok(testObject.enabled);
+		assert.equal(testObject.tooltip, 'Please reload Visual Studio Code to enable this extension.');
+	});
+
 	test('Test remote install action is enabled for local workspace extension', async () => {
 		// multi server setup
 		const localWorkspaceExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file(`pub.a`) });
@@ -1373,9 +1522,11 @@ suite('ExtensionsActions Test', () => {
 		assert.equal('extension-action prominent install', testObject.class);
 	});
 
-	test('Test remote install action when installing local workspace extension', async (done) => {
+	test('Test remote install action when installing local workspace extension', async () => {
 		// multi server setup
 		const remoteExtensionManagementService: IExtensionManagementService = createExtensionManagementService();
+		const onInstallExtension = new Emitter<InstallExtensionEvent>();
+		remoteExtensionManagementService.onInstallExtension = onInstallExtension.event;
 		const localWorkspaceExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file(`pub.a`) });
 		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService([localWorkspaceExtension]), remoteExtensionManagementService);
 		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
@@ -1384,7 +1535,8 @@ suite('ExtensionsActions Test', () => {
 		instantiationService.stub(IExtensionsWorkbenchService, workbenchService, 'open', undefined);
 		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
 
-		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: localWorkspaceExtension.identifier })));
+		const gallery = aGalleryExtension('a', { identifier: localWorkspaceExtension.identifier });
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.RemoteInstallAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 
@@ -1395,19 +1547,17 @@ suite('ExtensionsActions Test', () => {
 		assert.equal('Install on remote', testObject.label);
 		assert.equal('extension-action prominent install', testObject.class);
 
-		remoteExtensionManagementService.installFromGallery = () => new Promise<ILocalExtension>(c => c(aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file(`pub.a`) })));
-		const disposable = testObject.onDidChange(() => {
-			if (testObject.label === 'Installing' && testObject.enabled) {
-				disposable.dispose();
-				done();
-			}
-		});
-		testObject.run();
+		onInstallExtension.fire({ identifier: localWorkspaceExtension.identifier, gallery });
+		assert.ok(testObject.enabled);
+		assert.equal('Installing', testObject.label);
+		assert.equal('extension-action install installing', testObject.class);
 	});
 
-	test('Test remote install action when installing local workspace extension is finished', async (done) => {
+	test('Test remote install action when installing local workspace extension is finished', async () => {
 		// multi server setup
 		const remoteExtensionManagementService: IExtensionManagementService = createExtensionManagementService();
+		const onInstallExtension = new Emitter<InstallExtensionEvent>();
+		remoteExtensionManagementService.onInstallExtension = onInstallExtension.event;
 		const onDidInstallEvent = new Emitter<DidInstallExtensionEvent>();
 		remoteExtensionManagementService.onDidInstallExtension = onDidInstallEvent.event;
 		const localWorkspaceExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file(`pub.a`) });
@@ -1418,7 +1568,8 @@ suite('ExtensionsActions Test', () => {
 		instantiationService.stub(IExtensionsWorkbenchService, workbenchService, 'open', undefined);
 		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
 
-		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: localWorkspaceExtension.identifier })));
+		const gallery = aGalleryExtension('a', { identifier: localWorkspaceExtension.identifier });
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.RemoteInstallAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 
@@ -1429,19 +1580,14 @@ suite('ExtensionsActions Test', () => {
 		assert.equal('Install on remote', testObject.label);
 		assert.equal('extension-action prominent install', testObject.class);
 
-		const installedExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }) });
-		remoteExtensionManagementService.installFromGallery = () => new Promise<ILocalExtension>(c => c(installedExtension));
-		await testObject.run();
+		onInstallExtension.fire({ identifier: localWorkspaceExtension.identifier, gallery });
 		assert.ok(testObject.enabled);
-		assert.equal('Install on remote', testObject.label);
+		assert.equal('Installing', testObject.label);
+		assert.equal('extension-action install installing', testObject.class);
 
-		const disposable = testObject.onDidChange(() => {
-			if (testObject.label === 'Install on remote' && !testObject.enabled) {
-				disposable.dispose();
-				done();
-			}
-		});
+		const installedExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }) });
 		onDidInstallEvent.fire({ identifier: installedExtension.identifier, local: installedExtension, operation: InstallOperation.Install });
+		assert.ok(!testObject.enabled);
 	});
 
 	test('Test remote install action is enabled for disabled local workspace extension', async () => {
@@ -1585,7 +1731,7 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test remote install action is disabled for local workspace extension if it cannot be installed', async () => {
+	test('Test remote install action is enabled for local workspace extension if it has not gallery', async () => {
 		// multi server setup
 		const localWorkspaceExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file(`pub.a`) });
 		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService([localWorkspaceExtension]));
@@ -1598,6 +1744,25 @@ suite('ExtensionsActions Test', () => {
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.RemoteInstallAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 
+		const extensions = await workbenchService.queryLocal(extensionManagementServerService.localExtensionManagementServer!);
+		testObject.extension = extensions[0];
+		assert.ok(testObject.extension);
+		assert.ok(testObject.enabled);
+	});
+
+	test('Test remote install action is disabled for local workspace system extension', async () => {
+		// multi server setup
+		const localWorkspaceSystemExtension = aLocalExtension('a', { extensionKind: 'workspace' }, { location: URI.file(`pub.a`), type: ExtensionType.System });
+		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService([localWorkspaceSystemExtension]));
+		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
+		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
+		const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
+		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
+
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: localWorkspaceSystemExtension.identifier })));
+		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.RemoteInstallAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+
 		const extensions = await workbenchService.queryLocal(extensionManagementServerService.localExtensionManagementServer!);
 		testObject.extension = extensions[0];
 		assert.ok(testObject.extension);
@@ -1710,9 +1875,11 @@ suite('ExtensionsActions Test', () => {
 		assert.equal('extension-action prominent install', testObject.class);
 	});
 
-	test('Test local install action when installing remote ui extension', async (done) => {
+	test('Test local install action when installing remote ui extension', async () => {
 		// multi server setup
 		const localExtensionManagementService: IExtensionManagementService = createExtensionManagementService();
+		const onInstallExtension = new Emitter<InstallExtensionEvent>();
+		localExtensionManagementService.onInstallExtension = onInstallExtension.event;
 		const remoteUIExtension = aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }) });
 		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, localExtensionManagementService, createExtensionManagementService([remoteUIExtension]));
 		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
@@ -1721,7 +1888,8 @@ suite('ExtensionsActions Test', () => {
 		instantiationService.stub(IExtensionsWorkbenchService, workbenchService, 'open', undefined);
 		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
 
-		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: remoteUIExtension.identifier })));
+		const gallery = aGalleryExtension('a', { identifier: remoteUIExtension.identifier });
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.LocalInstallAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 
@@ -1732,19 +1900,17 @@ suite('ExtensionsActions Test', () => {
 		assert.equal('Install Locally', testObject.label);
 		assert.equal('extension-action prominent install', testObject.class);
 
-		localExtensionManagementService.installFromGallery = () => new Promise<ILocalExtension>(c => c(aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file(`pub.a`) })));
-		const disposable = testObject.onDidChange(() => {
-			if (testObject.label === 'Installing' && testObject.enabled) {
-				disposable.dispose();
-				done();
-			}
-		});
-		testObject.run();
+		onInstallExtension.fire({ identifier: remoteUIExtension.identifier, gallery });
+		assert.ok(testObject.enabled);
+		assert.equal('Installing', testObject.label);
+		assert.equal('extension-action install installing', testObject.class);
 	});
 
-	test('Test local install action when installing remote ui extension is finished', async (done) => {
+	test('Test local install action when installing remote ui extension is finished', async () => {
 		// multi server setup
 		const localExtensionManagementService: IExtensionManagementService = createExtensionManagementService();
+		const onInstallExtension = new Emitter<InstallExtensionEvent>();
+		localExtensionManagementService.onInstallExtension = onInstallExtension.event;
 		const onDidInstallEvent = new Emitter<DidInstallExtensionEvent>();
 		localExtensionManagementService.onDidInstallExtension = onDidInstallEvent.event;
 		const remoteUIExtension = aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }) });
@@ -1755,7 +1921,8 @@ suite('ExtensionsActions Test', () => {
 		instantiationService.stub(IExtensionsWorkbenchService, workbenchService, 'open', undefined);
 		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
 
-		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: remoteUIExtension.identifier })));
+		const gallery = aGalleryExtension('a', { identifier: remoteUIExtension.identifier });
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.LocalInstallAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 
@@ -1766,19 +1933,14 @@ suite('ExtensionsActions Test', () => {
 		assert.equal('Install Locally', testObject.label);
 		assert.equal('extension-action prominent install', testObject.class);
 
-		const installedExtension = aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file(`pub.a`) });
-		localExtensionManagementService.installFromGallery = () => new Promise<ILocalExtension>(c => c(installedExtension));
-		await testObject.run();
+		onInstallExtension.fire({ identifier: remoteUIExtension.identifier, gallery });
 		assert.ok(testObject.enabled);
-		assert.equal('Install Locally', testObject.label);
+		assert.equal('Installing', testObject.label);
+		assert.equal('extension-action install installing', testObject.class);
 
-		const disposable = testObject.onDidChange(() => {
-			if (testObject.label === 'Install Locally' && !testObject.enabled) {
-				disposable.dispose();
-				done();
-			}
-		});
+		const installedExtension = aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file(`pub.a`) });
 		onDidInstallEvent.fire({ identifier: installedExtension.identifier, local: installedExtension, operation: InstallOperation.Install });
+		assert.ok(!testObject.enabled);
 	});
 
 	test('Test local install action is enabled for disabled remote ui extension', async () => {
@@ -1925,7 +2087,7 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test local install action is disabled for remote UI extension if it cannot be installed', async () => {
+	test('Test local install action is enabled for remote UI extension if it has gallery', async () => {
 		// multi server setup
 		const remoteUIExtension = aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }) });
 		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService(), createExtensionManagementService([remoteUIExtension]));
@@ -1938,6 +2100,25 @@ suite('ExtensionsActions Test', () => {
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.LocalInstallAction);
 		instantiationService.createInstance(ExtensionContainers, [testObject]);
 
+		const extensions = await workbenchService.queryLocal(extensionManagementServerService.remoteExtensionManagementServer!);
+		testObject.extension = extensions[0];
+		assert.ok(testObject.extension);
+		assert.ok(testObject.enabled);
+	});
+
+	test('Test local install action is disabled for remote UI system extension', async () => {
+		// multi server setup
+		const remoteUISystemExtension = aLocalExtension('a', { extensionKind: 'ui' }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }), type: ExtensionType.System });
+		const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService(), createExtensionManagementService([remoteUISystemExtension]));
+		instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService);
+		instantiationService.stub(IExtensionEnablementService, new TestExtensionEnablementService(instantiationService));
+		const workbenchService: IExtensionsWorkbenchService = instantiationService.createInstance(ExtensionsWorkbenchService);
+		instantiationService.set(IExtensionsWorkbenchService, workbenchService);
+
+		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: remoteUISystemExtension.identifier })));
+		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.LocalInstallAction);
+		instantiationService.createInstance(ExtensionContainers, [testObject]);
+
 		const extensions = await workbenchService.queryLocal(extensionManagementServerService.remoteExtensionManagementServer!);
 		testObject.extension = extensions[0];
 		assert.ok(testObject.extension);
diff --git a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
index 302453edb56..81b51b791f6 100644
--- a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
+++ b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
@@ -66,6 +66,8 @@
 
 .explorer-viewlet .panel-header .count {
 	min-width: fit-content;
+	display: flex;
+	align-items: center;
 }
 
 .explorer-viewlet .panel-header .monaco-count-badge.hidden {
@@ -102,8 +104,9 @@
 }
 
 .explorer-viewlet .monaco-count-badge {
-	padding: 1px 6px;
+	padding: 1px 6px 2px;
 	margin-left: 6px;
+	min-height: auto;
 	border-radius: 0; /* goes better when ellipsis shows up on narrow sidebar */
 }
 
diff --git a/src/vs/workbench/contrib/files/browser/media/files-activity-bar.svg b/src/vs/workbench/contrib/files/browser/media/files-activity-bar.svg
index 09c943426e0..c109b13c3d2 100644
--- a/src/vs/workbench/contrib/files/browser/media/files-activity-bar.svg
+++ b/src/vs/workbench/contrib/files/browser/media/files-activity-bar.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.50001 0L18.5 3.57628e-07L23 4.5V16.5682L21.7046 18H17V22.5682L15.5682 24H3.5L2 22.5682L2 7.50001L3.5 6.00001L8.00001 5.99999V1.5L9.50001 0ZM17 1.5V6.00001H21.5L21.5 16.5H9.50001L9.50001 1.5L17 1.5ZM20.8787 4.5L18.5 2.12132V4.5H20.8787ZM8.00001 7.50001V16.5682L9.50001 18H15.5V22.5H3.5L3.5 7.50001H8.00001Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.50001 0L17.5 3.57628e-07L22 4.5V16.5682L20.7046 18H16V22.5682L14.5682 24H2.5L1 22.5682L1 7.50001L2.5 6.00001L7.00001 5.99999V1.5L8.50001 0ZM16 1.5V6.00001H20.5L20.5 16.5H8.50001L8.50001 1.5L16 1.5ZM19.8787 4.5L17.5 2.12132V4.5H19.8787ZM7.00001 7.50001V16.5682L8.50001 18H14.5V22.5H2.5L2.5 7.50001H7.00001Z" fill="white"/>
 </svg>
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
index ed5d11edf80..fe6751e85db 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -302,7 +302,7 @@ export class ExplorerView extends ViewletPanel {
 				sorter: this.instantiationService.createInstance(FileSorter),
 				dnd: this.instantiationService.createInstance(FileDragAndDrop),
 				autoExpandSingleChildren: true
-			}) as WorkbenchAsyncDataTree<ExplorerItem | ExplorerItem[], ExplorerItem, FuzzyScore>;
+			});
 		this._register(this.tree);
 
 		// Bind context keys
diff --git a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
index 31a5963340f..5ed1a09eb84 100644
--- a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
@@ -219,7 +219,7 @@ export class OpenEditorsView extends ViewletPanel {
 		], {
 				identityProvider: { getId: (element: OpenEditor | IEditorGroup) => element instanceof OpenEditor ? element.getId() : element.id.toString() },
 				dnd: new OpenEditorsDragAndDrop(this.instantiationService, this.editorGroupService)
-			}) as WorkbenchList<OpenEditor | IEditorGroup>;
+			});
 		this._register(this.list);
 		this._register(this.listLabels);
 
diff --git a/src/vs/workbench/contrib/files/common/explorerService.ts b/src/vs/workbench/contrib/files/common/explorerService.ts
index cb6d96bd1ff..9d0f177a77a 100644
--- a/src/vs/workbench/contrib/files/common/explorerService.ts
+++ b/src/vs/workbench/contrib/files/common/explorerService.ts
@@ -5,7 +5,7 @@
 
 import { Event, Emitter } from 'vs/base/common/event';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IExplorerService, IEditableData, IFilesConfiguration, SortOrder, SortOrderConfiguration } from 'vs/workbench/contrib/files/common/files';
 import { ExplorerItem, ExplorerModel } from 'vs/workbench/contrib/files/common/explorerModel';
 import { URI } from 'vs/base/common/uri';
@@ -36,7 +36,7 @@ export class ExplorerService implements IExplorerService {
 	private _onDidChangeEditable = new Emitter<ExplorerItem>();
 	private _onDidSelectResource = new Emitter<{ resource?: URI, reveal?: boolean }>();
 	private _onDidCopyItems = new Emitter<{ items: ExplorerItem[], cut: boolean, previouslyCutItems: ExplorerItem[] | undefined }>();
-	private disposables: IDisposable[] = [];
+	private readonly disposables = new DisposableStore();
 	private editable: { stat: ExplorerItem, data: IEditableData } | undefined;
 	private _sortOrder: SortOrder;
 	private cutItems: ExplorerItem[] | undefined;
@@ -88,18 +88,18 @@ export class ExplorerService implements IExplorerService {
 			(root?: URI) => getFileEventsExcludes(this.configurationService, root),
 			(event: IConfigurationChangeEvent) => event.affectsConfiguration(FILES_EXCLUDE_CONFIG)
 		);
-		this.disposables.push(fileEventsFilter);
+		this.disposables.add(fileEventsFilter);
 
 		return fileEventsFilter;
 	}
 
 	@memoize get model(): ExplorerModel {
 		const model = new ExplorerModel(this.contextService);
-		this.disposables.push(model);
-		this.disposables.push(this.fileService.onAfterOperation(e => this.onFileOperation(e)));
-		this.disposables.push(this.fileService.onFileChanges(e => this.onFileChanges(e)));
-		this.disposables.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(this.configurationService.getValue<IFilesConfiguration>())));
-		this.disposables.push(this.fileService.onDidChangeFileSystemProviderRegistrations(e => {
+		this.disposables.add(model);
+		this.disposables.add(this.fileService.onAfterOperation(e => this.onFileOperation(e)));
+		this.disposables.add(this.fileService.onFileChanges(e => this.onFileChanges(e)));
+		this.disposables.add(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(this.configurationService.getValue<IFilesConfiguration>())));
+		this.disposables.add(this.fileService.onDidChangeFileSystemProviderRegistrations(e => {
 			if (e.added && this.fileSystemProviderSchemes.has(e.scheme)) {
 				// A file system provider got re-registered, we should update all file stats since they might change (got read-only)
 				this.model.roots.forEach(r => r.forgetChildren());
@@ -108,7 +108,7 @@ export class ExplorerService implements IExplorerService {
 				this.fileSystemProviderSchemes.add(e.scheme);
 			}
 		}));
-		this.disposables.push(model.onDidChangeRoots(() => this._onDidChangeRoots.fire()));
+		this.disposables.add(model.onDidChangeRoots(() => this._onDidChangeRoots.fire()));
 
 		return model;
 	}
@@ -380,6 +380,6 @@ export class ExplorerService implements IExplorerService {
 	}
 
 	dispose(): void {
-		dispose(this.disposables);
+		this.disposables.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/markers/browser/markersPanel.ts b/src/vs/workbench/contrib/markers/browser/markersPanel.ts
index ad11ca74de9..71b13da1413 100644
--- a/src/vs/workbench/contrib/markers/browser/markersPanel.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersPanel.ts
@@ -320,7 +320,7 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {
 				dnd: new ResourceDragAndDrop(this.instantiationService),
 				expandOnlyOnTwistieClick: (e: TreeElement) => e instanceof Marker && e.relatedInformation.length > 0
 			}
-		) as any as WorkbenchObjectTree<TreeElement, FilterData>;
+		);
 
 		onDidChangeRenderNodeCount.input = this.tree.onDidChangeRenderNodeCount;
 
diff --git a/src/vs/workbench/contrib/outline/browser/outlinePanel.ts b/src/vs/workbench/contrib/outline/browser/outlinePanel.ts
index 0facdb0c1ac..74c1efc7e98 100644
--- a/src/vs/workbench/contrib/outline/browser/outlinePanel.ts
+++ b/src/vs/workbench/contrib/outline/browser/outlinePanel.ts
@@ -319,6 +319,7 @@ export class OutlinePanel extends ViewletPanel {
 			treeContainer,
 			new OutlineVirtualDelegate(),
 			[new OutlineGroupRenderer(), this._treeRenderer],
+			// https://github.com/microsoft/TypeScript/issues/32526
 			this._treeDataSource as IDataSource<OutlineModel, OutlineItem>,
 			{
 				expandOnlyOnTwistieClick: true,
@@ -328,7 +329,7 @@ export class OutlinePanel extends ViewletPanel {
 				identityProvider: new OutlineIdentityProvider(),
 				keyboardNavigationLabelProvider: new OutlineNavigationLabelProvider()
 			}
-		) as WorkbenchDataTree<OutlineModel, OutlineItem, FuzzyScore>;
+		);
 
 		this._disposables.push(this._tree);
 		this._disposables.push(this._outlineViewState.onDidChange(this._onDidChangeUserState, this));
diff --git a/src/vs/workbench/contrib/output/browser/outputActions.ts b/src/vs/workbench/contrib/output/browser/outputActions.ts
index 5d296f8a59a..e99147c8079 100644
--- a/src/vs/workbench/contrib/output/browser/outputActions.ts
+++ b/src/vs/workbench/contrib/output/browser/outputActions.ts
@@ -11,7 +11,6 @@ import { SelectActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { TogglePanelAction } from 'vs/workbench/browser/panel';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
@@ -67,11 +66,9 @@ export class ToggleOrSetOutputScrollLockAction extends Action {
 	public static readonly ID = 'workbench.output.action.toggleOutputScrollLock';
 	public static readonly LABEL = nls.localize({ key: 'toggleOutputScrollLock', comment: ['Turn on / off automatic output scrolling'] }, "Toggle Output Scroll Lock");
 
-	private toDispose: IDisposable[] = [];
-
 	constructor(id: string, label: string, @IOutputService private readonly outputService: IOutputService) {
 		super(id, label, 'output-action output-scroll-unlock');
-		this.toDispose.push(this.outputService.onActiveOutputChannel(channel => {
+		this._register(this.outputService.onActiveOutputChannel(channel => {
 			const activeChannel = this.outputService.getActiveChannel();
 			if (activeChannel) {
 				this.setClassAndLabel(activeChannel.scrollLock);
@@ -104,11 +101,6 @@ export class ToggleOrSetOutputScrollLockAction extends Action {
 			this.label = nls.localize('outputScrollOff', "Turn Auto Scrolling Off");
 		}
 	}
-
-	public dispose() {
-		super.dispose();
-		this.toDispose = dispose(this.toDispose);
-	}
 }
 
 export class SwitchOutputAction extends Action {
@@ -188,15 +180,13 @@ export class OpenLogOutputFile extends Action {
 	public static readonly ID = 'workbench.output.action.openLogOutputFile';
 	public static readonly LABEL = nls.localize('openInLogViewer', "Open Log File");
 
-	private disposables: IDisposable[] = [];
-
 	constructor(
 		@IOutputService private readonly outputService: IOutputService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super(OpenLogOutputFile.ID, OpenLogOutputFile.LABEL, 'output-action open-log-file');
-		this.outputService.onActiveOutputChannel(this.update, this, this.disposables);
+		this._register(this.outputService.onActiveOutputChannel(this.update, this));
 		this.update();
 	}
 
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
index c2d2c57df76..d83000eaaa4 100644
--- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
@@ -452,13 +452,12 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 
 	private createList(parent: HTMLElement): void {
 		this.keybindingsListContainer = DOM.append(parent, $('.keybindings-list-container'));
-		this.keybindingsList = this._register(this.instantiationService.createInstance(WorkbenchList, this.keybindingsListContainer, new Delegate(), [new KeybindingItemRenderer(this, this.instantiationService)],
-			{
-				identityProvider: { getId: (e: IListEntry) => e.id },
-				ariaLabel: localize('keybindingsLabel', "Keybindings"),
-				setRowLineHeight: false,
-				horizontalScrolling: false
-			})) as WorkbenchList<IListEntry>;
+		this.keybindingsList = this._register(this.instantiationService.createInstance(WorkbenchList, this.keybindingsListContainer, new Delegate(), [new KeybindingItemRenderer(this, this.instantiationService)], {
+			identityProvider: { getId: (e: IListEntry) => e.id },
+			ariaLabel: localize('keybindingsLabel', "Keybindings"),
+			setRowLineHeight: false,
+			horizontalScrolling: false
+		}));
 		this._register(this.keybindingsList.onContextMenu(e => this.onContextMenu(e)));
 		this._register(this.keybindingsList.onFocusChange(e => this.onFocusChange(e)));
 		this._register(this.keybindingsList.onDidFocus(() => {
diff --git a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
index fd207e9002b..0d180c8c7a1 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
@@ -13,7 +13,7 @@ import * as nls from 'vs/nls';
 import { MenuId, MenuRegistry, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { WorkbenchStateContext, RemoteAuthorityContext, IsMacNativeContext } from 'vs/workbench/browser/contextkeys';
+import { WorkbenchStateContext, IsMacNativeContext, RemoteNameContext } from 'vs/workbench/browser/contextkeys';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -424,7 +424,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 						title: { value: label, original: `Open Remote Settings (${hostLabel})` },
 						category: { value: nls.localize('preferencesCategory', "Preferences"), original: 'Preferences' }
 					},
-					when: RemoteAuthorityContext.notEqualsTo('')
+					when: RemoteNameContext.notEqualsTo('')
 				});
 			});
 	}
@@ -533,8 +533,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 		id: OpenGlobalKeybindingsFileAction.ID,
 		title: OpenGlobalKeybindingsFileAction.LABEL,
 		iconLocation: {
-			light: URI.parse(require.toUrl(`vs/workbench/contrib/preferences/browser/media/edit-json-light.svg`)),
-			dark: URI.parse(require.toUrl(`vs/workbench/contrib/preferences/browser/media/edit-json-dark.svg`))
+			light: URI.parse(require.toUrl(`vs/workbench/contrib/preferences/browser/media/preferences-editor-light.svg`)),
+			dark: URI.parse(require.toUrl(`vs/workbench/contrib/preferences/browser/media/preferences-editor-dark.svg`))
 		}
 	},
 	when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR),
@@ -817,8 +817,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 		id: SETTINGS_EDITOR_COMMAND_SWITCH_TO_JSON,
 		title: nls.localize('openSettingsJson', "Open Settings (JSON)"),
 		iconLocation: {
-			dark: URI.parse(require.toUrl('vs/workbench/contrib/preferences/browser/media/edit-json-dark.svg')),
-			light: URI.parse(require.toUrl('vs/workbench/contrib/preferences/browser/media/edit-json-light.svg'))
+			dark: URI.parse(require.toUrl('vs/workbench/contrib/preferences/browser/media/preferences-editor-dark.svg')),
+			light: URI.parse(require.toUrl('vs/workbench/contrib/preferences/browser/media/preferences-editor-light.svg'))
 		}
 	},
 	group: 'navigation',
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
index 8d87975990c..cd164f0923d 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
@@ -548,8 +548,11 @@ class PreferencesRenderersController extends Disposable {
 		const targetKey = resource.toString();
 		if (!this._prefsModelsForSearch.has(targetKey)) {
 			try {
-				const model = this._register(await this.preferencesService.createPreferencesEditorModel(resource));
-				this._prefsModelsForSearch.set(targetKey, <ISettingsEditorModel>model);
+				const model = await this.preferencesService.createPreferencesEditorModel(resource);
+				if (model) {
+					this._register(model);
+					this._prefsModelsForSearch.set(targetKey, <ISettingsEditorModel>model);
+				}
 			} catch (e) {
 				// Will throw when the settings file doesn't exist.
 				return undefined;
@@ -1116,16 +1119,19 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
 	private _updatePreferencesRenderer(associatedPreferencesModelUri: URI): Promise<IPreferencesRenderer<ISetting> | null> {
 		return this.preferencesService.createPreferencesEditorModel<ISetting>(associatedPreferencesModelUri)
 			.then(associatedPreferencesEditorModel => {
-				return this.preferencesRendererCreationPromise!.then(preferencesRenderer => {
-					if (preferencesRenderer) {
-						const associatedPreferencesModel = preferencesRenderer.getAssociatedPreferencesModel();
-						if (associatedPreferencesModel) {
-							associatedPreferencesModel.dispose();
+				if (associatedPreferencesEditorModel) {
+					return this.preferencesRendererCreationPromise!.then(preferencesRenderer => {
+						if (preferencesRenderer) {
+							const associatedPreferencesModel = preferencesRenderer.getAssociatedPreferencesModel();
+							if (associatedPreferencesModel) {
+								associatedPreferencesModel.dispose();
+							}
+							preferencesRenderer.setAssociatedPreferencesModel(associatedPreferencesEditorModel);
 						}
-						preferencesRenderer.setAssociatedPreferencesModel(associatedPreferencesEditorModel);
-					}
-					return preferencesRenderer;
-				});
+						return preferencesRenderer;
+					});
+				}
+				return null;
 			});
 	}
 
@@ -1154,7 +1160,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
 	abstract getId(): string;
 }
 
-class DefaultSettingsEditorContribution extends AbstractSettingsEditorContribution implements ISettingsEditorContribution {
+export class DefaultSettingsEditorContribution extends AbstractSettingsEditorContribution implements ISettingsEditorContribution {
 
 	static readonly ID: string = 'editor.contrib.defaultsettings';
 
@@ -1193,12 +1199,14 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl
 	}
 
 	protected _createPreferencesRenderer(): Promise<IPreferencesRenderer<ISetting> | null> | null {
-		if (this.isSettingsModel()) {
-			return this.preferencesService.createPreferencesEditorModel(this.editor.getModel()!.uri)
+		const model = this.editor.getModel();
+		if (model) {
+			return this.preferencesService.createPreferencesEditorModel(model.uri)
 				.then<any>(settingsModel => {
 					if (settingsModel instanceof SettingsEditorModel && this.editor.getModel()) {
 						switch (settingsModel.configurationTarget) {
 							case ConfigurationTarget.USER_LOCAL:
+							case ConfigurationTarget.USER_REMOTE:
 								return this.instantiationService.createInstance(UserSettingsRenderer, this.editor, settingsModel);
 							case ConfigurationTarget.WORKSPACE:
 								return this.instantiationService.createInstance(WorkspaceSettingsRenderer, this.editor, settingsModel);
@@ -1217,31 +1225,6 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl
 		}
 		return null;
 	}
-
-	private isSettingsModel(): boolean {
-		const model = this.editor.getModel();
-		if (!model) {
-			return false;
-		}
-
-		if (this.preferencesService.userSettingsResource && this.preferencesService.userSettingsResource.toString() === model.uri.toString()) {
-			return true;
-		}
-
-		if (this.preferencesService.workspaceSettingsResource && this.preferencesService.workspaceSettingsResource.toString() === model.uri.toString()) {
-			return true;
-		}
-
-		for (const folder of this.workspaceContextService.getWorkspace().folders) {
-			const folderSettingsResource = this.preferencesService.getFolderSettingsResource(folder.uri);
-			if (folderSettingsResource && folderSettingsResource.toString() === model.uri.toString()) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 }
 
 registerEditorContribution(SettingsEditorContribution);
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
index 360bc205add..d8abbb29809 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
@@ -19,7 +19,7 @@ import { IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import * as nls from 'vs/nls';
 import { ConfigurationTarget, IConfigurationService, overrideIdentifierFromKey } from 'vs/platform/configuration/common/configuration';
-import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationPropertySchema, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationPropertySchema, IConfigurationRegistry, IConfigurationNode, OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -29,6 +29,8 @@ import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/ran
 import { DefaultSettingsHeaderWidget, EditPreferenceWidget, SettingsGroupTitleWidget, SettingsHeaderWidget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
 import { IFilterResult, IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorModel, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
 import { DefaultSettingsEditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
+import { IMarkerService, IMarkerData, MarkerSeverity, MarkerTag } from 'vs/platform/markers/common/markers';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 export interface IPreferencesRenderer<T> extends IDisposable {
 	readonly preferencesModel: IPreferencesEditorModel<T>;
@@ -65,6 +67,8 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 	private readonly _onUpdatePreference = this._register(new Emitter<{ key: string, value: any, source: IIndexedSetting }>());
 	readonly onUpdatePreference: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdatePreference.event;
 
+	private unsupportedSettingsRenderer: UnsupportedSettingsRenderer;
+
 	private filterResult: IFilterResult | undefined;
 
 	constructor(protected editor: ICodeEditor, readonly preferencesModel: SettingsEditorModel,
@@ -78,7 +82,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 		this.editSettingActionRenderer = this._register(this.instantiationService.createInstance(EditSettingRenderer, this.editor, this.preferencesModel, this.settingHighlighter));
 		this._register(this.editSettingActionRenderer.onUpdateSetting(({ key, value, source }) => this._updatePreference(key, value, source)));
 		this._register(this.editor.getModel()!.onDidChangeContent(() => this.modelChangeDelayer.trigger(() => this.onModelChanged())));
-
+		this.unsupportedSettingsRenderer = this._register(instantiationService.createInstance(UnsupportedSettingsRenderer, editor, preferencesModel));
 	}
 
 	getAssociatedPreferencesModel(): IPreferencesEditorModel<ISetting> {
@@ -102,6 +106,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 		if (this.filterResult) {
 			this.filterPreferences(this.filterResult);
 		}
+		this.unsupportedSettingsRenderer.render();
 	}
 
 	private _updatePreference(key: string, value: any, source: IIndexedSetting): void {
@@ -946,6 +951,142 @@ class SettingHighlighter extends Disposable {
 	}
 }
 
+class UnsupportedSettingsRenderer extends Disposable {
+
+	private renderingDelayer: Delayer<void> = new Delayer<void>(200);
+
+	constructor(
+		private editor: ICodeEditor,
+		private settingsEditorModel: SettingsEditorModel,
+		@IMarkerService private markerService: IMarkerService,
+		@IWorkbenchEnvironmentService private workbenchEnvironmentService: IWorkbenchEnvironmentService,
+		@IConfigurationService private configurationService: IConfigurationService,
+	) {
+		super();
+		this._register(this.editor.getModel()!.onDidChangeContent(() => this.delayedRender()));
+		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.source === ConfigurationTarget.DEFAULT)(() => this.delayedRender()));
+	}
+
+	private delayedRender(): void {
+		this.renderingDelayer.trigger(() => this.render());
+	}
+
+	public render(): void {
+		const markerData: IMarkerData[] = this.generateMarkerData();
+		if (markerData.length) {
+			this.markerService.changeOne('preferencesEditor', this.settingsEditorModel.uri, markerData);
+		} else {
+			this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
+		}
+	}
+
+	private generateMarkerData(): IMarkerData[] {
+		const markerData: IMarkerData[] = [];
+		const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
+		for (const settingsGroup of this.settingsEditorModel.settingsGroups) {
+			for (const section of settingsGroup.sections) {
+				for (const setting of section.settings) {
+					const configuration = configurationRegistry[setting.key];
+					if (configuration) {
+						switch (this.settingsEditorModel.configurationTarget) {
+							case ConfigurationTarget.USER_LOCAL:
+								this.handleLocalUserConfiguration(setting, configuration, markerData);
+								break;
+							case ConfigurationTarget.USER_REMOTE:
+								this.handleRemoteUserConfiguration(setting, configuration, markerData);
+								break;
+							case ConfigurationTarget.WORKSPACE:
+								this.handleWorkspaceConfiguration(setting, configuration, markerData);
+								break;
+							case ConfigurationTarget.WORKSPACE_FOLDER:
+								this.handleWorkspaceFolderConfiguration(setting, configuration, markerData);
+								break;
+						}
+					} else if (!OVERRIDE_PROPERTY_PATTERN.test(setting.key)) { // Ignore override settings (language specific settings)
+						markerData.push({
+							severity: MarkerSeverity.Hint,
+							tags: [MarkerTag.Unnecessary],
+							...setting.range,
+							message: nls.localize('unknown configuration setting', "Unknown Configuration Setting")
+						});
+					}
+				}
+			}
+		}
+		return markerData;
+	}
+
+	private handleLocalUserConfiguration(setting: ISetting, configuration: IConfigurationNode, markerData: IMarkerData[]): void {
+		if (this.workbenchEnvironmentService.configuration.remote && configuration.scope === ConfigurationScope.MACHINE) {
+			markerData.push({
+				severity: MarkerSeverity.Hint,
+				tags: [MarkerTag.Unnecessary],
+				...setting.range,
+				message: nls.localize('unsupportedRemoteMachineSetting', "This setting can be applied only in remote machine settings")
+			});
+		}
+	}
+
+	private handleRemoteUserConfiguration(setting: ISetting, configuration: IConfigurationNode, markerData: IMarkerData[]): void {
+		if (configuration.scope === ConfigurationScope.APPLICATION) {
+			markerData.push(this.generateUnsupportedApplicationSettingMarker(setting));
+		}
+	}
+
+	private handleWorkspaceConfiguration(setting: ISetting, configuration: IConfigurationNode, markerData: IMarkerData[]): void {
+		if (configuration.scope === ConfigurationScope.APPLICATION) {
+			markerData.push(this.generateUnsupportedApplicationSettingMarker(setting));
+		}
+
+		if (configuration.scope === ConfigurationScope.MACHINE) {
+			markerData.push(this.generateUnsupportedMachineSettingMarker(setting));
+		}
+	}
+
+	private handleWorkspaceFolderConfiguration(setting: ISetting, configuration: IConfigurationNode, markerData: IMarkerData[]): void {
+		if (configuration.scope === ConfigurationScope.APPLICATION) {
+			markerData.push(this.generateUnsupportedApplicationSettingMarker(setting));
+		}
+
+		if (configuration.scope === ConfigurationScope.MACHINE) {
+			markerData.push(this.generateUnsupportedMachineSettingMarker(setting));
+		}
+
+		if (configuration.scope === ConfigurationScope.WINDOW) {
+			markerData.push({
+				severity: MarkerSeverity.Hint,
+				tags: [MarkerTag.Unnecessary],
+				...setting.range,
+				message: nls.localize('unsupportedWindowSetting', "This setting cannot be applied now. It will be applied when you open this folder directly.")
+			});
+		}
+	}
+
+	private generateUnsupportedApplicationSettingMarker(setting: ISetting): IMarkerData {
+		return {
+			severity: MarkerSeverity.Hint,
+			tags: [MarkerTag.Unnecessary],
+			...setting.range,
+			message: nls.localize('unsupportedApplicationSetting', "This setting can be applied only in application user settings")
+		};
+	}
+
+	private generateUnsupportedMachineSettingMarker(setting: ISetting): IMarkerData {
+		return {
+			severity: MarkerSeverity.Hint,
+			tags: [MarkerTag.Unnecessary],
+			...setting.range,
+			message: nls.localize('unsupportedMachineSetting', "This setting can be applied only in user settings")
+		};
+	}
+
+	public dispose(): void {
+		this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
+		super.dispose();
+	}
+
+}
+
 class WorkspaceConfigurationRenderer extends Disposable {
 
 	private decorationIds: string[] = [];
diff --git a/src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts b/src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
index 8d9b3dda9f4..7b6f13e67ef 100644
--- a/src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
@@ -24,20 +24,21 @@ import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/plat
 import { ILogService } from 'vs/platform/log/common/log';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { DialogChannel } from 'vs/platform/dialogs/node/dialogIpc';
-import { DownloadServiceChannel } from 'vs/platform/download/node/downloadIpc';
+import { DownloadServiceChannel } from 'vs/platform/download/common/downloadIpc';
 import { LogLevelSetterChannel } from 'vs/platform/log/common/logIpc';
 import { ipcRenderer as ipc } from 'electron';
 import { IDiagnosticInfoOptions, IRemoteDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnosticsService';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IProgressService, IProgress, IProgressStep, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { PersistenConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
+import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import Severity from 'vs/base/common/severity';
 import { ReloadWindowAction } from 'vs/workbench/browser/actions/windowActions';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
-import { RemoteConnectionState } from 'vs/workbench/browser/contextkeys';
+import { RemoteConnectionState, Deprecated_RemoteAuthorityContext } from 'vs/workbench/browser/contextkeys';
+import { IDownloadService } from 'vs/platform/download/common/download';
 
 const WINDOW_ACTIONS_COMMAND_ID = 'remote.showActions';
 const CLOSE_REMOTE_COMMAND_ID = 'remote.closeRemote';
@@ -100,13 +101,13 @@ export class RemoteWindowActiveIndicator extends Disposable implements IWorkbenc
 		if (connection) {
 			this._register(connection.onDidStateChange((e) => {
 				switch (e.type) {
-					case PersistenConnectionEventType.ConnectionLost:
-					case PersistenConnectionEventType.ReconnectionPermanentFailure:
-					case PersistenConnectionEventType.ReconnectionRunning:
-					case PersistenConnectionEventType.ReconnectionWait:
+					case PersistentConnectionEventType.ConnectionLost:
+					case PersistentConnectionEventType.ReconnectionPermanentFailure:
+					case PersistentConnectionEventType.ReconnectionRunning:
+					case PersistentConnectionEventType.ReconnectionWait:
 						this.setDisconnected(true);
 						break;
-					case PersistenConnectionEventType.ConnectionGain:
+					case PersistentConnectionEventType.ConnectionGain:
 						this.setDisconnected(false);
 						break;
 				}
@@ -118,6 +119,7 @@ export class RemoteWindowActiveIndicator extends Disposable implements IWorkbenc
 		if (this.disconnected !== isDisconnected) {
 			this.disconnected = isDisconnected;
 			RemoteConnectionState.bindTo(this.contextKeyService).set(isDisconnected ? 'disconnected' : 'connected');
+			Deprecated_RemoteAuthorityContext.bindTo(this.contextKeyService).set(isDisconnected ? '' : this.remoteAuthority || '');
 			this.updateWindowIndicator();
 		}
 	}
@@ -162,7 +164,7 @@ export class RemoteWindowActiveIndicator extends Disposable implements IWorkbenc
 
 	private showIndicatorActions(menu: IMenu) {
 
-		const actions = !this.disconnected || !this.remoteAuthority ? menu.getActions() : [];
+		const actions = menu.getActions();
 
 		const items: (IQuickPickItem | IQuickPickSeparator)[] = [];
 		for (let actionGroup of actions) {
@@ -215,12 +217,13 @@ class RemoteChannelsContribution implements IWorkbenchContribution {
 	constructor(
 		@ILogService logService: ILogService,
 		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
-		@IDialogService dialogService: IDialogService
+		@IDialogService dialogService: IDialogService,
+		@IDownloadService downloadService: IDownloadService
 	) {
 		const connection = remoteAgentService.getConnection();
 		if (connection) {
 			connection.registerChannel('dialog', new DialogChannel(dialogService));
-			connection.registerChannel('download', new DownloadServiceChannel());
+			connection.registerChannel('download', new DownloadServiceChannel(downloadService));
 			connection.registerChannel('loglevel', new LogLevelSetterChannel(logService));
 		}
 	}
@@ -296,7 +299,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
 					currentTimer = null;
 				}
 				switch (e.type) {
-					case PersistenConnectionEventType.ConnectionLost:
+					case PersistentConnectionEventType.ConnectionLost:
 						if (!currentProgressPromiseResolve) {
 							let promise = new Promise<void>((resolve) => currentProgressPromiseResolve = resolve);
 							progressService!.withProgress(
@@ -313,13 +316,13 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
 
 						progressReporter!.report(nls.localize('connectionLost', "Connection Lost"));
 						break;
-					case PersistenConnectionEventType.ReconnectionWait:
+					case PersistentConnectionEventType.ReconnectionWait:
 						currentTimer = new ReconnectionTimer(progressReporter!, Date.now() + 1000 * e.durationSeconds);
 						break;
-					case PersistenConnectionEventType.ReconnectionRunning:
+					case PersistentConnectionEventType.ReconnectionRunning:
 						progressReporter!.report(nls.localize('reconnectionRunning', "Attempting to reconnect..."));
 						break;
-					case PersistenConnectionEventType.ReconnectionPermanentFailure:
+					case PersistentConnectionEventType.ReconnectionPermanentFailure:
 						currentProgressPromiseResolve!();
 						currentProgressPromiseResolve = null;
 						progressReporter = null;
@@ -331,7 +334,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
 							}
 						});
 						break;
-					case PersistenConnectionEventType.ConnectionGain:
+					case PersistentConnectionEventType.ConnectionGain:
 						currentProgressPromiseResolve!();
 						currentProgressPromiseResolve = null;
 						progressReporter = null;
diff --git a/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts b/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts
index ce0cb13dd2c..622bb7889be 100644
--- a/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts
+++ b/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import { getMediaMime } from 'vs/base/common/mime';
 
@@ -71,7 +71,8 @@ async function respondWithDefault(event: FetchEvent): Promise<Response> {
 }
 
 async function respondWithResource(event: FetchEvent, uri: URI): Promise<Response> {
-	const cachedValue = await caches.open(_cacheName).then(cache => cache.match(event.request));
+	const cacheKey = event.request.url.replace('&r=1', '');
+	const cachedValue = await caches.open(_cacheName).then(cache => cache.match(cacheKey));
 	if (cachedValue) {
 		return cachedValue;
 	}
@@ -79,26 +80,27 @@ async function respondWithResource(event: FetchEvent, uri: URI): Promise<Respons
 	return new Promise<Response>(resolve => {
 
 		const token = generateUuid();
-		const query: { u: UriComponents, i: number } = JSON.parse(uri.query);
+		const [first] = uri.query.split('&');
+		const components = JSON.parse(first.substr(2));
 
 		_pendingFetch.set(token, async (data: ArrayBuffer, isExtensionResource: boolean) => {
 
 			const res = new Response(data, {
 				status: 200,
-				headers: { 'Content-Type': getMediaMime(query.u.path) || 'text/plain' }
+				headers: { 'Content-Type': getMediaMime(components.path) || 'text/plain' }
 			});
 
 			if (isExtensionResource) {
 				// only cache extension resources but not other
 				// resources, esp not workspace resources
-				await caches.open(_cacheName).then(cache => cache.put(event.request, res.clone()));
+				await caches.open(_cacheName).then(cache => cache.put(cacheKey, res.clone()));
 			}
 
 			return resolve(res);
 		});
 
 		self.clients.get(event.clientId).then(client => {
-			client.postMessage({ uri: query.u, token });
+			client.postMessage({ uri: components, token });
 		});
 	});
 }
diff --git a/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts b/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts
index a04930f1fb6..dfda6a1cfbb 100644
--- a/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts
+++ b/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts
@@ -65,11 +65,12 @@ class ResourceServiceWorker {
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@ILogService private readonly _logService: ILogService,
 	) {
+		this._updateEarlyResourceUris();
 		_serviceWorker.claim(e => this._handleMessage(e));
 	}
 
 	private _handleMessage(event: ExtendableMessageEvent): void {
-		this._logService.trace('SW#fetch', event.data.uri);
+		this._logService.trace('SW - fetch', event.data.uri);
 
 		const uri = URI.revive(event.data.uri);
 		Promise.all([
@@ -95,6 +96,53 @@ class ResourceServiceWorker {
 		}
 		return false;
 	}
+
+	private _updateEarlyResourceUris(): void {
+
+		let updateCount = 0;
+
+		// find style-tags
+		const styleElements = document.querySelectorAll('style');
+		for (let i = 0; i < styleElements.length; i++) {
+			const el = styleElements.item(i);
+			if (!el.sheet) {
+				continue;
+			}
+			const rules = (<CSSStyleSheet>el.sheet).rules;
+			for (let j = 0; j < rules.length; j++) {
+				const rule = rules[j];
+				const newCssText = this._updateResourceUris(rule.cssText);
+				if (newCssText) {
+					(<CSSStyleSheet>el.sheet).deleteRule(j);
+					(<CSSStyleSheet>el.sheet).insertRule(newCssText, j);
+					updateCount += 1;
+				}
+			}
+		}
+
+		// find any tag using remote uris
+		const htmlElements = document.querySelectorAll('[style*="/vscode-resources/fetch"]');
+		for (let i = 0; i < htmlElements.length; i++) {
+			const el = <HTMLElement>htmlElements.item(i);
+			const newCssText = this._updateResourceUris(el.style.cssText);
+			if (newCssText) {
+				el.style.cssText = newCssText;
+				updateCount += 1;
+			}
+		}
+
+		this._logService.trace('SW - count of changed, early dom element: ', updateCount);
+	}
+
+	private _updateResourceUris(cssText: string): string | undefined {
+		let changed = false;
+		let newCssText = cssText.replace(/url\((["'])?(.+?\/vscode-resources\/fetch\?.+?)\1\)/g, (_match, g1, g2, _offset, _input) => {
+			changed = true;
+			return `url(${g1 || ''}${g2}&r=1${g1 || ''})`;
+		});
+
+		return changed ? newCssText : undefined;
+	}
 }
 
 Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkbenchContribution(
diff --git a/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerMain.ts b/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerMain.ts
index 3138288942e..49f317ecd55 100644
--- a/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerMain.ts
+++ b/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerMain.ts
@@ -10,7 +10,7 @@
 // statement.
 
 // trigger service worker updates
-const _tag = '66399613-d758-4b88-b073-ff4195611d70';
+const _tag = 'a6f9835e-c10e-4299-ab39-b8e29547c20a';
 
 // loader world
 const baseUrl = '../../../../../';
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm-activity-bar.svg b/src/vs/workbench/contrib/scm/browser/media/scm-activity-bar.svg
index 9aa985bc979..5092b857329 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm-activity-bar.svg
+++ b/src/vs/workbench/contrib/scm/browser/media/scm-activity-bar.svg
@@ -1,3 +1,10 @@
-<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M21 8.25C21.0035 7.55379 20.8131 6.87035 20.4502 6.27622C20.0872 5.68209 19.566 5.20073 18.945 4.88605C18.3239 4.57137 17.6275 4.4358 16.9338 4.49451C16.24 4.55323 15.5764 4.80392 15.017 5.2185C14.4577 5.63308 14.0248 6.19518 13.7669 6.84186C13.509 7.48854 13.4361 8.19426 13.5566 8.87998C13.6771 9.5657 13.986 10.2044 14.4489 10.7244C14.9118 11.2445 15.5104 11.6254 16.1775 11.8245C15.9312 12.3251 15.5501 12.7472 15.0771 13.0432C14.6041 13.3391 14.058 13.4973 13.5 13.5H10.5C9.3894 13.5039 8.32 13.921 7.5 14.67V7.4235C8.41053 7.23764 9.21962 6.72031 9.7704 5.97181C10.3212 5.22331 10.5744 4.29696 10.481 3.37236C10.3876 2.44776 9.95422 1.59077 9.26486 0.96755C8.57551 0.344328 7.67931 -0.000732422 6.75 -0.000732422C5.82069 -0.000732422 4.92449 0.344328 4.23513 0.96755C3.54578 1.59077 3.11239 2.44776 3.01899 3.37236C2.92558 4.29696 3.17882 5.22331 3.7296 5.97181C4.28038 6.72031 5.08947 7.23764 6 7.4235V16.5735C5.09118 16.7473 4.27737 17.2477 3.71208 17.9802C3.14679 18.7128 2.8691 19.6269 2.93137 20.5501C2.99365 21.4733 3.39159 22.3418 4.05014 22.9917C4.70869 23.6417 5.58233 24.0283 6.50626 24.0785C7.4302 24.1287 8.34056 23.839 9.06564 23.2642C9.79073 22.6894 10.2804 21.8691 10.4423 20.9581C10.6042 20.047 10.4272 19.1083 9.94457 18.3188C9.46196 17.5293 8.70715 16.9437 7.8225 16.6725C8.06925 16.1724 8.4505 15.751 8.92346 15.4556C9.39642 15.1601 9.94236 15.0024 10.5 15H13.5C14.436 14.9957 15.3473 14.6996 16.1071 14.153C16.8669 13.6064 17.4373 12.8365 17.739 11.9505C18.6381 11.8323 19.4639 11.3922 20.0635 10.7118C20.6631 10.0314 20.9958 9.15685 21 8.25V8.25ZM4.5 3.75C4.5 3.30499 4.63196 2.86998 4.87919 2.49997C5.12643 2.12996 5.47783 1.84157 5.88896 1.67127C6.3001 1.50098 6.7525 1.45642 7.18895 1.54324C7.62541 1.63005 8.02632 1.84434 8.34099 2.15901C8.65566 2.47368 8.86995 2.87459 8.95677 3.31105C9.04358 3.74751 8.99903 4.19991 8.82873 4.61104C8.65843 5.02217 8.37004 5.37358 8.00003 5.62081C7.63002 5.86804 7.19501 6 6.75 6C6.15326 6 5.58097 5.76295 5.15901 5.34099C4.73705 4.91904 4.5 4.34674 4.5 3.75V3.75ZM9 20.25C9 20.695 8.86804 21.13 8.62081 21.5C8.37357 21.87 8.02217 22.1584 7.61104 22.3287C7.1999 22.499 6.7475 22.5436 6.31105 22.4568C5.87459 22.37 5.47368 22.1557 5.15901 21.841C4.84434 21.5263 4.63005 21.1254 4.54323 20.689C4.45642 20.2525 4.50097 19.8001 4.67127 19.389C4.84157 18.9778 5.12996 18.6264 5.49997 18.3792C5.86998 18.132 6.30499 18 6.75 18C7.34674 18 7.91903 18.2371 8.34099 18.659C8.76295 19.081 9 19.6533 9 20.25ZM17.25 10.5C16.805 10.5 16.37 10.368 16 10.1208C15.63 9.87358 15.3416 9.52217 15.1713 9.11104C15.001 8.69991 14.9564 8.24751 15.0432 7.81105C15.13 7.37459 15.3443 6.97368 15.659 6.65901C15.9737 6.34434 16.3746 6.13005 16.811 6.04324C17.2475 5.95642 17.6999 6.00098 18.111 6.17127C18.5222 6.34157 18.8736 6.62996 19.1208 6.99997C19.368 7.36998 19.5 7.80499 19.5 8.25C19.5 8.84674 19.2629 9.41904 18.841 9.84099C18.419 10.2629 17.8467 10.5 17.25 10.5V10.5Z" fill="white"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M21 8.25C21.0035 7.55379 20.8131 6.87035 20.4502 6.27622C20.0872 5.68209 19.566 5.20073 18.945 4.88605C18.3239 4.57137 17.6275 4.4358 16.9338 4.49451C16.24 4.55323 15.5764 4.80392 15.017 5.2185C14.4577 5.63308 14.0248 6.19518 13.7669 6.84186C13.509 7.48854 13.4361 8.19426 13.5566 8.87998C13.6771 9.5657 13.986 10.2044 14.4489 10.7244C14.9118 11.2445 15.5104 11.6254 16.1775 11.8245C15.9312 12.3251 15.5501 12.7472 15.0771 13.0431C14.6041 13.3391 14.058 13.4973 13.5 13.5H10.5C9.3894 13.5039 8.32 13.921 7.5 14.67V7.4235C8.41053 7.23764 9.21962 6.72031 9.7704 5.97181C10.3212 5.22331 10.5744 4.29696 10.481 3.37236C10.3876 2.44776 9.95422 1.59077 9.26486 0.96755C8.57551 0.344328 7.67931 -0.000732422 6.75 -0.000732422C5.82069 -0.000732422 4.92449 0.344328 4.23513 0.96755C3.54578 1.59077 3.11239 2.44776 3.01899 3.37236C2.92558 4.29696 3.17882 5.22331 3.7296 5.97181C4.28038 6.72031 5.08947 7.23764 6 7.4235V16.5735C5.09118 16.7473 4.27737 17.2477 3.71208 17.9802C3.14679 18.7128 2.8691 19.6269 2.93137 20.5501C2.99365 21.4733 3.39159 22.3418 4.05014 22.9917C4.70869 23.6417 5.58233 24.0283 6.50626 24.0785C7.4302 24.1287 8.34056 23.839 9.06564 23.2642C9.79073 22.6894 10.2804 21.8691 10.4423 20.9581C10.6042 20.047 10.4272 19.1083 9.94457 18.3188C9.46196 17.5293 8.70715 16.9437 7.8225 16.6725C8.06925 16.1724 8.4505 15.751 8.92346 15.4556C9.39642 15.1601 9.94236 15.0024 10.5 15H13.5C14.436 14.9957 15.3473 14.6996 16.1071 14.153C16.8669 13.6064 17.4373 12.8365 17.739 11.9505C18.6381 11.8323 19.4639 11.3922 20.0635 10.7118C20.6631 10.0314 20.9958 9.15685 21 8.25ZM4.5 3.75C4.5 3.30499 4.63196 2.86998 4.87919 2.49997C5.12643 2.12996 5.47783 1.84157 5.88896 1.67127C6.3001 1.50098 6.7525 1.45642 7.18895 1.54324C7.62541 1.63005 8.02632 1.84434 8.34099 2.15901C8.65566 2.47368 8.86995 2.87459 8.95677 3.31105C9.04358 3.74751 8.99903 4.19991 8.82873 4.61104C8.65843 5.02217 8.37004 5.37358 8.00003 5.62081C7.63002 5.86804 7.19501 6 6.75 6C6.15326 6 5.58097 5.76295 5.15901 5.34099C4.73705 4.91904 4.5 4.34674 4.5 3.75ZM9 20.25C9 20.695 8.86804 21.13 8.62081 21.5C8.37357 21.87 8.02217 22.1584 7.61104 22.3287C7.1999 22.499 6.7475 22.5436 6.31105 22.4568C5.87459 22.37 5.47368 22.1557 5.15901 21.841C4.84434 21.5263 4.63005 21.1254 4.54323 20.689C4.45642 20.2525 4.50097 19.8001 4.67127 19.389C4.84157 18.9778 5.12996 18.6264 5.49997 18.3792C5.86998 18.132 6.30499 18 6.75 18C7.34674 18 7.91903 18.2371 8.34099 18.659C8.76295 19.081 9 19.6533 9 20.25ZM17.25 10.5C16.805 10.5 16.37 10.368 16 10.1208C15.63 9.87358 15.3416 9.52217 15.1713 9.11104C15.001 8.69991 14.9564 8.24751 15.0432 7.81105C15.13 7.37459 15.3443 6.97368 15.659 6.65901C15.9737 6.34434 16.3746 6.13005 16.811 6.04323C17.2475 5.95642 17.6999 6.00098 18.111 6.17127C18.5222 6.34157 18.8736 6.62996 19.1208 6.99997C19.368 7.36998 19.5 7.80499 19.5 8.25C19.5 8.84674 19.2629 9.41904 18.841 9.84099C18.419 10.2629 17.8467 10.5 17.25 10.5Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
 </svg>
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewlet.ts b/src/vs/workbench/contrib/scm/browser/scmViewlet.ts
index e56bd970377..e3d7a922c78 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewlet.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewlet.ts
@@ -245,7 +245,7 @@ export class MainPanel extends ViewletPanel {
 		this.list = this.instantiationService.createInstance(WorkbenchList, container, delegate, [renderer], {
 			identityProvider,
 			horizontalScrolling: false
-		}) as WorkbenchList<ISCMRepository>;
+		});
 
 		this._register(renderer.onDidRenderElement(e => this.list.updateWidth(this.viewModel.repositories.indexOf(e)), null));
 		this._register(this.list.onSelectionChange(this.onListSelectionChange, this));
@@ -850,7 +850,7 @@ export class RepositoryPanel extends ViewletPanel {
 			identityProvider: scmResourceIdentityProvider,
 			keyboardNavigationLabelProvider: scmKeyboardNavigationLabelProvider,
 			horizontalScrolling: false
-		}) as WorkbenchList<ISCMResourceGroup | ISCMResource>;
+		});
 
 		this._register(Event.chain(this.list.onDidOpen)
 			.map(e => e.elements[0])
diff --git a/src/vs/workbench/contrib/search/browser/media/search-activity-bar.svg b/src/vs/workbench/contrib/search/browser/media/search-activity-bar.svg
index b40063bef31..a7ea9ab29ab 100644
--- a/src/vs/workbench/contrib/search/browser/media/search-activity-bar.svg
+++ b/src/vs/workbench/contrib/search/browser/media/search-activity-bar.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22.5 8.25C22.5 11.9779 19.4779 15 15.75 15C12.0221 15 9 11.9779 9 8.25C9 4.52208 12.0221 1.5 15.75 1.5C19.4779 1.5 22.5 4.52208 22.5 8.25ZM24 8.25C24 12.8063 20.3063 16.5 15.75 16.5C13.8323 16.5 12.0674 15.8457 10.6664 14.7481L2.62509 23.8677L1.5 22.8756L9.57353 13.7195C8.28334 12.2636 7.5 10.3483 7.5 8.25C7.5 3.69365 11.1937 0 15.75 0C20.3063 0 24 3.69365 24 8.25Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 8.25C22 11.9779 18.9779 15 15.25 15C11.5221 15 8.5 11.9779 8.5 8.25C8.5 4.52208 11.5221 1.5 15.25 1.5C18.9779 1.5 22 4.52208 22 8.25ZM23.5 8.25C23.5 12.8063 19.8063 16.5 15.25 16.5C13.3323 16.5 11.5674 15.8457 10.1664 14.7481L2.12509 23.8677L1 22.8756L9.07353 13.7195C7.78334 12.2636 7 10.3483 7 8.25C7 3.69365 10.6937 0 15.25 0C19.8063 0 23.5 3.69365 23.5 8.25Z" fill="white"/>
 </svg>
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
index 16ebfb4ed95..c175024c0eb 100644
--- a/src/vs/workbench/contrib/search/browser/searchView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -633,7 +633,7 @@ export class SearchView extends ViewletPanel {
 		};
 
 		this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility }));
-		this.tree = this._register(<WorkbenchObjectTree<RenderableMatch, any>>this.instantiationService.createInstance(WorkbenchObjectTree,
+		this.tree = this._register(this.instantiationService.createInstance(WorkbenchObjectTree,
 			this.resultsElement,
 			delegate,
 			[
@@ -1151,6 +1151,10 @@ export class SearchView extends ViewletPanel {
 	}
 
 	onQueryChanged(preserveFocus?: boolean): void {
+		if (!this.searchWidget.searchInput.inputBox.isInputValid()) {
+			return;
+		}
+
 		const isRegex = this.searchWidget.searchInput.getRegex();
 		const isWholeWords = this.searchWidget.searchInput.getWholeWords();
 		const isCaseSensitive = this.searchWidget.searchInput.getCaseSensitive();
diff --git a/src/vs/workbench/contrib/stats/electron-browser/workspaceStats.ts b/src/vs/workbench/contrib/stats/electron-browser/workspaceStats.ts
index 8504522b3ef..f26596780b9 100644
--- a/src/vs/workbench/contrib/stats/electron-browser/workspaceStats.ts
+++ b/src/vs/workbench/contrib/stats/electron-browser/workspaceStats.ts
@@ -3,25 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
 import * as crypto from 'crypto';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { URI } from 'vs/base/common/uri';
-import { IFileService, IFileStat, IResolveFileResult } from 'vs/platform/files/common/files';
+import { IFileService, IFileStat } from 'vs/platform/files/common/files';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IWindowConfiguration, IWindowService } from 'vs/platform/windows/common/windows';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IWindowService } from 'vs/platform/windows/common/windows';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { endsWith } from 'vs/base/common/strings';
-import { Schemas } from 'vs/base/common/network';
-import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
-import { hasWorkspaceFileExtension } from 'vs/platform/workspaces/common/workspaces';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { joinPath } from 'vs/base/common/resources';
-import { ITextFileService, ITextFileContent } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextFileService, } from 'vs/workbench/services/textfile/common/textfiles';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
+import { IWorkspaceStatsService, Tags } from 'vs/workbench/contrib/stats/electron-browser/workspaceStatsService';
 
 const SshProtocolMatcher = /^([^@:]+@)?([^:]+):/;
 const SshUrlMatcher = /^([^@:]+@)?([^:]+):(.+)$/;
@@ -43,60 +36,6 @@ const SecondLevelDomainWhitelist = [
 	'rhcloud.com',
 	'google.com'
 ];
-const ModulesToLookFor = [
-	// Packages that suggest a node server
-	'express',
-	'sails',
-	'koa',
-	'hapi',
-	'socket.io',
-	'restify',
-	// JS frameworks
-	'react',
-	'react-native',
-	'rnpm-plugin-windows',
-	'@angular/core',
-	'@ionic',
-	'vue',
-	'tns-core-modules',
-	// Other interesting packages
-	'aws-sdk',
-	'aws-amplify',
-	'azure',
-	'azure-storage',
-	'firebase',
-	'@google-cloud/common',
-	'heroku-cli'
-];
-const PyModulesToLookFor = [
-	'azure',
-	'azure-storage-common',
-	'azure-storage-blob',
-	'azure-storage-file',
-	'azure-storage-queue',
-	'azure-shell',
-	'azure-cosmos',
-	'azure-devtools',
-	'azure-elasticluster',
-	'azure-eventgrid',
-	'azure-functions',
-	'azure-graphrbac',
-	'azure-keyvault',
-	'azure-loganalytics',
-	'azure-monitor',
-	'azure-servicebus',
-	'azure-servicefabric',
-	'azure-storage',
-	'azure-translator',
-	'azure-iothub-device-client',
-	'adal',
-	'pydocumentdb',
-	'botbuilder-core',
-	'botbuilder-schema',
-	'botframework-connector'
-];
-
-type Tags = { [index: string]: boolean | number | string | undefined };
 
 function stripLowLevelDomains(domain: string): string | null {
 	const match = domain.match(SecondLevelDomainMatcher);
@@ -212,21 +151,14 @@ export function getHashedRemotesFromUri(workspaceUri: URI, fileService: IFileSer
 
 export class WorkspaceStats implements IWorkbenchContribution {
 
-	static TAGS: Tags;
-
-	private static DISABLE_WORKSPACE_PROMPT_KEY = 'workspaces.dontPromptToOpen';
-
 	constructor(
 		@IFileService private readonly fileService: IFileService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 		@IWindowService private readonly windowService: IWindowService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@IStorageService private readonly storageService: IStorageService,
 		@ITextFileService private readonly textFileService: ITextFileService,
-		@ISharedProcessService private readonly sharedProcessService: ISharedProcessService
+		@ISharedProcessService private readonly sharedProcessService: ISharedProcessService,
+		@IWorkspaceStatsService private readonly workspaceStatsService: IWorkspaceStatsService
 	) {
 		this.report();
 	}
@@ -234,7 +166,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 	private report(): void {
 
 		// Workspace Stats
-		this.resolveWorkspaceTags(this.environmentService.configuration, rootFiles => this.handleWorkspaceFiles(rootFiles))
+		this.workspaceStatsService.getTags()
 			.then(tags => this.reportWorkspaceTags(tags), error => onUnexpectedError(error));
 
 		// Cloud Stats
@@ -246,372 +178,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 		diagnosticsChannel.call('reportWorkspaceStats', this.contextService.getWorkspace());
 	}
 
-	private static searchArray(arr: string[], regEx: RegExp): boolean | undefined {
-		return arr.some(v => v.search(regEx) > -1) || undefined;
-	}
 
-	/* __GDPR__FRAGMENT__
-		"WorkspaceTags" : {
-			"workbench.filesToOpenOrCreate" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workbench.filesToDiff" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			"workspace.roots" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.empty" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.grunt" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.gulp" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.jake" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.tsconfig" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.jsconfig" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.config.xml" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.vsc.extension" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.asp<NUMBER>" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.sln" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.unity" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.express" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.sails" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.koa" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.hapi" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.socket.io" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.restify" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.rnpm-plugin-windows" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.react" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.@angular/core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.vue" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.aws-sdk" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.aws-amplify-sdk" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.@google-cloud/common" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.firebase" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.npm.heroku-cli" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.bower" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.yeoman.code.ext" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.cordova.high" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.cordova.low" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.xamarin.android" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.xamarin.ios" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.android.cpp" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.reactNative" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.ionic" : { "classification" : "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": "true" },
-			"workspace.nativeScript" : { "classification" : "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": "true" },
-			"workspace.java.pom" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.requirements" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.requirements.star" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.Pipfile" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.conda" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.any-azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-storage-common" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-storage-blob" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-storage-file" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-storage-queue" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-mgmt" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-shell" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.pulumi-azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-cosmos" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-devtools" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-elasticluster" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-eventgrid" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-functions" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-graphrbac" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-keyvault" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-loganalytics" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-monitor" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-servicebus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-servicefabric" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-translator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-iothub-device-client" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-ml" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.azure-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.adal" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.pydocumentdb" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.botbuilder-core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.botbuilder-schema" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-			"workspace.py.botframework-connector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
-
-		}
-	*/
-	private resolveWorkspaceTags(configuration: IWindowConfiguration, participant?: (rootFiles: string[]) => void): Promise<Tags> {
-		const tags: Tags = Object.create(null);
-
-		const state = this.contextService.getWorkbenchState();
-		const workspace = this.contextService.getWorkspace();
-
-		function createHash(uri: URI): string {
-			return crypto.createHash('sha1').update(uri.scheme === Schemas.file ? uri.fsPath : uri.toString()).digest('hex');
-		}
-
-		let workspaceId: string | undefined;
-		switch (state) {
-			case WorkbenchState.EMPTY:
-				workspaceId = undefined;
-				break;
-			case WorkbenchState.FOLDER:
-				workspaceId = createHash(workspace.folders[0].uri);
-				break;
-			case WorkbenchState.WORKSPACE:
-				if (workspace.configuration) {
-					workspaceId = createHash(workspace.configuration);
-				}
-		}
-
-		tags['workspace.id'] = workspaceId;
-
-		const { filesToOpenOrCreate, filesToDiff } = configuration;
-		tags['workbench.filesToOpenOrCreate'] = filesToOpenOrCreate && filesToOpenOrCreate.length || 0;
-		tags['workbench.filesToDiff'] = filesToDiff && filesToDiff.length || 0;
-
-		const isEmpty = state === WorkbenchState.EMPTY;
-		tags['workspace.roots'] = isEmpty ? 0 : workspace.folders.length;
-		tags['workspace.empty'] = isEmpty;
-
-		const folders = !isEmpty ? workspace.folders.map(folder => folder.uri) : this.environmentService.appQuality !== 'stable' && this.findFolders(configuration);
-		if (!folders || !folders.length || !this.fileService) {
-			return Promise.resolve(tags);
-		}
-
-		return this.fileService.resolveAll(folders.map(resource => ({ resource }))).then((files: IResolveFileResult[]) => {
-			const names = (<IFileStat[]>[]).concat(...files.map(result => result.success ? (result.stat!.children || []) : [])).map(c => c.name);
-			const nameSet = names.reduce((s, n) => s.add(n.toLowerCase()), new Set());
-
-			if (participant) {
-				participant(names);
-			}
-
-			tags['workspace.grunt'] = nameSet.has('gruntfile.js');
-			tags['workspace.gulp'] = nameSet.has('gulpfile.js');
-			tags['workspace.jake'] = nameSet.has('jakefile.js');
-
-			tags['workspace.tsconfig'] = nameSet.has('tsconfig.json');
-			tags['workspace.jsconfig'] = nameSet.has('jsconfig.json');
-			tags['workspace.config.xml'] = nameSet.has('config.xml');
-			tags['workspace.vsc.extension'] = nameSet.has('vsc-extension-quickstart.md');
-
-			tags['workspace.ASP5'] = nameSet.has('project.json') && WorkspaceStats.searchArray(names, /^.+\.cs$/i);
-			tags['workspace.sln'] = WorkspaceStats.searchArray(names, /^.+\.sln$|^.+\.csproj$/i);
-			tags['workspace.unity'] = nameSet.has('assets') && nameSet.has('library') && nameSet.has('projectsettings');
-			tags['workspace.npm'] = nameSet.has('package.json') || nameSet.has('node_modules');
-			tags['workspace.bower'] = nameSet.has('bower.json') || nameSet.has('bower_components');
-
-			tags['workspace.java.pom'] = nameSet.has('pom.xml');
-
-			tags['workspace.yeoman.code.ext'] = nameSet.has('vsc-extension-quickstart.md');
-
-			tags['workspace.py.requirements'] = nameSet.has('requirements.txt');
-			tags['workspace.py.requirements.star'] = WorkspaceStats.searchArray(names, /^(.*)requirements(.*)\.txt$/i);
-			tags['workspace.py.Pipfile'] = nameSet.has('pipfile');
-			tags['workspace.py.conda'] = WorkspaceStats.searchArray(names, /^environment(\.yml$|\.yaml$)/i);
-
-			const mainActivity = nameSet.has('mainactivity.cs') || nameSet.has('mainactivity.fs');
-			const appDelegate = nameSet.has('appdelegate.cs') || nameSet.has('appdelegate.fs');
-			const androidManifest = nameSet.has('androidmanifest.xml');
-
-			const platforms = nameSet.has('platforms');
-			const plugins = nameSet.has('plugins');
-			const www = nameSet.has('www');
-			const properties = nameSet.has('properties');
-			const resources = nameSet.has('resources');
-			const jni = nameSet.has('jni');
-
-			if (tags['workspace.config.xml'] &&
-				!tags['workspace.language.cs'] && !tags['workspace.language.vb'] && !tags['workspace.language.aspx']) {
-				if (platforms && plugins && www) {
-					tags['workspace.cordova.high'] = true;
-				} else {
-					tags['workspace.cordova.low'] = true;
-				}
-			}
-
-			if (tags['workspace.config.xml'] &&
-				!tags['workspace.language.cs'] && !tags['workspace.language.vb'] && !tags['workspace.language.aspx']) {
-
-				if (nameSet.has('ionic.config.json')) {
-					tags['workspace.ionic'] = true;
-				}
-			}
-
-			if (mainActivity && properties && resources) {
-				tags['workspace.xamarin.android'] = true;
-			}
-
-			if (appDelegate && resources) {
-				tags['workspace.xamarin.ios'] = true;
-			}
-
-			if (androidManifest && jni) {
-				tags['workspace.android.cpp'] = true;
-			}
-
-			function getFilePromises(filename: string, fileService: IFileService, textFileService: ITextFileService, contentHandler: (content: ITextFileContent) => void): Promise<void>[] {
-				return !nameSet.has(filename) ? [] : (folders as URI[]).map(workspaceUri => {
-					const uri = workspaceUri.with({ path: `${workspaceUri.path !== '/' ? workspaceUri.path : ''}/${filename}` });
-					return fileService.exists(uri).then(exists => {
-						if (!exists) {
-							return undefined;
-						}
-
-						return textFileService.read(uri, { acceptTextOnly: true }).then(contentHandler);
-					}, err => {
-						// Ignore missing file
-					});
-				});
-			}
-
-			function addPythonTags(packageName: string): void {
-				if (PyModulesToLookFor.indexOf(packageName) > -1) {
-					tags['workspace.py.' + packageName] = true;
-				}
-				// cognitive services has a lot of tiny packages. e.g. 'azure-cognitiveservices-search-autosuggest'
-				if (packageName.indexOf('azure-cognitiveservices') > -1) {
-					tags['workspace.py.azure-cognitiveservices'] = true;
-				}
-				if (packageName.indexOf('azure-mgmt') > -1) {
-					tags['workspace.py.azure-mgmt'] = true;
-				}
-				if (packageName.indexOf('azure-ml') > -1) {
-					tags['workspace.py.azure-ml'] = true;
-				}
-				if (!tags['workspace.py.any-azure']) {
-					tags['workspace.py.any-azure'] = /azure/i.test(packageName);
-				}
-			}
-
-			const requirementsTxtPromises = getFilePromises('requirements.txt', this.fileService, this.textFileService, content => {
-				const dependencies: string[] = content.value.split(/\r\n|\r|\n/);
-				for (let dependency of dependencies) {
-					// Dependencies in requirements.txt can have 3 formats: `foo==3.1, foo>=3.1, foo`
-					const format1 = dependency.split('==');
-					const format2 = dependency.split('>=');
-					const packageName = (format1.length === 2 ? format1[0] : format2[0]).trim();
-					addPythonTags(packageName);
-				}
-			});
-
-			const pipfilePromises = getFilePromises('pipfile', this.fileService, this.textFileService, content => {
-				let dependencies: string[] = content.value.split(/\r\n|\r|\n/);
-
-				// We're only interested in the '[packages]' section of the Pipfile
-				dependencies = dependencies.slice(dependencies.indexOf('[packages]') + 1);
-
-				for (let dependency of dependencies) {
-					if (dependency.trim().indexOf('[') > -1) {
-						break;
-					}
-					// All dependencies in Pipfiles follow the format: `<package> = <version, or git repo, or something else>`
-					if (dependency.indexOf('=') === -1) {
-						continue;
-					}
-					const packageName = dependency.split('=')[0].trim();
-					addPythonTags(packageName);
-				}
-
-			});
-
-			const packageJsonPromises = getFilePromises('package.json', this.fileService, this.textFileService, content => {
-				try {
-					const packageJsonContents = JSON.parse(content.value);
-					let dependencies = packageJsonContents['dependencies'];
-					let devDependencies = packageJsonContents['devDependencies'];
-					for (let module of ModulesToLookFor) {
-						if ('react-native' === module) {
-							if ((dependencies && dependencies[module]) || (devDependencies && devDependencies[module])) {
-								tags['workspace.reactNative'] = true;
-							}
-						} else if ('tns-core-modules' === module) {
-							if ((dependencies && dependencies[module]) || (devDependencies && devDependencies[module])) {
-								tags['workspace.nativescript'] = true;
-							}
-						} else {
-							if ((dependencies && dependencies[module]) || (devDependencies && devDependencies[module])) {
-								tags['workspace.npm.' + module] = true;
-							}
-						}
-					}
-
-				}
-				catch (e) {
-					// Ignore errors when resolving file or parsing file contents
-				}
-			});
-			return Promise.all([...packageJsonPromises, ...requirementsTxtPromises, ...pipfilePromises]).then(() => tags);
-		});
-	}
-
-	private handleWorkspaceFiles(rootFiles: string[]): void {
-		const state = this.contextService.getWorkbenchState();
-		const workspace = this.contextService.getWorkspace();
-
-		// Handle top-level workspace files for local single folder workspace
-		if (state === WorkbenchState.FOLDER) {
-			const workspaceFiles = rootFiles.filter(hasWorkspaceFileExtension);
-			if (workspaceFiles.length > 0) {
-				this.doHandleWorkspaceFiles(workspace.folders[0].uri, workspaceFiles);
-			}
-		}
-	}
-
-	private doHandleWorkspaceFiles(folder: URI, workspaces: string[]): void {
-		if (this.storageService.getBoolean(WorkspaceStats.DISABLE_WORKSPACE_PROMPT_KEY, StorageScope.WORKSPACE)) {
-			return; // prompt disabled by user
-		}
-
-		const doNotShowAgain: IPromptChoice = {
-			label: localize('never again', "Don't Show Again"),
-			isSecondary: true,
-			run: () => this.storageService.store(WorkspaceStats.DISABLE_WORKSPACE_PROMPT_KEY, true, StorageScope.WORKSPACE)
-		};
-
-		// Prompt to open one workspace
-		if (workspaces.length === 1) {
-			const workspaceFile = workspaces[0];
-
-			this.notificationService.prompt(Severity.Info, localize('workspaceFound', "This folder contains a workspace file '{0}'. Do you want to open it? [Learn more]({1}) about workspace files.", workspaceFile, 'https://go.microsoft.com/fwlink/?linkid=2025315'), [{
-				label: localize('openWorkspace', "Open Workspace"),
-				run: () => this.windowService.openWindow([{ workspaceUri: joinPath(folder, workspaceFile) }])
-			}, doNotShowAgain]);
-		}
-
-		// Prompt to select a workspace from many
-		else if (workspaces.length > 1) {
-			this.notificationService.prompt(Severity.Info, localize('workspacesFound', "This folder contains multiple workspace files. Do you want to open one? [Learn more]({0}) about workspace files.", 'https://go.microsoft.com/fwlink/?linkid=2025315'), [{
-				label: localize('selectWorkspace', "Select Workspace"),
-				run: () => {
-					this.quickInputService.pick(
-						workspaces.map(workspace => ({ label: workspace } as IQuickPickItem)),
-						{ placeHolder: localize('selectToOpen', "Select a workspace to open") }).then(pick => {
-							if (pick) {
-								this.windowService.openWindow([{ workspaceUri: joinPath(folder, pick.label) }]);
-							}
-						});
-				}
-			}, doNotShowAgain]);
-		}
-	}
-
-	private findFolders(configuration: IWindowConfiguration): URI[] | undefined {
-		const folder = this.findFolder(configuration);
-		return folder && [folder];
-	}
-
-	private findFolder({ filesToOpenOrCreate, filesToDiff }: IWindowConfiguration): URI | undefined {
-		if (filesToOpenOrCreate && filesToOpenOrCreate.length) {
-			return this.parentURI(filesToOpenOrCreate[0].fileUri);
-		} else if (filesToDiff && filesToDiff.length) {
-			return this.parentURI(filesToDiff[0].fileUri);
-		}
-		return undefined;
-	}
-
-	private parentURI(uri: URI | undefined): URI | undefined {
-		if (!uri) {
-			return undefined;
-		}
-		const path = uri.path;
-		const i = path.lastIndexOf('/');
-		return i !== -1 ? uri.with({ path: path.substr(0, i) }) : undefined;
-	}
 
 	private reportWorkspaceTags(tags: Tags): void {
 		/* __GDPR__
@@ -622,7 +189,6 @@ export class WorkspaceStats implements IWorkbenchContribution {
 			}
 		*/
 		this.telemetryService.publicLog('workspce.tags', tags);
-		WorkspaceStats.TAGS = tags;
 	}
 
 	private reportRemoteDomains(workspaceUris: URI[]): void {
@@ -689,6 +255,10 @@ export class WorkspaceStats implements IWorkbenchContribution {
 			});
 	}
 
+	private static searchArray(arr: string[], regEx: RegExp): boolean | undefined {
+		return arr.some(v => v.search(regEx) > -1) || undefined;
+	}
+
 	/* __GDPR__FRAGMENT__
 		"AzureTags" : {
 			"java" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
diff --git a/src/vs/workbench/contrib/stats/electron-browser/workspaceStatsService.ts b/src/vs/workbench/contrib/stats/electron-browser/workspaceStatsService.ts
new file mode 100644
index 00000000000..5041cb4be1e
--- /dev/null
+++ b/src/vs/workbench/contrib/stats/electron-browser/workspaceStatsService.ts
@@ -0,0 +1,477 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as crypto from 'crypto';
+import { IFileService, IResolveFileResult, IFileStat } from 'vs/platform/files/common/files';
+import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { IWindowService, IWindowConfiguration } from 'vs/platform/windows/common/windows';
+import { INotificationService, IPromptChoice } from 'vs/platform/notification/common/notification';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { ITextFileService, ITextFileContent } from 'vs/workbench/services/textfile/common/textfiles';
+import { URI } from 'vs/base/common/uri';
+import { Schemas } from 'vs/base/common/network';
+import { hasWorkspaceFileExtension } from 'vs/platform/workspaces/common/workspaces';
+import { localize } from 'vs/nls';
+import Severity from 'vs/base/common/severity';
+import { joinPath } from 'vs/base/common/resources';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export type Tags = { [index: string]: boolean | number | string | undefined };
+
+const DISABLE_WORKSPACE_PROMPT_KEY = 'workspaces.dontPromptToOpen';
+
+const ModulesToLookFor = [
+	// Packages that suggest a node server
+	'express',
+	'sails',
+	'koa',
+	'hapi',
+	'socket.io',
+	'restify',
+	// JS frameworks
+	'react',
+	'react-native',
+	'rnpm-plugin-windows',
+	'@angular/core',
+	'@ionic',
+	'vue',
+	'tns-core-modules',
+	// Other interesting packages
+	'aws-sdk',
+	'aws-amplify',
+	'azure',
+	'azure-storage',
+	'firebase',
+	'@google-cloud/common',
+	'heroku-cli'
+];
+const PyModulesToLookFor = [
+	'azure',
+	'azure-storage-common',
+	'azure-storage-blob',
+	'azure-storage-file',
+	'azure-storage-queue',
+	'azure-shell',
+	'azure-cosmos',
+	'azure-devtools',
+	'azure-elasticluster',
+	'azure-eventgrid',
+	'azure-functions',
+	'azure-graphrbac',
+	'azure-keyvault',
+	'azure-loganalytics',
+	'azure-monitor',
+	'azure-servicebus',
+	'azure-servicefabric',
+	'azure-storage',
+	'azure-translator',
+	'azure-iothub-device-client',
+	'adal',
+	'pydocumentdb',
+	'botbuilder-core',
+	'botbuilder-schema',
+	'botframework-connector'
+];
+
+export const IWorkspaceStatsService = createDecorator<IWorkspaceStatsService>('workspaceStatsService');
+
+export interface IWorkspaceStatsService {
+	_serviceBrand: any;
+	getTags(): Promise<Tags>;
+}
+
+
+export class WorkspaceStatsService implements IWorkspaceStatsService {
+	_serviceBrand: any;
+	private _tags: Tags;
+
+	constructor(
+		@IFileService private readonly fileService: IFileService,
+		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
+		@IWindowService private readonly windowService: IWindowService,
+		@INotificationService private readonly notificationService: INotificationService,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@IStorageService private readonly storageService: IStorageService,
+		@ITextFileService private readonly textFileService: ITextFileService
+	) { }
+
+	public async getTags(): Promise<Tags> {
+		if (!this._tags) {
+			this._tags = await this.resolveWorkspaceTags(this.environmentService.configuration, rootFiles => this.handleWorkspaceFiles(rootFiles));
+		}
+
+		return this._tags;
+	}
+
+	/* __GDPR__FRAGMENT__
+		"WorkspaceTags" : {
+			"workbench.filesToOpenOrCreate" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workbench.filesToDiff" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			"workspace.roots" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.empty" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.grunt" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gulp" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.jake" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.tsconfig" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.jsconfig" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.config.xml" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.vsc.extension" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.asp<NUMBER>" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.sln" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.unity" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.express" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.sails" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.koa" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.hapi" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.socket.io" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.restify" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.rnpm-plugin-windows" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.react" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@angular/core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.vue" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.aws-sdk" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.aws-amplify-sdk" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@google-cloud/common" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.firebase" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.heroku-cli" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.bower" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.yeoman.code.ext" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.cordova.high" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.cordova.low" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.xamarin.android" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.xamarin.ios" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.android.cpp" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.reactNative" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.ionic" : { "classification" : "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": "true" },
+			"workspace.nativeScript" : { "classification" : "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": "true" },
+			"workspace.java.pom" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.requirements" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.requirements.star" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.Pipfile" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.conda" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.any-azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-storage-common" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-storage-blob" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-storage-file" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-storage-queue" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-mgmt" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-shell" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.pulumi-azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-cosmos" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-devtools" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-elasticluster" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-eventgrid" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-functions" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-graphrbac" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-keyvault" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-loganalytics" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-monitor" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-servicebus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-servicefabric" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-translator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-iothub-device-client" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-ml" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.adal" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.pydocumentdb" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.botbuilder-core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.botbuilder-schema" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.botframework-connector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+
+		}
+	*/
+	private resolveWorkspaceTags(configuration: IWindowConfiguration, participant?: (rootFiles: string[]) => void): Promise<Tags> {
+		const tags: Tags = Object.create(null);
+
+		const state = this.contextService.getWorkbenchState();
+		const workspace = this.contextService.getWorkspace();
+
+		function createHash(uri: URI): string {
+			return crypto.createHash('sha1').update(uri.scheme === Schemas.file ? uri.fsPath : uri.toString()).digest('hex');
+		}
+
+		let workspaceId: string | undefined;
+		switch (state) {
+			case WorkbenchState.EMPTY:
+				workspaceId = undefined;
+				break;
+			case WorkbenchState.FOLDER:
+				workspaceId = createHash(workspace.folders[0].uri);
+				break;
+			case WorkbenchState.WORKSPACE:
+				if (workspace.configuration) {
+					workspaceId = createHash(workspace.configuration);
+				}
+		}
+
+		tags['workspace.id'] = workspaceId;
+
+		const { filesToOpenOrCreate, filesToDiff } = configuration;
+		tags['workbench.filesToOpenOrCreate'] = filesToOpenOrCreate && filesToOpenOrCreate.length || 0;
+		tags['workbench.filesToDiff'] = filesToDiff && filesToDiff.length || 0;
+
+		const isEmpty = state === WorkbenchState.EMPTY;
+		tags['workspace.roots'] = isEmpty ? 0 : workspace.folders.length;
+		tags['workspace.empty'] = isEmpty;
+
+		const folders = !isEmpty ? workspace.folders.map(folder => folder.uri) : this.environmentService.appQuality !== 'stable' && this.findFolders(configuration);
+		if (!folders || !folders.length || !this.fileService) {
+			return Promise.resolve(tags);
+		}
+
+		return this.fileService.resolveAll(folders.map(resource => ({ resource }))).then((files: IResolveFileResult[]) => {
+			const names = (<IFileStat[]>[]).concat(...files.map(result => result.success ? (result.stat!.children || []) : [])).map(c => c.name);
+			const nameSet = names.reduce((s, n) => s.add(n.toLowerCase()), new Set());
+
+			if (participant) {
+				participant(names);
+			}
+
+			tags['workspace.grunt'] = nameSet.has('gruntfile.js');
+			tags['workspace.gulp'] = nameSet.has('gulpfile.js');
+			tags['workspace.jake'] = nameSet.has('jakefile.js');
+
+			tags['workspace.tsconfig'] = nameSet.has('tsconfig.json');
+			tags['workspace.jsconfig'] = nameSet.has('jsconfig.json');
+			tags['workspace.config.xml'] = nameSet.has('config.xml');
+			tags['workspace.vsc.extension'] = nameSet.has('vsc-extension-quickstart.md');
+
+			tags['workspace.ASP5'] = nameSet.has('project.json') && this.searchArray(names, /^.+\.cs$/i);
+			tags['workspace.sln'] = this.searchArray(names, /^.+\.sln$|^.+\.csproj$/i);
+			tags['workspace.unity'] = nameSet.has('assets') && nameSet.has('library') && nameSet.has('projectsettings');
+			tags['workspace.npm'] = nameSet.has('package.json') || nameSet.has('node_modules');
+			tags['workspace.bower'] = nameSet.has('bower.json') || nameSet.has('bower_components');
+
+			tags['workspace.java.pom'] = nameSet.has('pom.xml');
+
+			tags['workspace.yeoman.code.ext'] = nameSet.has('vsc-extension-quickstart.md');
+
+			tags['workspace.py.requirements'] = nameSet.has('requirements.txt');
+			tags['workspace.py.requirements.star'] = this.searchArray(names, /^(.*)requirements(.*)\.txt$/i);
+			tags['workspace.py.Pipfile'] = nameSet.has('pipfile');
+			tags['workspace.py.conda'] = this.searchArray(names, /^environment(\.yml$|\.yaml$)/i);
+
+			const mainActivity = nameSet.has('mainactivity.cs') || nameSet.has('mainactivity.fs');
+			const appDelegate = nameSet.has('appdelegate.cs') || nameSet.has('appdelegate.fs');
+			const androidManifest = nameSet.has('androidmanifest.xml');
+
+			const platforms = nameSet.has('platforms');
+			const plugins = nameSet.has('plugins');
+			const www = nameSet.has('www');
+			const properties = nameSet.has('properties');
+			const resources = nameSet.has('resources');
+			const jni = nameSet.has('jni');
+
+			if (tags['workspace.config.xml'] &&
+				!tags['workspace.language.cs'] && !tags['workspace.language.vb'] && !tags['workspace.language.aspx']) {
+				if (platforms && plugins && www) {
+					tags['workspace.cordova.high'] = true;
+				} else {
+					tags['workspace.cordova.low'] = true;
+				}
+			}
+
+			if (tags['workspace.config.xml'] &&
+				!tags['workspace.language.cs'] && !tags['workspace.language.vb'] && !tags['workspace.language.aspx']) {
+
+				if (nameSet.has('ionic.config.json')) {
+					tags['workspace.ionic'] = true;
+				}
+			}
+
+			if (mainActivity && properties && resources) {
+				tags['workspace.xamarin.android'] = true;
+			}
+
+			if (appDelegate && resources) {
+				tags['workspace.xamarin.ios'] = true;
+			}
+
+			if (androidManifest && jni) {
+				tags['workspace.android.cpp'] = true;
+			}
+
+			function getFilePromises(filename: string, fileService: IFileService, textFileService: ITextFileService, contentHandler: (content: ITextFileContent) => void): Promise<void>[] {
+				return !nameSet.has(filename) ? [] : (folders as URI[]).map(workspaceUri => {
+					const uri = workspaceUri.with({ path: `${workspaceUri.path !== '/' ? workspaceUri.path : ''}/${filename}` });
+					return fileService.exists(uri).then(exists => {
+						if (!exists) {
+							return undefined;
+						}
+
+						return textFileService.read(uri, { acceptTextOnly: true }).then(contentHandler);
+					}, err => {
+						// Ignore missing file
+					});
+				});
+			}
+
+			function addPythonTags(packageName: string): void {
+				if (PyModulesToLookFor.indexOf(packageName) > -1) {
+					tags['workspace.py.' + packageName] = true;
+				}
+				// cognitive services has a lot of tiny packages. e.g. 'azure-cognitiveservices-search-autosuggest'
+				if (packageName.indexOf('azure-cognitiveservices') > -1) {
+					tags['workspace.py.azure-cognitiveservices'] = true;
+				}
+				if (packageName.indexOf('azure-mgmt') > -1) {
+					tags['workspace.py.azure-mgmt'] = true;
+				}
+				if (packageName.indexOf('azure-ml') > -1) {
+					tags['workspace.py.azure-ml'] = true;
+				}
+				if (!tags['workspace.py.any-azure']) {
+					tags['workspace.py.any-azure'] = /azure/i.test(packageName);
+				}
+			}
+
+			const requirementsTxtPromises = getFilePromises('requirements.txt', this.fileService, this.textFileService, content => {
+				const dependencies: string[] = content.value.split(/\r\n|\r|\n/);
+				for (let dependency of dependencies) {
+					// Dependencies in requirements.txt can have 3 formats: `foo==3.1, foo>=3.1, foo`
+					const format1 = dependency.split('==');
+					const format2 = dependency.split('>=');
+					const packageName = (format1.length === 2 ? format1[0] : format2[0]).trim();
+					addPythonTags(packageName);
+				}
+			});
+
+			const pipfilePromises = getFilePromises('pipfile', this.fileService, this.textFileService, content => {
+				let dependencies: string[] = content.value.split(/\r\n|\r|\n/);
+
+				// We're only interested in the '[packages]' section of the Pipfile
+				dependencies = dependencies.slice(dependencies.indexOf('[packages]') + 1);
+
+				for (let dependency of dependencies) {
+					if (dependency.trim().indexOf('[') > -1) {
+						break;
+					}
+					// All dependencies in Pipfiles follow the format: `<package> = <version, or git repo, or something else>`
+					if (dependency.indexOf('=') === -1) {
+						continue;
+					}
+					const packageName = dependency.split('=')[0].trim();
+					addPythonTags(packageName);
+				}
+
+			});
+
+			const packageJsonPromises = getFilePromises('package.json', this.fileService, this.textFileService, content => {
+				try {
+					const packageJsonContents = JSON.parse(content.value);
+					let dependencies = packageJsonContents['dependencies'];
+					let devDependencies = packageJsonContents['devDependencies'];
+					for (let module of ModulesToLookFor) {
+						if ('react-native' === module) {
+							if ((dependencies && dependencies[module]) || (devDependencies && devDependencies[module])) {
+								tags['workspace.reactNative'] = true;
+							}
+						} else if ('tns-core-modules' === module) {
+							if ((dependencies && dependencies[module]) || (devDependencies && devDependencies[module])) {
+								tags['workspace.nativescript'] = true;
+							}
+						} else {
+							if ((dependencies && dependencies[module]) || (devDependencies && devDependencies[module])) {
+								tags['workspace.npm.' + module] = true;
+							}
+						}
+					}
+
+				}
+				catch (e) {
+					// Ignore errors when resolving file or parsing file contents
+				}
+			});
+			return Promise.all([...packageJsonPromises, ...requirementsTxtPromises, ...pipfilePromises]).then(() => tags);
+		});
+	}
+
+	private handleWorkspaceFiles(rootFiles: string[]): void {
+		const state = this.contextService.getWorkbenchState();
+		const workspace = this.contextService.getWorkspace();
+
+		// Handle top-level workspace files for local single folder workspace
+		if (state === WorkbenchState.FOLDER) {
+			const workspaceFiles = rootFiles.filter(hasWorkspaceFileExtension);
+			if (workspaceFiles.length > 0) {
+				this.doHandleWorkspaceFiles(workspace.folders[0].uri, workspaceFiles);
+			}
+		}
+	}
+
+	private doHandleWorkspaceFiles(folder: URI, workspaces: string[]): void {
+		if (this.storageService.getBoolean(DISABLE_WORKSPACE_PROMPT_KEY, StorageScope.WORKSPACE)) {
+			return; // prompt disabled by user
+		}
+
+		const doNotShowAgain: IPromptChoice = {
+			label: localize('never again', "Don't Show Again"),
+			isSecondary: true,
+			run: () => this.storageService.store(DISABLE_WORKSPACE_PROMPT_KEY, true, StorageScope.WORKSPACE)
+		};
+
+		// Prompt to open one workspace
+		if (workspaces.length === 1) {
+			const workspaceFile = workspaces[0];
+
+			this.notificationService.prompt(Severity.Info, localize('workspaceFound', "This folder contains a workspace file '{0}'. Do you want to open it? [Learn more]({1}) about workspace files.", workspaceFile, 'https://go.microsoft.com/fwlink/?linkid=2025315'), [{
+				label: localize('openWorkspace', "Open Workspace"),
+				run: () => this.windowService.openWindow([{ workspaceUri: joinPath(folder, workspaceFile) }])
+			}, doNotShowAgain]);
+		}
+
+		// Prompt to select a workspace from many
+		else if (workspaces.length > 1) {
+			this.notificationService.prompt(Severity.Info, localize('workspacesFound', "This folder contains multiple workspace files. Do you want to open one? [Learn more]({0}) about workspace files.", 'https://go.microsoft.com/fwlink/?linkid=2025315'), [{
+				label: localize('selectWorkspace', "Select Workspace"),
+				run: () => {
+					this.quickInputService.pick(
+						workspaces.map(workspace => ({ label: workspace } as IQuickPickItem)),
+						{ placeHolder: localize('selectToOpen', "Select a workspace to open") }).then(pick => {
+							if (pick) {
+								this.windowService.openWindow([{ workspaceUri: joinPath(folder, pick.label) }]);
+							}
+						});
+				}
+			}, doNotShowAgain]);
+		}
+	}
+
+	private findFolders(configuration: IWindowConfiguration): URI[] | undefined {
+		const folder = this.findFolder(configuration);
+		return folder && [folder];
+	}
+
+	private findFolder({ filesToOpenOrCreate, filesToDiff }: IWindowConfiguration): URI | undefined {
+		if (filesToOpenOrCreate && filesToOpenOrCreate.length) {
+			return this.parentURI(filesToOpenOrCreate[0].fileUri);
+		} else if (filesToDiff && filesToDiff.length) {
+			return this.parentURI(filesToDiff[0].fileUri);
+		}
+		return undefined;
+	}
+
+	private parentURI(uri: URI | undefined): URI | undefined {
+		if (!uri) {
+			return undefined;
+		}
+		const path = uri.path;
+		const i = path.lastIndexOf('/');
+		return i !== -1 ? uri.with({ path: path.substr(0, i) }) : undefined;
+	}
+
+	private searchArray(arr: string[], regEx: RegExp): boolean | undefined {
+		return arr.some(v => v.search(regEx) > -1) || undefined;
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index 1b117021f53..9ca71e3d27b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -49,7 +49,7 @@ export class TerminalService extends CommonTerminalService implements ITerminalS
 		this._configHelper = this._instantiationService.createInstance(TerminalConfigHelper, this.terminalNativeService.linuxDistro);
 	}
 
-	public createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig, doCreateProcess: boolean): ITerminalInstance {
+	public createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance {
 		const instance = this._instantiationService.createInstance(TerminalInstance, terminalFocusContextKey, configHelper, container, shellLaunchConfig);
 		this._onInstanceCreated.fire(instance);
 		return instance;
@@ -60,8 +60,7 @@ export class TerminalService extends CommonTerminalService implements ITerminalS
 			const instance = this.createInstance(this._terminalFocusContextKey,
 				this.configHelper,
 				undefined,
-				shell,
-				true);
+				shell);
 			this._backgroundedTerminalInstances.push(instance);
 			this._initInstanceListeners(instance);
 			return instance;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTab.ts b/src/vs/workbench/contrib/terminal/browser/terminalTab.ts
index 20259f39e08..e00296853ff 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTab.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTab.ts
@@ -246,8 +246,7 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 				terminalFocusContextKey,
 				configHelper,
 				undefined,
-				shellLaunchConfigOrInstance,
-				true);
+				shellLaunchConfigOrInstance);
 		}
 		this._terminalInstances.push(instance);
 		this._initInstanceListeners(instance);
@@ -389,8 +388,7 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 			terminalFocusContextKey,
 			configHelper,
 			undefined,
-			shellLaunchConfig,
-			true);
+			shellLaunchConfig);
 		this._terminalInstances.splice(this._activeInstanceIndex + 1, 0, instance);
 		this._initInstanceListeners(instance);
 		this._setActiveInstance(instance);
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index 02825b35a22..fbbfd48fae7 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -251,7 +251,7 @@ export interface ITerminalService {
 	/**
 	 * Creates a raw terminal instance, this should not be used outside of the terminal part.
 	 */
-	createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig, doCreateProcess: boolean): ITerminalInstance;
+	createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
 	getInstanceFromId(terminalId: number): ITerminalInstance | undefined;
 	getInstanceFromIndex(terminalIndex: number): ITerminalInstance;
 	getTabLabels(): string[];
diff --git a/src/vs/workbench/contrib/terminal/common/terminalService.ts b/src/vs/workbench/contrib/terminal/common/terminalService.ts
index fa335e234c4..558be1e44ea 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalService.ts
@@ -119,7 +119,7 @@ export abstract class TerminalService implements ITerminalService {
 	protected abstract _showBackgroundTerminal(instance: ITerminalInstance): void;
 
 	public abstract createTerminal(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
-	public abstract createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement, shellLaunchConfig: IShellLaunchConfig, doCreateProcess: boolean): ITerminalInstance;
+	public abstract createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
 	public abstract setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
 
 	public createTerminalRenderer(name: string): ITerminalInstance {
@@ -145,7 +145,6 @@ export abstract class TerminalService implements ITerminalService {
 	}
 
 	public requestVirtualProcess(proxy: ITerminalProcessExtHostProxy, cols: number, rows: number): void {
-		// Don't need to wait on extensions here as this can only be triggered by an extension
 		this._onInstanceRequestVirtualProcess.fire({ proxy, cols, rows });
 	}
 
diff --git a/src/vs/workbench/contrib/update/electron-browser/update.ts b/src/vs/workbench/contrib/update/electron-browser/update.ts
index f21b80c1f21..ae89e3f4719 100644
--- a/src/vs/workbench/contrib/update/electron-browser/update.ts
+++ b/src/vs/workbench/contrib/update/electron-browser/update.ts
@@ -30,6 +30,7 @@ import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { FalseContext } from 'vs/platform/contextkey/common/contextkeys';
 import { ShowCurrentReleaseNotesActionId } from 'vs/workbench/contrib/update/common/update';
+import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
 
 const CONTEXT_UPDATE_STATE = new RawContextKey<string>('updateState', StateType.Uninitialized);
 
@@ -120,36 +121,44 @@ export class ProductContribution implements IWorkbenchContribution {
 		@INotificationService notificationService: INotificationService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IOpenerService openerService: IOpenerService,
-		@IConfigurationService configurationService: IConfigurationService
+		@IConfigurationService configurationService: IConfigurationService,
+		@IWindowService windowService: IWindowService,
+		@IWindowsService windowsService: IWindowsService
 	) {
-		const lastVersion = storageService.get(ProductContribution.KEY, StorageScope.GLOBAL, '');
-		const shouldShowReleaseNotes = configurationService.getValue<boolean>('update.showReleaseNotes');
+		windowsService.getActiveWindowId().then(async windowId => {
+			if (windowId !== windowService.windowId) {
+				return;
+			}
 
-		// was there an update? if so, open release notes
-		if (shouldShowReleaseNotes && !environmentService.skipReleaseNotes && product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
-			showReleaseNotes(instantiationService, pkg.version)
-				.then(undefined, () => {
-					notificationService.prompt(
-						severity.Info,
-						nls.localize('read the release notes', "Welcome to {0} v{1}! Would you like to read the Release Notes?", product.nameLong, pkg.version),
-						[{
-							label: nls.localize('releaseNotes', "Release Notes"),
-							run: () => {
-								const uri = URI.parse(product.releaseNotesUrl);
-								openerService.open(uri);
-							}
-						}],
-						{ sticky: true }
-					);
-				});
-		}
+			const lastVersion = storageService.get(ProductContribution.KEY, StorageScope.GLOBAL, '');
+			const shouldShowReleaseNotes = configurationService.getValue<boolean>('update.showReleaseNotes');
 
-		// should we show the new license?
-		if (product.licenseUrl && lastVersion && semver.satisfies(lastVersion, '<1.0.0') && semver.satisfies(pkg.version, '>=1.0.0')) {
-			notificationService.info(nls.localize('licenseChanged', "Our license terms have changed, please click [here]({0}) to go through them.", product.licenseUrl));
-		}
+			// was there an update? if so, open release notes
+			if (shouldShowReleaseNotes && !environmentService.skipReleaseNotes && product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
+				showReleaseNotes(instantiationService, pkg.version)
+					.then(undefined, () => {
+						notificationService.prompt(
+							severity.Info,
+							nls.localize('read the release notes', "Welcome to {0} v{1}! Would you like to read the Release Notes?", product.nameLong, pkg.version),
+							[{
+								label: nls.localize('releaseNotes', "Release Notes"),
+								run: () => {
+									const uri = URI.parse(product.releaseNotesUrl);
+									openerService.open(uri);
+								}
+							}],
+							{ sticky: true }
+						);
+					});
+			}
 
-		storageService.store(ProductContribution.KEY, pkg.version, StorageScope.GLOBAL);
+			// should we show the new license?
+			if (product.licenseUrl && lastVersion && semver.satisfies(lastVersion, '<1.0.0') && semver.satisfies(pkg.version, '>=1.0.0')) {
+				notificationService.info(nls.localize('licenseChanged', "Our license terms have changed, please click [here]({0}) to go through them.", product.licenseUrl));
+			}
+
+			storageService.store(ProductContribution.KEY, pkg.version, StorageScope.GLOBAL);
+		});
 	}
 }
 
diff --git a/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts b/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts
new file mode 100644
index 00000000000..c86d25f7724
--- /dev/null
+++ b/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from 'vs/base/common/event';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { IWebviewService, Webview, WebviewContentOptions, WebviewEditorOverlay, WebviewElement, WebviewOptions } from 'vs/workbench/contrib/webview/common/webview';
+import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
+import { memoize } from 'vs/base/common/decorators';
+
+/**
+ * Webview editor overlay that creates and destroys the underlying webview as needed.
+ */
+export class DynamicWebviewEditorOverlay extends Disposable implements WebviewEditorOverlay {
+
+	private readonly _pendingMessages = new Set<any>();
+	private readonly _webview = this._register(new MutableDisposable<WebviewElement>());
+	private readonly _webviewEvents = this._register(new DisposableStore());
+
+	private _html: string = '';
+	private _initialScrollProgress: number = 0;
+	private _state: string | undefined = undefined;
+	private _owner: any = undefined;
+
+	public constructor(
+		private readonly id: string,
+		public readonly options: WebviewOptions,
+		private _contentOptions: WebviewContentOptions,
+		@IWorkbenchLayoutService private readonly _layoutService: IWorkbenchLayoutService,
+		@IWebviewService private readonly _webviewService: IWebviewService
+	) {
+		super();
+
+		this._register(toDisposable(() => this.container.remove()));
+	}
+
+	@memoize
+	public get container() {
+		const container = document.createElement('div');
+		container.id = `webview-${this.id}`;
+		this._layoutService.getContainer(Parts.EDITOR_PART).appendChild(container);
+		return container;
+	}
+
+	public claim(owner: any) {
+		this._owner = owner;
+		this.show();
+	}
+
+	public release(owner: any) {
+		if (this._owner !== owner) {
+			return;
+		}
+		this._owner = undefined;
+		this.container.style.visibility = 'hidden';
+		if (!this.options.retainContextWhenHidden) {
+			this._webview.clear();
+			this._webviewEvents.clear();
+		}
+	}
+
+	private show() {
+		if (!this._webview.value) {
+			const webview = this._webviewService.createWebview(this.id, this.options, this._contentOptions);
+			this._webview.value = webview;
+			webview.state = this._state;
+			webview.html = this._html;
+			if (this.options.tryRestoreScrollPosition) {
+				webview.initialScrollProgress = this._initialScrollProgress;
+			}
+			this._webview.value.mountTo(this.container);
+			this._webviewEvents.clear();
+
+			webview.onDidFocus(() => { this._onDidFocus.fire(); }, undefined, this._webviewEvents);
+			webview.onDidClickLink(x => { this._onDidClickLink.fire(x); }, undefined, this._webviewEvents);
+			webview.onMessage(x => { this._onMessage.fire(x); }, undefined, this._webviewEvents);
+
+			webview.onDidScroll(x => {
+				this._initialScrollProgress = x.scrollYPercentage;
+				this._onDidScroll.fire(x);
+			}, undefined, this._webviewEvents);
+
+			webview.onDidUpdateState(state => {
+				this._state = state;
+				this._onDidUpdateState.fire(state);
+			}, undefined, this._webviewEvents);
+
+			this._pendingMessages.forEach(msg => webview.sendMessage(msg));
+			this._pendingMessages.clear();
+		}
+		this.container.style.visibility = 'visible';
+	}
+
+	public get html(): string { return this._html; }
+	public set html(value: string) {
+		this._html = value;
+		this.withWebview(webview => webview.html = value);
+	}
+
+	public get initialScrollProgress(): number { return this._initialScrollProgress; }
+	public set initialScrollProgress(value: number) {
+		this._initialScrollProgress = value;
+		this.withWebview(webview => webview.initialScrollProgress = value);
+	}
+
+	public get state(): string | undefined { return this._state; }
+	public set state(value: string | undefined) {
+		this._state = value;
+		this.withWebview(webview => webview.state = value);
+	}
+
+	public get contentOptions(): WebviewContentOptions { return this._contentOptions; }
+	public set contentOptions(value: WebviewContentOptions) {
+		this._contentOptions = value;
+		this.withWebview(webview => webview.contentOptions = value);
+	}
+
+	private readonly _onDidFocus = this._register(new Emitter<void>());
+	public readonly onDidFocus: Event<void> = this._onDidFocus.event;
+
+	private readonly _onDidClickLink = this._register(new Emitter<URI>());
+	public readonly onDidClickLink: Event<URI> = this._onDidClickLink.event;
+
+	private readonly _onDidScroll = this._register(new Emitter<{ scrollYPercentage: number; }>());
+	public readonly onDidScroll: Event<{ scrollYPercentage: number; }> = this._onDidScroll.event;
+
+	private readonly _onDidUpdateState = this._register(new Emitter<string | undefined>());
+	public readonly onDidUpdateState: Event<string | undefined> = this._onDidUpdateState.event;
+
+	private readonly _onMessage = this._register(new Emitter<any>());
+	public readonly onMessage: Event<any> = this._onMessage.event;
+
+	sendMessage(data: any): void {
+		if (this._webview.value) {
+			this._webview.value.sendMessage(data);
+		} else {
+			this._pendingMessages.add(data);
+		}
+	}
+
+	update(html: string, options: WebviewContentOptions, retainContextWhenHidden: boolean): void {
+		this._contentOptions = options;
+		this._html = html;
+		this.withWebview(webview => {
+			webview.update(html, options, retainContextWhenHidden);
+		});
+	}
+
+	layout(): void { this.withWebview(webview => webview.layout()); }
+	focus(): void { this.withWebview(webview => webview.focus()); }
+	reload(): void { this.withWebview(webview => webview.reload()); }
+	showFind(): void { this.withWebview(webview => webview.showFind()); }
+	hideFind(): void { this.withWebview(webview => webview.hideFind()); }
+
+	public getInnerWebview() {
+		return this._webview.value;
+	}
+
+	private withWebview(f: (webview: Webview) => void): void {
+		if (this._webview.value) {
+			f(this._webview.value);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts b/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts
index 591784f328b..c91e93d915f 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts
@@ -9,6 +9,7 @@ import { IEditorModel } from 'vs/platform/editor/common/editor';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { EditorInput, EditorModel, GroupIdentifier, IEditorInput } from 'vs/workbench/common/editor';
 import { WebviewEditorOverlay } from 'vs/workbench/contrib/webview/common/webview';
+import { UnownedDisposable as Unowned } from 'vs/base/common/lifecycle';
 
 class WebviewIconsManager {
 	private readonly _icons = new Map<string, { light: URI, dark: URI }>();
@@ -58,6 +59,7 @@ export class WebviewEditorInput extends EditorInput {
 	private _name: string;
 	private _iconPath?: { light: URI, dark: URI };
 	private _group?: GroupIdentifier;
+	private readonly _webview: WebviewEditorOverlay;
 
 	constructor(
 		public readonly id: string,
@@ -67,14 +69,14 @@ export class WebviewEditorInput extends EditorInput {
 			readonly location: URI;
 			readonly id: ExtensionIdentifier;
 		},
-		public readonly webview: WebviewEditorOverlay,
+		webview: Unowned<WebviewEditorOverlay>,
 	) {
 		super();
 
 		this._name = name;
 		this.extension = extension;
 
-		this._register(webview); // The input owns this webview
+		this._webview = this._register(webview.acquire()); // The input owns this webview
 	}
 
 	public getTypeId(): string {
@@ -105,6 +107,10 @@ export class WebviewEditorInput extends EditorInput {
 		this._onDidChangeLabel.fire();
 	}
 
+	public get webview() {
+		return this._webview;
+	}
+
 	public get iconPath() {
 		return this._iconPath;
 	}
@@ -147,7 +153,7 @@ export class RevivedWebviewEditorInput extends WebviewEditorInput {
 			readonly id: ExtensionIdentifier
 		},
 		private readonly reviver: (input: WebviewEditorInput) => Promise<void>,
-		webview: WebviewEditorOverlay,
+		webview: Unowned<WebviewEditorOverlay>,
 	) {
 		super(id, viewType, name, extension, webview);
 	}
diff --git a/src/vs/workbench/contrib/webview/browser/webviewEditorService.ts b/src/vs/workbench/contrib/webview/browser/webviewEditorService.ts
index 3173d0afc4a..49d8bcc11cd 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewEditorService.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewEditorService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { equals } from 'vs/base/common/arrays';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable, UnownedDisposable } from 'vs/base/common/lifecycle';
 import { values } from 'vs/base/common/map';
 import { URI } from 'vs/base/common/uri';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
@@ -144,7 +144,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 	): WebviewEditorInput {
 		const webview = this.createWebiew(id, extension, options);
 
-		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, id, viewType, title, extension, webview);
+		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, id, viewType, title, extension, new UnownedDisposable(webview));
 		this._editorService.openEditor(webviewInput, { pinned: true, preserveFocus: showOptions.preserveFocus }, showOptions.group);
 		return webviewInput;
 	}
@@ -191,7 +191,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 			const promise = new Promise<void>(r => { resolve = r; });
 			this._revivalPool.add(webview, resolve!);
 			return promise;
-		}, webview);
+		}, new UnownedDisposable(webview));
 
 		webviewInput.iconPath = iconPath;
 
diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
index 22a9a4f7532..5e5df2a02cf 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
@@ -45,7 +45,9 @@ export class IFrameWebview extends Disposable implements Webview {
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		super();
-		if (typeof environmentService.webviewEndpoint !== 'string') {
+		const useExternalEndpoint = this._configurationService.getValue<string>('webview.experimental.useExternalEndpoint');
+
+		if (typeof environmentService.webviewEndpoint !== 'string' && !useExternalEndpoint) {
 			throw new Error('To use iframe based webviews, you must configure `environmentService.webviewEndpoint`');
 		}
 
@@ -142,7 +144,9 @@ export class IFrameWebview extends Disposable implements Webview {
 	}
 
 	private get endpoint(): string {
-		const endpoint = this.environmentService.webviewEndpoint!.replace('{{uuid}}', this.id);
+		const useExternalEndpoint = this._configurationService.getValue<string>('webview.experimental.useExternalEndpoint');
+		const baseEndpoint = useExternalEndpoint ? 'https://{{uuid}}.vscode-webview-test.com/8fa811108f0f0524c473020ef57b6620f6c201e1' : this.environmentService.webviewEndpoint!;
+		const endpoint = baseEndpoint.replace('{{uuid}}', this.id);
 		if (endpoint[endpoint.length - 1] === '/') {
 			return endpoint.slice(0, endpoint.length - 1);
 		}
diff --git a/src/vs/workbench/contrib/webview/browser/webviewService.ts b/src/vs/workbench/contrib/webview/browser/webviewService.ts
index a151f3840df..1995a857f5e 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewService.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewService.ts
@@ -3,14 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IFrameWebview } from 'vs/workbench/contrib/webview/browser/webviewElement';
-import { IWebviewService, Webview, WebviewContentOptions, WebviewEditorOverlay, WebviewElement, WebviewOptions } from 'vs/workbench/contrib/webview/common/webview';
-import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { memoize } from 'vs/base/common/decorators';
+import { IWebviewService, WebviewContentOptions, WebviewEditorOverlay, WebviewElement, WebviewOptions } from 'vs/workbench/contrib/webview/common/webview';
+import { DynamicWebviewEditorOverlay } from './dynamicWebviewEditorOverlay';
 
 export class WebviewService implements IWebviewService {
 	_serviceBrand: any;
@@ -35,166 +31,3 @@ export class WebviewService implements IWebviewService {
 		return this._instantiationService.createInstance(DynamicWebviewEditorOverlay, id, options, contentOptions);
 	}
 }
-
-/**
- * Webview editor overlay that creates and destroys the underlying webview as needed.
- */
-class DynamicWebviewEditorOverlay extends Disposable implements WebviewEditorOverlay {
-
-	private readonly _pendingMessages = new Set<any>();
-	private readonly _webview = this._register(new MutableDisposable<WebviewElement>());
-	private readonly _webviewEvents = this._register(new DisposableStore());
-
-	private _html: string = '';
-	private _initialScrollProgress: number = 0;
-	private _state: string | undefined = undefined;
-	private _owner: any = undefined;
-
-	public constructor(
-		private readonly id: string,
-		public readonly options: WebviewOptions,
-		private _contentOptions: WebviewContentOptions,
-		@IWorkbenchLayoutService private readonly _layoutService: IWorkbenchLayoutService,
-		@IWebviewService private readonly _webviewService: IWebviewService,
-	) {
-		super();
-
-		this._register(toDisposable(() => this.container.remove()));
-	}
-
-	@memoize
-	public get container() {
-		const container = document.createElement('div');
-		container.id = `webview-${this.id}`;
-		this._layoutService.getContainer(Parts.EDITOR_PART).appendChild(container);
-		return container;
-	}
-
-	public claim(owner: any) {
-		this._owner = owner;
-		this.show();
-	}
-
-	public release(owner: any) {
-		if (this._owner !== owner) {
-			return;
-		}
-
-		this._owner = undefined;
-		this.container.style.visibility = 'hidden';
-		if (!this.options.retainContextWhenHidden) {
-			this._webview.clear();
-			this._webviewEvents.clear();
-		}
-	}
-
-	private show() {
-		if (!this._webview.value) {
-			const webview = this._webviewService.createWebview(this.id, this.options, this._contentOptions);
-			this._webview.value = webview;
-			webview.state = this._state;
-			webview.html = this._html;
-
-			if (this.options.tryRestoreScrollPosition) {
-				webview.initialScrollProgress = this._initialScrollProgress;
-			}
-
-			this._webview.value.mountTo(this.container);
-
-			this._webviewEvents.clear();
-
-			webview.onDidFocus(() => {
-				this._onDidFocus.fire();
-			}, undefined, this._webviewEvents);
-
-			webview.onDidClickLink(x => {
-				this._onDidClickLink.fire(x);
-			}, undefined, this._webviewEvents);
-
-			webview.onDidScroll(x => {
-				this._initialScrollProgress = x.scrollYPercentage;
-				this._onDidScroll.fire(x);
-			}, undefined, this._webviewEvents);
-
-			webview.onDidUpdateState(state => {
-				this._state = state;
-				this._onDidUpdateState.fire(state);
-			}, undefined, this._webviewEvents);
-
-			webview.onMessage(x => {
-				this._onMessage.fire(x);
-			}, undefined, this._webviewEvents);
-
-			this._pendingMessages.forEach(msg => webview.sendMessage(msg));
-			this._pendingMessages.clear();
-		}
-		this.container.style.visibility = 'visible';
-	}
-
-	public get html(): string { return this._html; }
-	public set html(value: string) {
-		this._html = value;
-		this.withWebview(webview => webview.html = value);
-	}
-
-	public get initialScrollProgress(): number { return this._initialScrollProgress; }
-	public set initialScrollProgress(value: number) {
-		this._initialScrollProgress = value;
-		this.withWebview(webview => webview.initialScrollProgress = value);
-	}
-
-	public get state(): string | undefined { return this._state; }
-	public set state(value: string | undefined) {
-		this._state = value;
-		this.withWebview(webview => webview.state = value);
-	}
-
-	public get contentOptions(): WebviewContentOptions { return this._contentOptions; }
-	public set contentOptions(value: WebviewContentOptions) {
-		this._contentOptions = value;
-		this.withWebview(webview => webview.contentOptions = value);
-	}
-
-	private readonly _onDidFocus = this._register(new Emitter<void>());
-	public readonly onDidFocus: Event<void> = this._onDidFocus.event;
-
-	private readonly _onDidClickLink = this._register(new Emitter<URI>());
-	public readonly onDidClickLink: Event<URI> = this._onDidClickLink.event;
-
-	private readonly _onDidScroll = this._register(new Emitter<{ scrollYPercentage: number; }>());
-	public readonly onDidScroll: Event<{ scrollYPercentage: number; }> = this._onDidScroll.event;
-
-	private readonly _onDidUpdateState = this._register(new Emitter<string | undefined>());
-	public readonly onDidUpdateState: Event<string | undefined> = this._onDidUpdateState.event;
-
-	private readonly _onMessage = this._register(new Emitter<any>());
-	public readonly onMessage: Event<any> = this._onMessage.event;
-
-	sendMessage(data: any): void {
-		if (this._webview.value) {
-			this._webview.value.sendMessage(data);
-		} else {
-			this._pendingMessages.add(data);
-		}
-	}
-
-	update(html: string, options: WebviewContentOptions, retainContextWhenHidden: boolean): void {
-		this._contentOptions = options;
-		this._html = html;
-		this.withWebview(webview => {
-			webview.update(html, options, retainContextWhenHidden);
-		});
-	}
-
-	layout(): void { this.withWebview(webview => webview.layout()); }
-	focus(): void { this.withWebview(webview => webview.focus()); }
-	reload(): void { this.withWebview(webview => webview.reload()); }
-	showFind(): void { this.withWebview(webview => webview.showFind()); }
-	hideFind(): void { this.withWebview(webview => webview.hideFind()); }
-
-	private withWebview(f: (webview: Webview) => void): void {
-		if (this._webview.value) {
-			f(this._webview.value);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/webview/common/webview.ts b/src/vs/workbench/contrib/webview/common/webview.ts
index 5f2d3053ff1..8d81b487a5a 100644
--- a/src/vs/workbench/contrib/webview/common/webview.ts
+++ b/src/vs/workbench/contrib/webview/common/webview.ts
@@ -97,6 +97,8 @@ export interface WebviewEditorOverlay extends Webview {
 
 	claim(owner: any): void;
 	release(owner: any): void;
+
+	getInnerWebview(): Webview | undefined;
 }
 
 export const webviewDeveloperCategory = nls.localize('developer', "Developer");
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webview.contribution.ts b/src/vs/workbench/contrib/webview/electron-browser/webview.contribution.ts
index 13b7185842a..084163f0459 100644
--- a/src/vs/workbench/contrib/webview/electron-browser/webview.contribution.ts
+++ b/src/vs/workbench/contrib/webview/electron-browser/webview.contribution.ts
@@ -15,9 +15,9 @@ import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from 'vs/wor
 import { WebviewEditor } from 'vs/workbench/contrib/webview/browser/webviewEditor';
 import { IWebviewService, webviewDeveloperCategory } from 'vs/workbench/contrib/webview/common/webview';
 import * as webviewCommands from 'vs/workbench/contrib/webview/electron-browser/webviewCommands';
-import { WebviewService } from 'vs/workbench/contrib/webview/electron-browser/webviewService';
+import { ElectronWebviewService } from 'vs/workbench/contrib/webview/electron-browser/webviewService';
 
-registerSingleton(IWebviewService, WebviewService, true);
+registerSingleton(IWebviewService, ElectronWebviewService, true);
 
 const actionRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewCommands.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewCommands.ts
index d2b6f7d531b..a1d8ecda01a 100644
--- a/src/vs/workbench/contrib/webview/electron-browser/webviewCommands.ts
+++ b/src/vs/workbench/contrib/webview/electron-browser/webviewCommands.ts
@@ -9,6 +9,7 @@ import { Command, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { WebviewEditor } from 'vs/workbench/contrib/webview/browser/webviewEditor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ElectronWebviewBasedWebview } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
+import { WebviewEditorOverlay } from 'vs/workbench/contrib/webview/common/webview';
 
 export class OpenWebviewDeveloperToolsAction extends Action {
 	static readonly ID = 'workbench.action.webview.openDeveloperTools';
@@ -92,6 +93,11 @@ function withActiveWebviewBasedWebview(accessor: ServicesAccessor, f: (webview:
 		webViewEditor.withWebview(webview => {
 			if (webview instanceof ElectronWebviewBasedWebview) {
 				f(webview);
+			} else if ((webview as WebviewEditorOverlay).getInnerWebview) {
+				const innerWebview = (webview as WebviewEditorOverlay).getInnerWebview();
+				if (innerWebview instanceof ElectronWebviewBasedWebview) {
+					f(innerWebview);
+				}
 			}
 		});
 	}
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewService.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewService.ts
index 75727aa6389..ae8eb72d06f 100644
--- a/src/vs/workbench/contrib/webview/electron-browser/webviewService.ts
+++ b/src/vs/workbench/contrib/webview/electron-browser/webviewService.ts
@@ -3,25 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { WebviewService as BrowserWebviewService } from 'vs/workbench/contrib/webview/browser/webviewService';
-import { IWebviewService, WebviewContentOptions, WebviewElement, WebviewOptions } from 'vs/workbench/contrib/webview/common/webview';
+import { DynamicWebviewEditorOverlay } from 'vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay';
+import { IFrameWebview } from 'vs/workbench/contrib/webview/browser/webviewElement';
+import { IWebviewService, WebviewContentOptions, WebviewEditorOverlay, WebviewElement, WebviewOptions } from 'vs/workbench/contrib/webview/common/webview';
 import { ElectronWebviewBasedWebview } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
 
-export class WebviewService extends BrowserWebviewService implements IWebviewService {
+export class ElectronWebviewService implements IWebviewService {
 	_serviceBrand: any;
 
 	constructor(
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) {
-		super(instantiationService);
-	}
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationService private readonly _configService: IConfigurationService,
+	) { }
 
 	createWebview(
-		_id: string,
+		id: string,
 		options: WebviewOptions,
 		contentOptions: WebviewContentOptions
 	): WebviewElement {
-		return this.instantiationService.createInstance(ElectronWebviewBasedWebview, options, contentOptions);
+		const useExternalEndpoint = this._configService.getValue<string>('webview.experimental.useExternalEndpoint');
+		if (useExternalEndpoint) {
+			return this._instantiationService.createInstance(IFrameWebview, id, options, contentOptions);
+		} else {
+			return this._instantiationService.createInstance(ElectronWebviewBasedWebview, options, contentOptions);
+		}
+	}
+
+	createWebviewEditorOverlay(
+		id: string,
+		options: WebviewOptions,
+		contentOptions: WebviewContentOptions,
+	): WebviewEditorOverlay {
+		return this._instantiationService.createInstance(DynamicWebviewEditorOverlay, id, options, contentOptions);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/commands/common/commandService.ts b/src/vs/workbench/services/commands/common/commandService.ts
index ffb7d1ebd83..f1826cd036a 100644
--- a/src/vs/workbench/services/commands/common/commandService.ts
+++ b/src/vs/workbench/services/commands/common/commandService.ts
@@ -22,6 +22,9 @@ export class CommandService extends Disposable implements ICommandService {
 	private readonly _onWillExecuteCommand: Emitter<ICommandEvent> = this._register(new Emitter<ICommandEvent>());
 	public readonly onWillExecuteCommand: Event<ICommandEvent> = this._onWillExecuteCommand.event;
 
+	private readonly _onDidExecuteCommand: Emitter<ICommandEvent> = new Emitter<ICommandEvent>();
+	public readonly onDidExecuteCommand: Event<ICommandEvent> = this._onDidExecuteCommand.event;
+
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
@@ -77,8 +80,9 @@ export class CommandService extends Disposable implements ICommandService {
 			return Promise.reject(new Error(`command '${id}' not found`));
 		}
 		try {
-			this._onWillExecuteCommand.fire({ commandId: id });
+			this._onWillExecuteCommand.fire({ commandId: id, args });
 			const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler, ...args]);
+			this._onDidExecuteCommand.fire({ commandId: id, args });
 			return Promise.resolve(result);
 		} catch (err) {
 			return Promise.reject(err);
diff --git a/src/vs/workbench/services/configuration/browser/configuration.ts b/src/vs/workbench/services/configuration/browser/configuration.ts
index 515c6df2fe3..fe76b1061e3 100644
--- a/src/vs/workbench/services/configuration/browser/configuration.ts
+++ b/src/vs/workbench/services/configuration/browser/configuration.ts
@@ -12,7 +12,7 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { FileChangeType, FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
 import { ConfigurationModel, ConfigurationModelParser } from 'vs/platform/configuration/common/configurationModels';
 import { WorkspaceConfigurationModelParser, StandaloneConfigurationModelParser } from 'vs/workbench/services/configuration/common/configurationModels';
-import { FOLDER_SETTINGS_PATH, TASKS_CONFIGURATION_KEY, FOLDER_SETTINGS_NAME, LAUNCH_CONFIGURATION_KEY, IConfigurationCache, ConfigurationKey, REMOTE_MACHINE_SCOPES, FOLDER_SCOPES, WORKSPACE_SCOPES, ConfigurationFileService } from 'vs/workbench/services/configuration/common/configuration';
+import { FOLDER_SETTINGS_PATH, TASKS_CONFIGURATION_KEY, FOLDER_SETTINGS_NAME, LAUNCH_CONFIGURATION_KEY, IConfigurationCache, ConfigurationKey, REMOTE_MACHINE_SCOPES, FOLDER_SCOPES, WORKSPACE_SCOPES } from 'vs/workbench/services/configuration/common/configuration';
 import { IStoredWorkspaceFolder, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { JSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditingService';
 import { WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
@@ -24,6 +24,20 @@ import { IConfigurationModel } from 'vs/platform/configuration/common/configurat
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { hash } from 'vs/base/common/hash';
 
+function whenProviderRegistered(scheme: string, fileService: IFileService): Promise<void> {
+	if (fileService.canHandleResource(URI.from({ scheme }))) {
+		return Promise.resolve();
+	}
+	return new Promise((c, e) => {
+		const disposable = fileService.onDidChangeFileSystemProviderRegistrations(e => {
+			if (e.scheme === scheme && e.added) {
+				disposable.dispose();
+				c();
+			}
+		});
+	});
+}
+
 export class UserConfiguration extends Disposable {
 
 	private readonly parser: ConfigurationModelParser;
@@ -66,7 +80,7 @@ export class UserConfiguration extends Disposable {
 export class RemoteUserConfiguration extends Disposable {
 
 	private readonly _cachedConfiguration: CachedRemoteUserConfiguration;
-	private readonly _configurationFileService: ConfigurationFileService;
+	private readonly _fileService: IFileService;
 	private _userConfiguration: FileServiceBasedRemoteUserConfiguration | CachedRemoteUserConfiguration;
 	private _userConfigurationInitializationPromise: Promise<ConfigurationModel> | null = null;
 
@@ -76,15 +90,15 @@ export class RemoteUserConfiguration extends Disposable {
 	constructor(
 		remoteAuthority: string,
 		configurationCache: IConfigurationCache,
-		configurationFileService: ConfigurationFileService,
+		fileService: IFileService,
 		remoteAgentService: IRemoteAgentService
 	) {
 		super();
-		this._configurationFileService = configurationFileService;
+		this._fileService = fileService;
 		this._userConfiguration = this._cachedConfiguration = new CachedRemoteUserConfiguration(remoteAuthority, configurationCache);
 		remoteAgentService.getEnvironment().then(async environment => {
 			if (environment) {
-				const userConfiguration = this._register(new FileServiceBasedRemoteUserConfiguration(environment.settingsPath, REMOTE_MACHINE_SCOPES, this._configurationFileService));
+				const userConfiguration = this._register(new FileServiceBasedRemoteUserConfiguration(environment.settingsPath, REMOTE_MACHINE_SCOPES, this._fileService));
 				this._register(userConfiguration.onDidChangeConfiguration(configurationModel => this.onDidUserConfigurationChange(configurationModel)));
 				this._userConfigurationInitializationPromise = userConfiguration.initialize();
 				const configurationModel = await this._userConfigurationInitializationPromise;
@@ -142,12 +156,12 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
 	constructor(
 		private readonly configurationResource: URI,
 		private readonly scopes: ConfigurationScope[] | undefined,
-		private readonly configurationFileService: ConfigurationFileService
+		private readonly fileService: IFileService
 	) {
 		super();
 
 		this.parser = new ConfigurationModelParser(this.configurationResource.toString(), this.scopes);
-		this._register(configurationFileService.onFileChanges(e => this.handleFileEvents(e)));
+		this._register(fileService.onFileChanges(e => this.handleFileEvents(e)));
 		this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this.reload().then(configurationModel => this._onDidChangeConfiguration.fire(configurationModel)), 50));
 		this._register(toDisposable(() => {
 			this.stopWatchingResource();
@@ -156,7 +170,7 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
 	}
 
 	private watchResource(): void {
-		this.fileWatcherDisposable = this.configurationFileService.watch(this.configurationResource);
+		this.fileWatcherDisposable = this.fileService.watch(this.configurationResource);
 	}
 
 	private stopWatchingResource(): void {
@@ -166,7 +180,7 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
 
 	private watchDirectory(): void {
 		const directory = resources.dirname(this.configurationResource);
-		this.directoryWatcherDisposable = this.configurationFileService.watch(directory);
+		this.directoryWatcherDisposable = this.fileService.watch(directory);
 	}
 
 	private stopWatchingDirectory(): void {
@@ -175,15 +189,15 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
 	}
 
 	async initialize(): Promise<ConfigurationModel> {
-		const exists = await this.configurationFileService.exists(this.configurationResource);
+		const exists = await this.fileService.exists(this.configurationResource);
 		this.onResourceExists(exists);
 		return this.reload();
 	}
 
 	async reload(): Promise<ConfigurationModel> {
 		try {
-			const content = await this.configurationFileService.readFile(this.configurationResource);
-			this.parser.parseContent(content);
+			const content = await this.fileService.readFile(this.configurationResource);
+			this.parser.parseContent(content.value.toString());
 			return this.parser.configurationModel;
 		} catch (e) {
 			return new ConfigurationModel();
@@ -279,7 +293,7 @@ class CachedRemoteUserConfiguration extends Disposable {
 
 export class WorkspaceConfiguration extends Disposable {
 
-	private readonly _configurationFileService: ConfigurationFileService;
+	private readonly _fileService: IFileService;
 	private readonly _cachedConfiguration: CachedWorkspaceConfiguration;
 	private _workspaceConfiguration: IWorkspaceConfiguration;
 	private _workspaceConfigurationChangeDisposable: IDisposable = Disposable.None;
@@ -293,10 +307,10 @@ export class WorkspaceConfiguration extends Disposable {
 
 	constructor(
 		configurationCache: IConfigurationCache,
-		configurationFileService: ConfigurationFileService
+		fileService: IFileService
 	) {
 		super();
-		this._configurationFileService = configurationFileService;
+		this._fileService = fileService;
 		this._workspaceConfiguration = this._cachedConfiguration = new CachedWorkspaceConfiguration(configurationCache);
 	}
 
@@ -304,7 +318,7 @@ export class WorkspaceConfiguration extends Disposable {
 		this._workspaceIdentifier = workspaceIdentifier;
 		if (!(this._workspaceConfiguration instanceof FileServiceBasedWorkspaceConfiguration)) {
 			if (this._workspaceIdentifier.configPath.scheme === Schemas.file) {
-				this.switch(new FileServiceBasedWorkspaceConfiguration(this._configurationFileService));
+				this.switch(new FileServiceBasedWorkspaceConfiguration(this._fileService));
 			} else {
 				this.waitAndSwitch(this._workspaceIdentifier);
 			}
@@ -339,9 +353,9 @@ export class WorkspaceConfiguration extends Disposable {
 	}
 
 	private async waitAndSwitch(workspaceIdentifier: IWorkspaceIdentifier): Promise<void> {
-		await this._configurationFileService.whenProviderRegistered(workspaceIdentifier.configPath.scheme);
+		await whenProviderRegistered(workspaceIdentifier.configPath.scheme, this._fileService);
 		if (!(this._workspaceConfiguration instanceof FileServiceBasedWorkspaceConfiguration)) {
-			const fileServiceBasedWorkspaceConfiguration = this._register(new FileServiceBasedWorkspaceConfiguration(this._configurationFileService));
+			const fileServiceBasedWorkspaceConfiguration = this._register(new FileServiceBasedWorkspaceConfiguration(this._fileService));
 			await fileServiceBasedWorkspaceConfiguration.load(workspaceIdentifier);
 			this.switch(fileServiceBasedWorkspaceConfiguration);
 			this._loaded = true;
@@ -396,13 +410,13 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable implements IWork
 	protected readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
 	readonly onDidChange: Event<void> = this._onDidChange.event;
 
-	constructor(private configurationFileService: ConfigurationFileService) {
+	constructor(private fileService: IFileService) {
 		super();
 
 		this.workspaceConfigurationModelParser = new WorkspaceConfigurationModelParser('');
 		this.workspaceSettings = new ConfigurationModel();
 
-		this._register(configurationFileService.onFileChanges(e => this.handleWorkspaceFileEvents(e)));
+		this._register(fileService.onFileChanges(e => this.handleWorkspaceFileEvents(e)));
 		this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this._onDidChange.fire(), 50));
 		this.workspaceConfigWatcher = this._register(this.watchWorkspaceConfigurationFile());
 	}
@@ -420,9 +434,10 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable implements IWork
 		}
 		let contents = '';
 		try {
-			contents = await this.configurationFileService.readFile(this._workspaceIdentifier.configPath);
+			const content = await this.fileService.readFile(this._workspaceIdentifier.configPath);
+			contents = content.value.toString();
 		} catch (error) {
-			const exists = await this.configurationFileService.exists(this._workspaceIdentifier.configPath);
+			const exists = await this.fileService.exists(this._workspaceIdentifier.configPath);
 			if (exists) {
 				errors.onUnexpectedError(error);
 			}
@@ -454,7 +469,7 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable implements IWork
 	}
 
 	private watchWorkspaceConfigurationFile(): IDisposable {
-		return this._workspaceIdentifier ? this.configurationFileService.watch(this._workspaceIdentifier.configPath) : Disposable.None;
+		return this._workspaceIdentifier ? this.fileService.watch(this._workspaceIdentifier.configPath) : Disposable.None;
 	}
 
 	private handleWorkspaceFileEvents(event: FileChangesEvent): void {
@@ -557,7 +572,7 @@ class FileServiceBasedFolderConfiguration extends Disposable implements IFolderC
 	protected readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
 	readonly onDidChange: Event<void> = this._onDidChange.event;
 
-	constructor(protected readonly configurationFolder: URI, workbenchState: WorkbenchState, private configurationFileService: ConfigurationFileService) {
+	constructor(protected readonly configurationFolder: URI, workbenchState: WorkbenchState, private fileService: IFileService) {
 		super();
 
 		this.configurationNames = [FOLDER_SETTINGS_NAME /*First one should be settings */, TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY];
@@ -567,15 +582,16 @@ class FileServiceBasedFolderConfiguration extends Disposable implements IFolderC
 		this._cache = new ConfigurationModel();
 
 		this.changeEventTriggerScheduler = this._register(new RunOnceScheduler(() => this._onDidChange.fire(), 50));
-		this._register(configurationFileService.onFileChanges(e => this.handleWorkspaceFileEvents(e)));
+		this._register(fileService.onFileChanges(e => this.handleWorkspaceFileEvents(e)));
 	}
 
 	async loadConfiguration(): Promise<ConfigurationModel> {
 		const configurationContents = await Promise.all(this.configurationResources.map(async resource => {
 			try {
-				return await this.configurationFileService.readFile(resource);
+				const content = await this.fileService.readFile(resource);
+				return content.value.toString();
 			} catch (error) {
-				const exists = await this.configurationFileService.exists(resource);
+				const exists = await this.fileService.exists(resource);
 				if (exists) {
 					errors.onUnexpectedError(error);
 				}
@@ -724,7 +740,7 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat
 		readonly workspaceFolder: IWorkspaceFolder,
 		configFolderRelativePath: string,
 		private readonly workbenchState: WorkbenchState,
-		configurationFileService: ConfigurationFileService,
+		fileService: IFileService,
 		configurationCache: IConfigurationCache
 	) {
 		super();
@@ -732,13 +748,13 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat
 		this.configurationFolder = resources.joinPath(workspaceFolder.uri, configFolderRelativePath);
 		this.folderConfiguration = this.cachedFolderConfiguration = new CachedFolderConfiguration(workspaceFolder.uri, configFolderRelativePath, configurationCache);
 		if (workspaceFolder.uri.scheme === Schemas.file) {
-			this.folderConfiguration = new FileServiceBasedFolderConfiguration(this.configurationFolder, this.workbenchState, configurationFileService);
+			this.folderConfiguration = new FileServiceBasedFolderConfiguration(this.configurationFolder, this.workbenchState, fileService);
 		} else {
-			configurationFileService.whenProviderRegistered(workspaceFolder.uri.scheme)
+			whenProviderRegistered(workspaceFolder.uri.scheme, fileService)
 				.then(() => {
 					this.folderConfiguration.dispose();
 					this.folderConfigurationDisposable.dispose();
-					this.folderConfiguration = new FileServiceBasedFolderConfiguration(this.configurationFolder, this.workbenchState, configurationFileService);
+					this.folderConfiguration = new FileServiceBasedFolderConfiguration(this.configurationFolder, this.workbenchState, fileService);
 					this._register(this.folderConfiguration.onDidChange(e => this.onDidFolderConfigurationChange()));
 					this.onDidFolderConfigurationChange();
 				});
diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
index a95764ba5ca..50ffb6be24c 100644
--- a/src/vs/workbench/services/configuration/browser/configurationService.ts
+++ b/src/vs/workbench/services/configuration/browser/configurationService.ts
@@ -14,7 +14,7 @@ import { IWorkspaceContextService, Workspace, WorkbenchState, IWorkspaceFolder,
 import { ConfigurationChangeEvent, ConfigurationModel, DefaultConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
 import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, keyFromOverrideIdentifier, isConfigurationOverrides, IConfigurationData, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Configuration, WorkspaceConfigurationChangeEvent, AllKeysConfigurationChangeEvent } from 'vs/workbench/services/configuration/common/configurationModels';
-import { FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId, IConfigurationCache, machineSettingsSchemaId, LOCAL_MACHINE_SCOPES, ConfigurationFileService } from 'vs/workbench/services/configuration/common/configuration';
+import { FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId, IConfigurationCache, machineSettingsSchemaId, LOCAL_MACHINE_SCOPES } from 'vs/workbench/services/configuration/common/configuration';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions, allSettings, windowSettings, resourceSettings, applicationSettings, machineSettings } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkspaceIdentifier, isWorkspaceIdentifier, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IWorkspaceInitializationPayload, isSingleFolderWorkspaceInitializationPayload, ISingleFolderWorkspaceInitializationPayload, IEmptyWorkspaceInitializationPayload, useSlashForPath, getStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
@@ -23,7 +23,6 @@ import { ConfigurationEditingService, EditableConfigurationTarget } from 'vs/wor
 import { WorkspaceConfiguration, FolderConfiguration, RemoteUserConfiguration, UserConfiguration } from 'vs/workbench/services/configuration/browser/configuration';
 import { JSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditingService';
 import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { localize } from 'vs/nls';
 import { isEqual, dirname } from 'vs/base/common/resources';
 import { mark } from 'vs/base/common/performance';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
@@ -46,7 +45,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 	private cachedFolderConfigs: ResourceMap<FolderConfiguration>;
 	private workspaceEditingQueue: Queue<void>;
 
-	private readonly configurationFileService: ConfigurationFileService;
+	private readonly fileService: IFileService;
 
 	protected readonly _onDidChangeConfiguration: Emitter<IConfigurationChangeEvent> = this._register(new Emitter<IConfigurationChangeEvent>());
 	public readonly onDidChangeConfiguration: Event<IConfigurationChangeEvent> = this._onDidChangeConfiguration.event;
@@ -77,16 +76,16 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 		this.completeWorkspaceBarrier = new Barrier();
 		this.defaultConfiguration = new DefaultConfigurationModel();
 		this.configurationCache = configurationCache;
-		this.configurationFileService = new ConfigurationFileService(fileService);
+		this.fileService = fileService;
 		this._configuration = new Configuration(this.defaultConfiguration, new ConfigurationModel(), new ConfigurationModel(), new ConfigurationModel(), new ResourceMap(), new ConfigurationModel(), new ResourceMap<ConfigurationModel>(), this.workspace);
 		this.cachedFolderConfigs = new ResourceMap<FolderConfiguration>();
 		this.localUserConfiguration = this._register(new UserConfiguration(environmentService.settingsResource, remoteAuthority ? LOCAL_MACHINE_SCOPES : undefined, fileService));
 		this._register(this.localUserConfiguration.onDidChangeConfiguration(userConfiguration => this.onLocalUserConfigurationChanged(userConfiguration)));
 		if (remoteAuthority) {
-			this.remoteUserConfiguration = this._register(new RemoteUserConfiguration(remoteAuthority, configurationCache, this.configurationFileService, remoteAgentService));
+			this.remoteUserConfiguration = this._register(new RemoteUserConfiguration(remoteAuthority, configurationCache, fileService, remoteAgentService));
 			this._register(this.remoteUserConfiguration.onDidChangeConfiguration(userConfiguration => this.onRemoteUserConfigurationChanged(userConfiguration)));
 		}
-		this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, this.configurationFileService));
+		this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, fileService));
 		this._register(this.workspaceConfiguration.onDidUpdateConfiguration(() => {
 			this.onWorkspaceConfigurationChanged();
 			if (this.workspaceConfiguration.loaded) {
@@ -507,29 +506,29 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 	private registerConfigurationSchemas(): void {
 		if (this.workspace) {
 			const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
-			const convertToNotSuggestedProperties = (properties: IJSONSchemaMap, errorMessage: string): IJSONSchemaMap => {
+			const convertToNotSuggestedProperties = (properties: IJSONSchemaMap): IJSONSchemaMap => {
 				return Object.keys(properties).reduce((result: IJSONSchemaMap, property) => {
 					result[property] = deepClone(properties[property]);
-					result[property].deprecationMessage = errorMessage;
+					result[property].doNotSuggest = true;
 					return result;
 				}, {});
 			};
 
-			const unsupportedApplicationSettings = convertToNotSuggestedProperties(applicationSettings.properties, localize('unsupportedApplicationSetting', "This setting can be applied only in application user settings"));
-			const unsupportedMachineSettings = convertToNotSuggestedProperties(machineSettings.properties, localize('unsupportedMachineSetting', "This setting can be applied only in user settings"));
-			const unsupportedRemoteMachineSettings = convertToNotSuggestedProperties(machineSettings.properties, localize('unsupportedRemoteMachineSetting', "This setting can be applied only in remote machine settings"));
-			const allSettingsSchema: IJSONSchema = { properties: allSettings.properties, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
-			const userSettingsSchema: IJSONSchema = this.remoteUserConfiguration ? { properties: { ...applicationSettings.properties, ...unsupportedRemoteMachineSettings, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' } : allSettingsSchema;
-			const machineSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
-			const workspaceSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...unsupportedMachineSettings, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+			const unsupportedApplicationSettings = convertToNotSuggestedProperties(applicationSettings.properties);
+			const unsupportedMachineSettings = convertToNotSuggestedProperties(machineSettings.properties);
+			const unsupportedRemoteMachineSettings = convertToNotSuggestedProperties(machineSettings.properties);
+			const allSettingsSchema: IJSONSchema = { properties: allSettings.properties, patternProperties: allSettings.patternProperties, additionalProperties: true };
+			const userSettingsSchema: IJSONSchema = this.remoteUserConfiguration ? { properties: { ...applicationSettings.properties, ...unsupportedRemoteMachineSettings, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true } : allSettingsSchema;
+			const machineSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true };
+			const workspaceSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...unsupportedMachineSettings, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true };
 
 			jsonRegistry.registerSchema(defaultSettingsSchemaId, allSettingsSchema);
 			jsonRegistry.registerSchema(userSettingsSchemaId, userSettingsSchema);
 			jsonRegistry.registerSchema(machineSettingsSchemaId, machineSettingsSchema);
 
 			if (WorkbenchState.WORKSPACE === this.getWorkbenchState()) {
-				const unsupportedWindowSettings = convertToNotSuggestedProperties(windowSettings.properties, localize('unsupportedWindowSetting', "This setting cannot be applied now. It will be applied when you open this folder directly."));
-				const folderSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...unsupportedMachineSettings, ...unsupportedWindowSettings, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+				const unsupportedWindowSettings = convertToNotSuggestedProperties(windowSettings.properties);
+				const folderSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...unsupportedMachineSettings, ...unsupportedWindowSettings, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true };
 				jsonRegistry.registerSchema(workspaceSettingsSchemaId, workspaceSettingsSchema);
 				jsonRegistry.registerSchema(folderSettingsSchemaId, folderSettingsSchema);
 			} else {
@@ -611,7 +610,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 		return Promise.all([...folders.map(folder => {
 			let folderConfiguration = this.cachedFolderConfigs.get(folder.uri);
 			if (!folderConfiguration) {
-				folderConfiguration = new FolderConfiguration(folder, FOLDER_CONFIG_FOLDER_NAME, this.getWorkbenchState(), this.configurationFileService, this.configurationCache);
+				folderConfiguration = new FolderConfiguration(folder, FOLDER_CONFIG_FOLDER_NAME, this.getWorkbenchState(), this.fileService, this.configurationCache);
 				this._register(folderConfiguration.onDidChange(() => this.onWorkspaceFolderConfigurationChanged(folder)));
 				this.cachedFolderConfigs.set(folder.uri, this._register(folderConfiguration));
 			}
diff --git a/src/vs/workbench/services/configuration/common/configuration.ts b/src/vs/workbench/services/configuration/common/configuration.ts
index ca5948d81a6..170e3f136aa 100644
--- a/src/vs/workbench/services/configuration/common/configuration.ts
+++ b/src/vs/workbench/services/configuration/common/configuration.ts
@@ -3,9 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IFileService } from 'vs/platform/files/common/files';
 import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 
 export const FOLDER_CONFIG_FOLDER_NAME = '.vscode';
@@ -39,38 +36,4 @@ export interface IConfigurationCache {
 	write(key: ConfigurationKey, content: string): Promise<void>;
 	remove(key: ConfigurationKey): Promise<void>;
 
-}
-
-export class ConfigurationFileService {
-
-	constructor(private readonly fileService: IFileService) { }
-
-	get onFileChanges() { return this.fileService.onFileChanges; }
-
-	whenProviderRegistered(scheme: string): Promise<void> {
-		if (this.fileService.canHandleResource(URI.from({ scheme }))) {
-			return Promise.resolve();
-		}
-		return new Promise((c, e) => {
-			const disposable = this.fileService.onDidChangeFileSystemProviderRegistrations(e => {
-				if (e.scheme === scheme && e.added) {
-					disposable.dispose();
-					c();
-				}
-			});
-		});
-	}
-
-	watch(resource: URI): IDisposable {
-		return this.fileService.watch(resource);
-	}
-
-	exists(resource: URI): Promise<boolean> {
-		return this.fileService.exists(resource);
-	}
-
-	readFile(resource: URI): Promise<string> {
-		return this.fileService.readFile(resource).then(content => content.value.toString());
-	}
-
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
index 3c059ad069f..5f4a9ced4a2 100644
--- a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
@@ -42,7 +42,6 @@ import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemPro
 import { ConfigurationCache } from 'vs/workbench/services/configuration/node/configurationCache';
 import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
 import { IConfigurationCache } from 'vs/workbench/services/configuration/common/configuration';
-// import { VSBuffer } from 'vs/base/common/buffer';
 import { SignService } from 'vs/platform/sign/browser/signService';
 import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
 import { IKeybindingEditingService, KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
@@ -1603,7 +1602,7 @@ suite('WorkspaceConfigurationService - Remote Folder', () => {
 	// 			}
 	// 		});
 	// 	});
-	// 	await instantiationService.get(IFileService).writeFile(URI.file(remoteSettingsFile), VSBuffer.fromString('{ "configurationService.remote.machineSetting": "remoteValue" }'));
+	// 	fs.writeFileSync(remoteSettingsFile, '{ "configurationService.remote.machineSetting": "remoteValue" }');
 	// 	return promise;
 	// });
 
diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
index cefee9701c9..5b9f44514e9 100644
--- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
+++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
@@ -523,6 +523,7 @@ class MockCommandService implements ICommandService {
 	public callCount = 0;
 
 	onWillExecuteCommand = () => Disposable.None;
+	onDidExecuteCommand = () => Disposable.None;
 	public executeCommand(commandId: string, ...args: any[]): Promise<any> {
 		this.callCount++;
 
diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index 1a4e587636a..b183a2629d8 100644
--- a/src/vs/workbench/services/decorations/browser/decorationsService.ts
+++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -7,7 +7,7 @@ import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IDecorationsService, IDecoration, IResourceDecorationChangeEvent, IDecorationsProvider, IDecorationData } from './decorations';
 import { TernarySearchTree } from 'vs/base/common/map';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, toDisposable, dispose } from 'vs/base/common/lifecycle';
 import { isThenable } from 'vs/base/common/async';
 import { LinkedList } from 'vs/base/common/linkedList';
 import { createStyleSheet, createCSSRule, removeCSSRulesContainingSelector } from 'vs/base/browser/dom';
@@ -334,14 +334,15 @@ class DecorationProviderWrapper {
 	}
 }
 
-export class FileDecorationsService extends Disposable implements IDecorationsService {
+export class FileDecorationsService implements IDecorationsService {
 
 	_serviceBrand: any;
 
 	private readonly _data = new LinkedList<DecorationProviderWrapper>();
-	private readonly _onDidChangeDecorationsDelayed = this._register(new Emitter<URI | URI[]>());
-	private readonly _onDidChangeDecorations = this._register(new Emitter<IResourceDecorationChangeEvent>());
+	private readonly _onDidChangeDecorationsDelayed = new Emitter<URI | URI[]>();
+	private readonly _onDidChangeDecorations = new Emitter<IResourceDecorationChangeEvent>();
 	private readonly _decorationStyles: DecorationStyles;
+	private readonly _disposables: IDisposable[];
 
 	readonly onDidChangeDecorations: Event<IResourceDecorationChangeEvent> = Event.any(
 		this._onDidChangeDecorations.event,
@@ -355,17 +356,27 @@ export class FileDecorationsService extends Disposable implements IDecorationsSe
 	constructor(
 		@IThemeService themeService: IThemeService
 	) {
-		super();
-		this._decorationStyles = this._register(new DecorationStyles(themeService));
+		this._decorationStyles = new DecorationStyles(themeService);
 
 		// every so many events we check if there are
 		// css styles that we don't need anymore
 		let count = 0;
-		this._register(this.onDidChangeDecorations(() => {
+		let reg = this.onDidChangeDecorations(() => {
 			if (++count % 17 === 0) {
 				this._decorationStyles.cleanUp(this._data.iterator());
 			}
-		}));
+		});
+
+		this._disposables = [
+			reg,
+			this._decorationStyles
+		];
+	}
+
+	dispose(): void {
+		dispose(this._disposables);
+		dispose(this._onDidChangeDecorations);
+		dispose(this._onDidChangeDecorationsDelayed);
 	}
 
 	registerDecorationsProvider(provider: IDecorationsProvider): IDisposable {
diff --git a/src/vs/workbench/services/dialogs/browser/fileDialogService.ts b/src/vs/workbench/services/dialogs/browser/fileDialogService.ts
index 8c04023b954..f7d1e60691e 100644
--- a/src/vs/workbench/services/dialogs/browser/fileDialogService.ts
+++ b/src/vs/workbench/services/dialogs/browser/fileDialogService.ts
@@ -221,7 +221,7 @@ export class FileDialogService implements IFileDialogService {
 		const schema = this.getFileSystemSchema(options);
 		if (this.shouldUseSimplified(schema)) {
 			if (!options.availableFileSystems) {
-				options.availableFileSystems = [schema]; // by default only allow saving in the own file system
+				options.availableFileSystems = this.ensureFileSchema(schema); // always allow file as well
 			}
 
 			return this.saveRemoteResource(options);
@@ -239,7 +239,7 @@ export class FileDialogService implements IFileDialogService {
 		const schema = this.getFileSystemSchema(options);
 		if (this.shouldUseSimplified(schema)) {
 			if (!options.availableFileSystems) {
-				options.availableFileSystems = [schema]; // by default only allow loading in the own file system
+				options.availableFileSystems = this.ensureFileSchema(schema); // always allow file as well
 			}
 
 			const uri = await this.pickRemoteResource(options);
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index ff5534b4901..337f52b278a 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -130,7 +130,11 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	zip(extension: ILocalExtension): Promise<URI> {
-		throw new Error('Not Supported');
+		const server = this.getServer(extension);
+		if (server) {
+			return server.extensionManagementService.zip(extension);
+		}
+		return Promise.reject(`Invalid location ${extension.location.toString()}`);
 	}
 
 	unzip(zipLocation: URI, type: ExtensionType): Promise<IExtensionIdentifier> {
diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts
index 14d0da31fad..077598d16d6 100644
--- a/src/vs/workbench/services/extensions/browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionService.ts
@@ -14,7 +14,6 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IProductService } from 'vs/platform/product/common/product';
 import { AbstractExtensionService } from 'vs/workbench/services/extensions/common/abstractExtensionService';
-import { browserWebSocketFactory } from 'vs/platform/remote/browser/browserWebSocketFactory';
 import { ExtensionHostProcessManager } from 'vs/workbench/services/extensions/common/extensionHostProcessManager';
 import { RemoteExtensionHostClient, IInitDataProvider } from 'vs/workbench/services/extensions/common/remoteExtensionHostClient';
 import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
@@ -63,7 +62,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 		const result: ExtensionHostProcessManager[] = [];
 
 		const remoteAgentConnection = this._remoteAgentService.getConnection()!;
-		const remoteExtHostProcessWorker = this._instantiationService.createInstance(RemoteExtensionHostClient, this.getExtensions(), this._createProvider(remoteAgentConnection.remoteAuthority), browserWebSocketFactory);
+		const remoteExtHostProcessWorker = this._instantiationService.createInstance(RemoteExtensionHostClient, this.getExtensions(), this._createProvider(remoteAgentConnection.remoteAuthority), this._remoteAgentService.socketFactory);
 		const remoteExtHostProcessManager = this._instantiationService.createInstance(ExtensionHostProcessManager, false, remoteExtHostProcessWorker, remoteAgentConnection.remoteAuthority, initialActivationEvents);
 		result.push(remoteExtHostProcessManager);
 
diff --git a/src/vs/workbench/services/extensions/common/extensionHostProcessManager.ts b/src/vs/workbench/services/extensions/common/extensionHostProcessManager.ts
index c3f651cd23f..21cddb13749 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostProcessManager.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostProcessManager.ts
@@ -14,7 +14,7 @@ import { ExtHostCustomersRegistry } from 'vs/workbench/api/common/extHostCustome
 import { ExtHostContext, ExtHostExtensionServiceShape, IExtHostContext, MainContext } from 'vs/workbench/api/common/extHost.protocol';
 import { ProxyIdentifier } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 import { IRPCProtocolLogger, RPCProtocol, RequestInitiator, ResponsiveState } from 'vs/workbench/services/extensions/common/rpcProtocol';
-import { ResolvedAuthority, RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { RemoteAuthorityResolverError, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import * as nls from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
@@ -247,15 +247,17 @@ export class ExtensionHostProcessManager extends Disposable {
 		return this._extensionHostProcessWorker && Boolean(this._extensionHostProcessWorker.getInspectPort());
 	}
 
-	public async resolveAuthority(remoteAuthority: string): Promise<ResolvedAuthority> {
+	public async resolveAuthority(remoteAuthority: string): Promise<ResolverResult> {
 		const authorityPlusIndex = remoteAuthority.indexOf('+');
 		if (authorityPlusIndex === -1) {
 			// This authority does not need to be resolved, simply parse the port number
 			const pieces = remoteAuthority.split(':');
 			return Promise.resolve({
-				authority: remoteAuthority,
-				host: pieces[0],
-				port: parseInt(pieces[1], 10)
+				authority: {
+					authority: remoteAuthority,
+					host: pieces[0],
+					port: parseInt(pieces[1], 10)
+				}
 			});
 		}
 		const proxy = await this._getExtensionHostProcessProxy();
diff --git a/src/vs/workbench/services/extensions/common/remoteExtensionHostClient.ts b/src/vs/workbench/services/extensions/common/remoteExtensionHostClient.ts
index c9b9ef57c67..037a2534d92 100644
--- a/src/vs/workbench/services/extensions/common/remoteExtensionHostClient.ts
+++ b/src/vs/workbench/services/extensions/common/remoteExtensionHostClient.ts
@@ -8,7 +8,7 @@ import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ILogService } from 'vs/platform/log/common/log';
-import { connectRemoteAgentExtensionHost, IRemoteExtensionHostStartParams, IConnectionOptions, IWebSocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
+import { connectRemoteAgentExtensionHost, IRemoteExtensionHostStartParams, IConnectionOptions, ISocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IInitData } from 'vs/workbench/api/common/extHost.protocol';
@@ -47,7 +47,7 @@ export class RemoteExtensionHostClient extends Disposable implements IExtensionH
 	constructor(
 		private readonly _allExtensions: Promise<IExtensionDescription[]>,
 		private readonly _initDataProvider: IInitDataProvider,
-		private readonly _webSocketFactory: IWebSocketFactory,
+		private readonly _socketFactory: ISocketFactory,
 		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
@@ -73,22 +73,23 @@ export class RemoteExtensionHostClient extends Disposable implements IExtensionH
 		const options: IConnectionOptions = {
 			isBuilt: this._environmentService.isBuilt,
 			commit: this._productService.commit,
-			webSocketFactory: this._webSocketFactory,
+			socketFactory: this._socketFactory,
 			addressProvider: {
 				getAddress: async () => {
-					const { host, port } = await this.remoteAuthorityResolverService.resolveAuthority(this._initDataProvider.remoteAuthority);
-					return { host, port };
+					const { authority } = await this.remoteAuthorityResolverService.resolveAuthority(this._initDataProvider.remoteAuthority);
+					return { host: authority.host, port: authority.port };
 				}
 			},
 			signService: this._signService
 		};
-		return this.remoteAuthorityResolverService.resolveAuthority(this._initDataProvider.remoteAuthority).then((resolvedAuthority) => {
+		return this.remoteAuthorityResolverService.resolveAuthority(this._initDataProvider.remoteAuthority).then((resolverResult) => {
 
 			const startParams: IRemoteExtensionHostStartParams = {
 				language: platform.language,
 				debugId: this._environmentService.debugExtensionHost.debugId,
 				break: this._environmentService.debugExtensionHost.break,
 				port: this._environmentService.debugExtensionHost.port,
+				env: resolverResult.options && resolverResult.options.extensionHostEnv
 			};
 
 			const extDevLocs = this._environmentService.extensionDevelopmentLocationURI;
@@ -161,6 +162,11 @@ export class RemoteExtensionHostClient extends Disposable implements IExtensionH
 	}
 
 	private _onExtHostConnectionLost(): void {
+
+		if (this._isExtensionDevHost && this._environmentService.debugExtensionHost.debugId) {
+			this._extensionHostDebugService.close(this._environmentService.debugExtensionHost.debugId);
+		}
+
 		if (this._terminating) {
 			// Expected termination path (we asked the process to terminate)
 			return;
diff --git a/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
index 737395b0d42..10fd66cbdc9 100644
--- a/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
@@ -101,10 +101,6 @@ export class CachedExtensionScanner {
 			development.forEach(developedExtension => {
 				log.info('', nls.localize('extensionUnderDevelopment', "Loading development extension at {0}", developedExtension.extensionLocation.fsPath));
 				const extensionKey = ExtensionIdentifier.toKey(developedExtension.identifier);
-				const extension = result.get(extensionKey);
-				if (extension) {
-					log.warn(developedExtension.extensionLocation.fsPath, nls.localize('overwritingExtension', "Overwriting extension {0} with {1}.", extension.extensionLocation.fsPath, developedExtension.extensionLocation.fsPath));
-				}
 				result.set(extensionKey, developedExtension);
 			});
 			let r: IExtensionDescription[] = [];
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index 4c580ce9e6d..6fb7d2d1be1 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -7,7 +7,6 @@ import { ipcRenderer as ipc } from 'electron';
 import { ExtensionHostProcessWorker } from 'vs/workbench/services/extensions/electron-browser/extensionHost';
 import { CachedExtensionScanner } from 'vs/workbench/services/extensions/electron-browser/cachedExtensionScanner';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { nodeWebSocketFactory } from 'vs/platform/remote/node/nodeWebSocketFactory';
 import { AbstractExtensionService } from 'vs/workbench/services/extensions/common/abstractExtensionService';
 import * as nls from 'vs/nls';
 import * as path from 'vs/base/common/path';
@@ -19,7 +18,7 @@ import { IExtensionEnablementService } from 'vs/workbench/services/extensionMana
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInitDataProvider, RemoteExtensionHostClient } from 'vs/workbench/services/extensions/common/remoteExtensionHostClient';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteAuthorityResolverService, ResolvedAuthority, RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { isUIExtension } from 'vs/workbench/services/extensions/common/extensionsUtil';
 import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -32,7 +31,7 @@ import { ExtensionHostProcessManager } from 'vs/workbench/services/extensions/co
 import { ExtensionIdentifier, IExtension, ExtensionType, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { Schemas } from 'vs/base/common/network';
 import { IFileService } from 'vs/platform/files/common/files';
-import { PersistenConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
+import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
 import { IProductService } from 'vs/platform/product/common/product';
 import { Logger } from 'vs/workbench/services/extensions/common/extensionPoints';
 
@@ -203,6 +202,8 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 
 		// Update the local registry
 		const result = this._registry.deltaExtensions(toAdd, toRemove.map(e => e.identifier));
+		this._onDidChangeExtensions.fire(undefined);
+
 		toRemove = toRemove.concat(result.removedDueToLooping);
 		if (result.removedDueToLooping.length > 0) {
 			this._logOrShowMessage(Severity.Error, nls.localize('looping', "The following extensions contain dependency loops and have been disabled: {0}", result.removedDueToLooping.map(e => `'${e.identifier.value}'`).join(', ')));
@@ -219,8 +220,6 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 			await this._extensionHostProcessManagers[0].deltaExtensions(toAdd, toRemove.map(e => e.identifier));
 		}
 
-		this._onDidChangeExtensions.fire(undefined);
-
 		for (let i = 0; i < toAdd.length; i++) {
 			this._activateAddedExtensionIfNeeded(toAdd[i]);
 		}
@@ -356,7 +355,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 
 		const remoteAgentConnection = this._remoteAgentService.getConnection();
 		if (remoteAgentConnection) {
-			const remoteExtHostProcessWorker = this._instantiationService.createInstance(RemoteExtensionHostClient, this.getExtensions(), this._createProvider(remoteAgentConnection.remoteAuthority), nodeWebSocketFactory);
+			const remoteExtHostProcessWorker = this._instantiationService.createInstance(RemoteExtensionHostClient, this.getExtensions(), this._createProvider(remoteAgentConnection.remoteAuthority), this._remoteAgentService.socketFactory);
 			const remoteExtHostProcessManager = this._instantiationService.createInstance(ExtensionHostProcessManager, false, remoteExtHostProcessWorker, remoteAgentConnection.remoteAuthority, initialActivationEvents);
 			result.push(remoteExtHostProcessManager);
 		}
@@ -419,8 +418,8 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 		const extensionHost = this._extensionHostProcessManagers[0];
 		this._remoteAuthorityResolverService.clearResolvedAuthority(remoteAuthority);
 		try {
-			const resolvedAuthority = await extensionHost.resolveAuthority(remoteAuthority);
-			this._remoteAuthorityResolverService.setResolvedAuthority(resolvedAuthority);
+			const result = await extensionHost.resolveAuthority(remoteAuthority);
+			this._remoteAuthorityResolverService.setResolvedAuthority(result.authority, result.options);
 		} catch (err) {
 			this._remoteAuthorityResolverService.setResolvedAuthorityError(remoteAuthority, err);
 		}
@@ -441,7 +440,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 		localExtensions = localExtensions.filter(extension => this._isEnabled(extension));
 
 		if (remoteAuthority) {
-			let resolvedAuthority: ResolvedAuthority;
+			let resolvedAuthority: ResolverResult;
 
 			try {
 				resolvedAuthority = await extensionHost.resolveAuthority(remoteAuthority);
@@ -463,7 +462,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 			}
 
 			// set the resolved authority
-			this._remoteAuthorityResolverService.setResolvedAuthority(resolvedAuthority);
+			this._remoteAuthorityResolverService.setResolvedAuthority(resolvedAuthority.authority, resolvedAuthority.options);
 
 			// monitor for breakage
 			const connection = this._remoteAgentService.getConnection();
@@ -473,7 +472,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 					if (!remoteAuthority) {
 						return;
 					}
-					if (e.type === PersistenConnectionEventType.ConnectionLost) {
+					if (e.type === PersistentConnectionEventType.ConnectionLost) {
 						this._remoteAuthorityResolverService.clearResolvedAuthority(remoteAuthority);
 					}
 				});
diff --git a/src/vs/workbench/services/keybinding/test/browserKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/browserKeyboardMapper.test.ts
index acf45e1358d..70c6b1dd926 100644
--- a/src/vs/workbench/services/keybinding/test/browserKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/browserKeyboardMapper.test.ts
@@ -12,33 +12,39 @@ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IStorageService } from 'vs/platform/storage/common/storage';
+import { TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 
 class TestKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBase {
 	constructor(notificationService: INotificationService, storageService: IStorageService, commandService: ICommandService) {
 		super(notificationService, storageService, commandService);
 
-		let keymapInfos: IKeymapInfo[] = KeyboardLayoutContribution.INSTANCE.layoutInfos;
+		const keymapInfos: IKeymapInfo[] = KeyboardLayoutContribution.INSTANCE.layoutInfos;
 		this._keymapInfos.push(...keymapInfos.map(info => (new KeymapInfo(info.layout, info.secondaryLayouts, info.mapping, info.isUserKeyboardLayout))));
 		this._mru = this._keymapInfos;
 		this._initialized = true;
 		this.onKeyboardLayoutChanged();
+		const usLayout = this.getUSStandardLayout();
+		if (usLayout) {
+			this.setActiveKeyMapping(usLayout.mapping);
+		}
 	}
 }
 
-
 suite('keyboard layout loader', () => {
 	let instantiationService: TestInstantiationService = new TestInstantiationService();
-	let notitifcationService = instantiationService.stub(INotificationService, {});
-	let storageService = instantiationService.stub(IStorageService, {});
+	let notitifcationService = instantiationService.stub(INotificationService, new TestNotificationService());
+	let storageService = instantiationService.stub(IStorageService, new TestStorageService());
+
 	let commandService = instantiationService.stub(ICommandService, {});
 	let instance = new TestKeyboardMapperFactory(notitifcationService, storageService, commandService);
 
-	test.skip('load default US keyboard layout', () => {
+	test('load default US keyboard layout', () => {
 		assert.notEqual(instance.activeKeyboardLayout, null);
 		assert.equal(instance.activeKeyboardLayout!.isUSStandard, true);
 	});
 
-	test.skip('isKeyMappingActive', () => {
+	test('isKeyMappingActive', () => {
 		assert.equal(instance.isKeyMappingActive({
 			KeyA: {
 				value: 'a',
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index 75c7be48efc..8788a416741 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -91,11 +91,15 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	private readonly defaultSettingsRawResource = URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: '/defaultSettings.json' });
 
 	get userSettingsResource(): URI {
-		return this.getEditableSettingsURI(ConfigurationTarget.USER)!;
+		return this.environmentService.settingsResource;
 	}
 
 	get workspaceSettingsResource(): URI | null {
-		return this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE);
+		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+			return null;
+		}
+		const workspace = this.contextService.getWorkspace();
+		return workspace.configuration || workspace.folders[0].toResource(FOLDER_SETTINGS_PATH);
 	}
 
 	get settingsEditor2Input(): SettingsEditor2Input {
@@ -103,7 +107,8 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 
 	getFolderSettingsResource(resource: URI): URI | null {
-		return this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, resource);
+		const folder = this.contextService.getWorkspaceFolder(resource);
+		return folder ? folder.toResource(FOLDER_SETTINGS_PATH) : null;
 	}
 
 	resolveModel(uri: URI): Promise<ITextModel | null> {
@@ -153,7 +158,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return Promise.resolve(null);
 	}
 
-	createPreferencesEditorModel(uri: URI): Promise<IPreferencesEditorModel<any>> {
+	async createPreferencesEditorModel(uri: URI): Promise<IPreferencesEditorModel<any> | null> {
 		if (this.isDefaultSettingsResource(uri)) {
 			return this.createDefaultSettingsEditorModel(uri);
 		}
@@ -162,16 +167,25 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			return this.createEditableSettingsEditorModel(ConfigurationTarget.USER_LOCAL, uri);
 		}
 
-		const workspaceSettingsUri = this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE);
+		const workspaceSettingsUri = await this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE);
 		if (workspaceSettingsUri && workspaceSettingsUri.toString() === uri.toString()) {
 			return this.createEditableSettingsEditorModel(ConfigurationTarget.WORKSPACE, workspaceSettingsUri);
 		}
 
 		if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
-			return this.createEditableSettingsEditorModel(ConfigurationTarget.WORKSPACE_FOLDER, uri);
+			const settingsUri = await this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, uri);
+			if (settingsUri && settingsUri.toString() === uri.toString()) {
+				return this.createEditableSettingsEditorModel(ConfigurationTarget.WORKSPACE_FOLDER, uri);
+			}
 		}
 
-		return Promise.reject(`unknown resource: ${uri.toString()}`);
+		const remoteEnvironment = await this.remoteAgentService.getEnvironment();
+		const remoteSettingsUri = remoteEnvironment ? remoteEnvironment.settingsPath : null;
+		if (remoteSettingsUri && remoteSettingsUri.toString() === uri.toString()) {
+			return this.createEditableSettingsEditorModel(ConfigurationTarget.USER_REMOTE, uri);
+		}
+
+		return null;
 	}
 
 	openRawDefaultSettings(): Promise<IEditor | null> {
@@ -237,11 +251,11 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			this.openOrSwitchSettings2(ConfigurationTarget.WORKSPACE, undefined, options, group);
 	}
 
-	openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise<IEditor | null> {
+	async openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise<IEditor | null> {
 		jsonEditor = typeof jsonEditor === 'undefined' ?
 			this.configurationService.getValue('workbench.settings.editor') === 'json' :
 			jsonEditor;
-		const folderSettingsUri = this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, folder);
+		const folderSettingsUri = await this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, folder);
 		if (jsonEditor) {
 			if (folderSettingsUri) {
 				return this.openOrSwitchSettings(ConfigurationTarget.WORKSPACE_FOLDER, folderSettingsUri, options, group);
@@ -389,8 +403,8 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.editorService.openEditor(input, SettingsEditorOptions.create(settingsOptions), group);
 	}
 
-	private doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, group: IEditorGroup, options?: ISettingsEditorOptions): Promise<IEditor> {
-		const settingsURI = this.getEditableSettingsURI(target, resource);
+	private async doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, group: IEditorGroup, options?: ISettingsEditorOptions): Promise<IEditor> {
+		const settingsURI = await this.getEditableSettingsURI(target, resource);
 		if (!settingsURI) {
 			return Promise.reject(`Invalid settings URI - ${resource.toString()}`);
 		}
@@ -477,18 +491,14 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			.then(() => <EditorInput>this.editorService.createInput({ resource }));
 	}
 
-	private createEditableSettingsEditorModel(configurationTarget: ConfigurationTarget, resource: URI): Promise<SettingsEditorModel> {
-		const settingsUri = this.getEditableSettingsURI(configurationTarget, resource);
-		if (settingsUri) {
-			const workspace = this.contextService.getWorkspace();
-			if (workspace.configuration && workspace.configuration.toString() === settingsUri.toString()) {
-				return this.textModelResolverService.createModelReference(settingsUri)
-					.then(reference => this.instantiationService.createInstance(WorkspaceConfigurationEditorModel, reference, configurationTarget));
-			}
+	private createEditableSettingsEditorModel(configurationTarget: ConfigurationTarget, settingsUri: URI): Promise<SettingsEditorModel> {
+		const workspace = this.contextService.getWorkspace();
+		if (workspace.configuration && workspace.configuration.toString() === settingsUri.toString()) {
 			return this.textModelResolverService.createModelReference(settingsUri)
-				.then(reference => this.instantiationService.createInstance(SettingsEditorModel, reference, configurationTarget));
+				.then(reference => this.instantiationService.createInstance(WorkspaceConfigurationEditorModel, reference, configurationTarget));
 		}
-		return Promise.reject(`unknown target: ${configurationTarget} and resource: ${resource.toString()}`);
+		return this.textModelResolverService.createModelReference(settingsUri)
+			.then(reference => this.instantiationService.createInstance(SettingsEditorModel, reference, configurationTarget));
 	}
 
 	private createDefaultSettingsEditorModel(defaultSettingsUri: URI): Promise<DefaultSettingsEditorModel> {
@@ -518,23 +528,19 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this._defaultUserSettingsContentModel;
 	}
 
-	private getEditableSettingsURI(configurationTarget: ConfigurationTarget, resource?: URI): URI | null {
+	private async getEditableSettingsURI(configurationTarget: ConfigurationTarget, resource?: URI): Promise<URI | null> {
 		switch (configurationTarget) {
 			case ConfigurationTarget.USER:
 			case ConfigurationTarget.USER_LOCAL:
-				return this.environmentService.settingsResource;
+				return this.userSettingsResource;
 			case ConfigurationTarget.USER_REMOTE:
-				return this.environmentService.settingsResource;
+				const remoteEnvironment = await this.remoteAgentService.getEnvironment();
+				return remoteEnvironment ? remoteEnvironment.settingsPath : null;
 			case ConfigurationTarget.WORKSPACE:
-				if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-					return null;
-				}
-				const workspace = this.contextService.getWorkspace();
-				return workspace.configuration || workspace.folders[0].toResource(FOLDER_SETTINGS_PATH);
+				return this.workspaceSettingsResource;
 			case ConfigurationTarget.WORKSPACE_FOLDER:
 				if (resource) {
-					const folder = this.contextService.getWorkspaceFolder(resource);
-					return folder ? folder.toResource(FOLDER_SETTINGS_PATH) : null;
+					return this.getFolderSettingsResource(resource);
 				}
 		}
 		return null;
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index a5eb1902bae..abf288178cc 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -198,7 +198,7 @@ export interface IPreferencesService {
 	getFolderSettingsResource(resource: URI): URI | null;
 
 	resolveModel(uri: URI): Promise<ITextModel | null>;
-	createPreferencesEditorModel<T>(uri: URI): Promise<IPreferencesEditorModel<T>>;
+	createPreferencesEditorModel<T>(uri: URI): Promise<IPreferencesEditorModel<T> | null>;
 	createSettings2EditorModel(): Settings2EditorModel; // TODO
 
 	openRawDefaultSettings(): Promise<IEditor | null>;
diff --git a/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
index ee8b3c9b9d2..4219ca53901 100644
--- a/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
+++ b/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
@@ -4,18 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IRemoteAgentConnection } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { AbstractRemoteAgentService, RemoteAgentConnection } from 'vs/workbench/services/remote/common/abstractRemoteAgentService';
 import { IProductService } from 'vs/platform/product/common/product';
-import { browserWebSocketFactory } from 'vs/platform/remote/browser/browserWebSocketFactory';
+import { IWebSocketFactory, BrowserSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
 import { ISignService } from 'vs/platform/sign/common/sign';
+import { ISocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
 
-export class RemoteAgentService extends AbstractRemoteAgentService {
+export class RemoteAgentService extends AbstractRemoteAgentService implements IRemoteAgentService {
+
+	public readonly socketFactory: ISocketFactory;
 
 	private readonly _connection: IRemoteAgentConnection | null = null;
 
 	constructor(
+		webSocketFactory: IWebSocketFactory | null | undefined,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IProductService productService: IProductService,
 		@IRemoteAuthorityResolverService remoteAuthorityResolverService: IRemoteAuthorityResolverService,
@@ -23,7 +27,8 @@ export class RemoteAgentService extends AbstractRemoteAgentService {
 	) {
 		super(environmentService);
 
-		this._connection = this._register(new RemoteAgentConnection(environmentService.configuration.remoteAuthority!, productService.commit, browserWebSocketFactory, environmentService, remoteAuthorityResolverService, signService));
+		this.socketFactory = new BrowserSocketFactory(webSocketFactory);
+		this._connection = this._register(new RemoteAgentConnection(environmentService.configuration.remoteAuthority!, productService.commit, this.socketFactory, environmentService, remoteAuthorityResolverService, signService));
 	}
 
 	getConnection(): IRemoteAgentConnection | null {
diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
index c5ece27cfb2..e48834a6a6b 100644
--- a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
@@ -8,7 +8,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { IChannel, IServerChannel, getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Client } from 'vs/base/parts/ipc/common/ipc.net';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { connectRemoteAgentManagement, IConnectionOptions, IWebSocketFactory, PersistenConnectionEvent } from 'vs/platform/remote/common/remoteAgentConnection';
+import { connectRemoteAgentManagement, IConnectionOptions, ISocketFactory, PersistenConnectionEvent } from 'vs/platform/remote/common/remoteAgentConnection';
 import { IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -21,7 +21,7 @@ import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics
 import { Emitter } from 'vs/base/common/event';
 import { ISignService } from 'vs/platform/sign/common/sign';
 
-export abstract class AbstractRemoteAgentService extends Disposable implements IRemoteAgentService {
+export abstract class AbstractRemoteAgentService extends Disposable {
 
 	_serviceBrand: any;
 
@@ -83,7 +83,7 @@ export class RemoteAgentConnection extends Disposable implements IRemoteAgentCon
 	constructor(
 		remoteAuthority: string,
 		private readonly _commit: string | undefined,
-		private readonly _webSocketFactory: IWebSocketFactory,
+		private readonly _socketFactory: ISocketFactory,
 		private readonly _environmentService: IEnvironmentService,
 		private readonly _remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 		private readonly _signService: ISignService
@@ -113,7 +113,7 @@ export class RemoteAgentConnection extends Disposable implements IRemoteAgentCon
 		const options: IConnectionOptions = {
 			isBuilt: this._environmentService.isBuilt,
 			commit: this._commit,
-			webSocketFactory: this._webSocketFactory,
+			socketFactory: this._socketFactory,
 			addressProvider: {
 				getAddress: async () => {
 					if (firstCall) {
@@ -121,8 +121,8 @@ export class RemoteAgentConnection extends Disposable implements IRemoteAgentCon
 					} else {
 						this._onReconnecting.fire(undefined);
 					}
-					const { host, port } = await this._remoteAuthorityResolverService.resolveAuthority(this.remoteAuthority);
-					return { host, port };
+					const { authority } = await this._remoteAuthorityResolverService.resolveAuthority(this.remoteAuthority);
+					return { host: authority.host, port: authority.port };
 				}
 			},
 			signService: this._signService
diff --git a/src/vs/workbench/services/remote/common/remoteAgentService.ts b/src/vs/workbench/services/remote/common/remoteAgentService.ts
index 6fd204af018..bc4d49641e1 100644
--- a/src/vs/workbench/services/remote/common/remoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/remoteAgentService.ts
@@ -8,7 +8,7 @@ import { RemoteAgentConnectionContext, IRemoteAgentEnvironment } from 'vs/platfo
 import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnosticsService';
 import { Event } from 'vs/base/common/event';
-import { PersistenConnectionEvent } from 'vs/platform/remote/common/remoteAgentConnection';
+import { PersistenConnectionEvent as PersistentConnectionEvent, ISocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
 
 export const RemoteExtensionLogFileName = 'remoteagent';
 
@@ -17,6 +17,8 @@ export const IRemoteAgentService = createDecorator<IRemoteAgentService>('remoteA
 export interface IRemoteAgentService {
 	_serviceBrand: any;
 
+	readonly socketFactory: ISocketFactory;
+
 	getConnection(): IRemoteAgentConnection | null;
 	getEnvironment(bail?: boolean): Promise<IRemoteAgentEnvironment | null>;
 	getDiagnosticInfo(options: IDiagnosticInfoOptions): Promise<IDiagnosticInfo | undefined>;
@@ -27,7 +29,7 @@ export interface IRemoteAgentConnection {
 	readonly remoteAuthority: string;
 
 	readonly onReconnecting: Event<void>;
-	readonly onDidStateChange: Event<PersistenConnectionEvent>;
+	readonly onDidStateChange: Event<PersistentConnectionEvent>;
 
 	getChannel<T extends IChannel>(channelName: string): T;
 	registerChannel<T extends IServerChannel<RemoteAgentConnectionContext>>(channelName: string, channel: T): void;
diff --git a/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
index d101f0c57dc..538fb1be860 100644
--- a/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
+++ b/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
@@ -5,14 +5,17 @@
 
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
-import { IRemoteAgentConnection } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import product from 'vs/platform/product/node/product';
-import { nodeWebSocketFactory } from 'vs/platform/remote/node/nodeWebSocketFactory';
+import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
 import { AbstractRemoteAgentService, RemoteAgentConnection } from 'vs/workbench/services/remote/common/abstractRemoteAgentService';
 import { ISignService } from 'vs/platform/sign/common/sign';
+import { ISocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
 
-export class RemoteAgentService extends AbstractRemoteAgentService {
+export class RemoteAgentService extends AbstractRemoteAgentService implements IRemoteAgentService {
+
+	public readonly socketFactory: ISocketFactory;
 
 	private readonly _connection: IRemoteAgentConnection | null = null;
 
@@ -22,8 +25,9 @@ export class RemoteAgentService extends AbstractRemoteAgentService {
 		@ISignService signService: ISignService
 	) {
 		super(environmentService);
+		this.socketFactory = nodeSocketFactory;
 		if (remoteAuthority) {
-			this._connection = this._register(new RemoteAgentConnection(remoteAuthority, product.commit, nodeWebSocketFactory, environmentService, remoteAuthorityResolverService, signService));
+			this._connection = this._register(new RemoteAgentConnection(remoteAuthority, product.commit, nodeSocketFactory, environmentService, remoteAuthorityResolverService, signService));
 		}
 	}
 
diff --git a/src/vs/workbench/services/remote/node/tunnelService.ts b/src/vs/workbench/services/remote/node/tunnelService.ts
index b8e30ea867b..9a359e44c28 100644
--- a/src/vs/workbench/services/remote/node/tunnelService.ts
+++ b/src/vs/workbench/services/remote/node/tunnelService.ts
@@ -12,7 +12,7 @@ import product from 'vs/platform/product/node/product';
 import { connectRemoteAgentTunnel, IConnectionOptions } from 'vs/platform/remote/common/remoteAgentConnection';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
-import { nodeWebSocketFactory } from 'vs/platform/remote/node/nodeWebSocketFactory';
+import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
 import { ISignService } from 'vs/platform/sign/common/sign';
 
 export async function createRemoteTunnel(options: IConnectionOptions, tunnelRemotePort: number): Promise<RemoteTunnel> {
@@ -102,11 +102,11 @@ export class TunnelService implements ITunnelService {
 		const options: IConnectionOptions = {
 			isBuilt: this.environmentService.isBuilt,
 			commit: product.commit,
-			webSocketFactory: nodeWebSocketFactory,
+			socketFactory: nodeSocketFactory,
 			addressProvider: {
 				getAddress: async () => {
-					const { host, port } = await this.remoteAuthorityResolverService.resolveAuthority(remoteAuthority);
-					return { host, port };
+					const { authority } = await this.remoteAuthorityResolverService.resolveAuthority(remoteAuthority);
+					return { host: authority.host, port: authority.port };
 				}
 			},
 			signService: this.signService
diff --git a/src/vs/workbench/services/telemetry/browser/telemetryService.ts b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
index 13af5766086..652aaf3a2de 100644
--- a/src/vs/workbench/services/telemetry/browser/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
@@ -104,7 +104,7 @@ export class WebTelemetryAppender implements ITelemetryAppender {
 		this._aiClient.trackEvent('monacoworkbench/' + eventName, data.properties, data.measurements);
 	}
 
-	dispose(): Promise<any> | undefined {
+	flush(): Promise<void> {
 		if (this._aiClient) {
 			return new Promise(resolve => {
 				this._aiClient!.flush();
@@ -113,7 +113,7 @@ export class WebTelemetryAppender implements ITelemetryAppender {
 			});
 		}
 
-		return undefined;
+		return Promise.resolve();
 	}
 }
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts b/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
index 556d88a5512..991bfbede8a 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
@@ -26,6 +26,7 @@ const emptyDialogService = new class implements IDialogService {
 const emptyCommandService: ICommandService = {
 	_serviceBrand: undefined,
 	onWillExecuteCommand: () => ({ dispose: () => { } }),
+	onDidExecuteCommand: () => ({ dispose: () => { } }),
 	executeCommand: (commandId: string, ...args: any[]): Promise<any> => {
 		return Promise.resolve(undefined);
 	}
diff --git a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts b/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
index e1edb23fe4c..76040fc8eae 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts
@@ -573,18 +573,18 @@ suite('ExtHostWorkspace', function () {
 
 		let mainThreadCalled = false;
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			$startFileSearch(includePattern: string, _includeFolder: UriComponents | undefined, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | undefined> {
+			$startFileSearch(includePattern: string, _includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
 				assert.equal(includePattern, 'foo');
-				assert.equal(_includeFolder, undefined);
-				assert.equal(excludePatternOrDisregardExcludes, undefined);
+				assert.equal(_includeFolder, null);
+				assert.equal(excludePatternOrDisregardExcludes, null);
 				assert.equal(maxResults, 10);
-				return Promise.resolve(undefined);
+				return Promise.resolve(null);
 			}
 		});
 
 		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService(), new Counter());
-		return ws.findFiles('foo', undefined!, 10, new ExtensionIdentifier('test')).then(() => {
+		return ws.findFiles('foo', undefined, 10, new ExtensionIdentifier('test')).then(() => {
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
 	});
@@ -595,17 +595,17 @@ suite('ExtHostWorkspace', function () {
 
 		let mainThreadCalled = false;
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			$startFileSearch(includePattern: string, _includeFolder: UriComponents | undefined, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | undefined> {
+			$startFileSearch(includePattern: string, _includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
 				assert.equal(includePattern, 'glob/**');
 				assert.deepEqual(_includeFolder, URI.file('/other/folder').toJSON());
-				assert.equal(excludePatternOrDisregardExcludes, undefined);
-				return Promise.resolve(undefined);
+				assert.equal(excludePatternOrDisregardExcludes, null);
+				return Promise.resolve(null);
 			}
 		});
 
 		const ws = createExtHostWorkspace(rpcProtocol, { id: 'foo', folders: [aWorkspaceFolderData(URI.file(root), 0)], name: 'Test' }, new NullLogService(), new Counter());
-		return ws.findFiles(new RelativePattern('/other/folder', 'glob/**'), undefined!, 10, new ExtensionIdentifier('test')).then(() => {
+		return ws.findFiles(new RelativePattern('/other/folder', 'glob/**'), undefined, 10, new ExtensionIdentifier('test')).then(() => {
 			assert(mainThreadCalled, 'mainThreadCalled');
 		});
 	});
@@ -616,12 +616,12 @@ suite('ExtHostWorkspace', function () {
 
 		let mainThreadCalled = false;
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			$startFileSearch(includePattern: string, _includeFolder: UriComponents | undefined, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | undefined> {
+			$startFileSearch(includePattern: string, _includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
 				assert.equal(includePattern, 'glob/**');
 				assert.deepEqual(_includeFolder, URI.file('/other/folder').toJSON());
 				assert.equal(excludePatternOrDisregardExcludes, false);
-				return Promise.resolve(undefined);
+				return Promise.resolve(null);
 			}
 		});
 
@@ -637,9 +637,9 @@ suite('ExtHostWorkspace', function () {
 
 		let mainThreadCalled = false;
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			$startFileSearch(includePattern: string, _includeFolder: UriComponents | undefined, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | undefined> {
+			$startFileSearch(includePattern: string, _includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
-				return Promise.resolve(undefined);
+				return Promise.resolve(null);
 			}
 		});
 
@@ -657,10 +657,10 @@ suite('ExtHostWorkspace', function () {
 
 		let mainThreadCalled = false;
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
-			$startFileSearch(includePattern: string, _includeFolder: UriComponents | undefined, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | undefined> {
+			$startFileSearch(includePattern: string, _includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
 				assert(excludePatternOrDisregardExcludes, 'glob/**'); // Note that the base portion is ignored, see #52651
-				return Promise.resolve(undefined);
+				return Promise.resolve(null);
 			}
 		});
 
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadWorkspace.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadWorkspace.test.ts
index 07ee0ca6290..50f8a7aa045 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadWorkspace.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadWorkspace.test.ts
@@ -39,7 +39,7 @@ suite('MainThreadWorkspace', () => {
 		});
 
 		const mtw: MainThreadWorkspace = instantiationService.createInstance(<any>MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } }));
-		return mtw.$startFileSearch('foo', undefined, undefined, 10, new CancellationTokenSource().token);
+		return mtw.$startFileSearch('foo', null, null, 10, new CancellationTokenSource().token);
 	});
 
 	test('exclude defaults', () => {
@@ -61,7 +61,7 @@ suite('MainThreadWorkspace', () => {
 		});
 
 		const mtw: MainThreadWorkspace = instantiationService.createInstance(<any>MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } }));
-		return mtw.$startFileSearch('', undefined, undefined, 10, new CancellationTokenSource().token);
+		return mtw.$startFileSearch('', null, null, 10, new CancellationTokenSource().token);
 	});
 
 	test('disregard excludes', () => {
@@ -82,7 +82,7 @@ suite('MainThreadWorkspace', () => {
 		});
 
 		const mtw: MainThreadWorkspace = instantiationService.createInstance(<any>MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } }));
-		return mtw.$startFileSearch('', undefined, false, 10, new CancellationTokenSource().token);
+		return mtw.$startFileSearch('', null, false, 10, new CancellationTokenSource().token);
 	});
 
 	test('exclude string', () => {
@@ -96,6 +96,6 @@ suite('MainThreadWorkspace', () => {
 		});
 
 		const mtw: MainThreadWorkspace = instantiationService.createInstance(<any>MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } }));
-		return mtw.$startFileSearch('', undefined, 'exclude/**', 10, new CancellationTokenSource().token);
+		return mtw.$startFileSearch('', null, 'exclude/**', 10, new CancellationTokenSource().token);
 	});
 });
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index 633fac6915a..ba1ea7a2075 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -53,7 +53,7 @@ import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDeco
 import { IMarkerService } from 'vs/platform/markers/common/markers';
 import { MarkerService } from 'vs/platform/markers/common/markerService';
 import { IDownloadService } from 'vs/platform/download/common/download';
-import { DownloadService } from 'vs/platform/download/node/downloadService';
+import { DownloadService } from 'vs/platform/download/common/downloadService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ClipboardService } from 'vs/platform/clipboard/electron-browser/clipboardService';
 import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
@@ -167,6 +167,7 @@ registerSingleton(IMenubarService, MenubarService);
 registerSingleton(IURLService, RelayURLService);
 registerSingleton(ITunnelService, TunnelService, true);
 registerSingleton(ICredentialsService, KeytarCredentialsService, true);
+registerSingleton(IWorkspaceStatsService, WorkspaceStatsService, true);
 
 //#endregion
 
@@ -344,5 +345,6 @@ import 'vs/workbench/contrib/experiments/electron-browser/experiments.contributi
 
 // Issues
 import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';
+import { IWorkspaceStatsService, WorkspaceStatsService } from 'vs/workbench/contrib/stats/electron-browser/workspaceStatsService';
 
 //#endregion
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
index c2dc14709b6..d411ccd3280 100644
--- a/src/vs/workbench/workbench.web.api.ts
+++ b/src/vs/workbench/workbench.web.api.ts
@@ -8,6 +8,7 @@ import { main } from 'vs/workbench/browser/web.main';
 import { UriComponents } from 'vs/base/common/uri';
 import { IFileSystemProvider } from 'vs/platform/files/common/files';
 import { IRequestOptions, IRequestContext } from 'vs/platform/request/common/request';
+import { IWebSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
 
 export interface IWorkbenchConstructionOptions {
 
@@ -44,6 +45,11 @@ export interface IWorkbenchConstructionOptions {
 	 * In case not provided, workbench uses <code>XMLHttpRequest</code>.
 	 */
 	requestHandler?: (requestOptions: IRequestOptions) => Promise<IRequestContext>;
+
+	/**
+	 * A factory for web sockets.
+	 */
+	webSocketFactory?: IWebSocketFactory;
 }
 
 /**
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index d7ed222d705..4d5cf7bfbf9 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -51,8 +51,8 @@ import { MarkerDecorationsService } from 'vs/editor/common/services/markerDecora
 import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDecorationService';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
 import { MarkerService } from 'vs/platform/markers/common/markerService';
-// import { IDownloadService } from 'vs/platform/download/common/download';
-// import { DownloadService } from 'vs/platform/download/node/downloadService';
+import { IDownloadService } from 'vs/platform/download/common/download';
+import { DownloadService } from 'vs/platform/download/common/downloadService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { BrowserClipboardService } from 'vs/platform/clipboard/browser/clipboardService';
 import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
@@ -145,7 +145,7 @@ registerSingleton(IOpenerService, OpenerService, true);
 registerSingleton(IEditorWorkerService, EditorWorkerServiceImpl);
 registerSingleton(IMarkerDecorationsService, MarkerDecorationsService);
 registerSingleton(IMarkerService, MarkerService, true);
-// registerSingleton(IDownloadService, DownloadService, true);
+registerSingleton(IDownloadService, DownloadService, true);
 registerSingleton(IClipboardService, BrowserClipboardService, true);
 registerSingleton(IContextKeyService, ContextKeyService);
 registerSingleton(IModelService, ModelServiceImpl, true);
diff --git a/test/tree/public/compressed.json b/test/tree/public/compressed.json
new file mode 100644
index 00000000000..c0b5d4d7161
--- /dev/null
+++ b/test/tree/public/compressed.json
@@ -0,0 +1,15620 @@
+[
+	{
+		"element": {
+			"name": "eclipse.platform.debug"
+		},
+		"children": [
+			{
+				"element": {
+					"name": ".git"
+				},
+				"children": [
+					{
+						"element": {
+							"name": "HEAD"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "branches"
+						},
+						"children": []
+					},
+					{
+						"element": {
+							"name": "config"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "description"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "hooks"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "applypatch-msg.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "commit-msg.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "fsmonitor-watchman.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "post-update.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "pre-applypatch.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "pre-commit.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "pre-push.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "pre-rebase.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "pre-receive.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "prepare-commit-msg.sample"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "update.sample"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "index"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "info"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "exclude"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "logs"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "HEAD"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "refs"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "heads"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "master"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "remotes"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "origin"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "HEAD"
+														},
+														"incompressible": true
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "objects"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "info"
+								},
+								"children": []
+							},
+							{
+								"element": {
+									"name": "pack"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "pack-2b1503bd0b85396d8596e9e99d956bfc3fbe497b.idx"
+										},
+										"incompressible": true
+									},
+									{
+										"element": {
+											"name": "pack-2b1503bd0b85396d8596e9e99d956bfc3fbe497b.pack"
+										},
+										"incompressible": true
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "packed-refs"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "refs"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "heads"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "master"
+										},
+										"incompressible": true
+									}
+								]
+							},
+							{
+								"element": {
+									"name": "remotes"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "origin"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "HEAD"
+												},
+												"incompressible": true
+											}
+										]
+									}
+								]
+							},
+							{
+								"element": {
+									"name": "tags"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "I20190722-1800"
+										},
+										"incompressible": true
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "shallow"
+						},
+						"incompressible": true
+					}
+				]
+			},
+			{
+				"element": {
+					"name": ".gitignore"
+				},
+				"incompressible": true
+			},
+			{
+				"element": {
+					"name": "CONTRIBUTING"
+				},
+				"incompressible": true
+			},
+			{
+				"element": {
+					"name": "LICENSE"
+				},
+				"incompressible": true
+			},
+			{
+				"element": {
+					"name": "NOTICE"
+				},
+				"incompressible": true
+			},
+			{
+				"element": {
+					"name": "org.eclipse.core.externaltools"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "src"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "core"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "externaltools"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "internal"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "ExternalToolsCore.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IExternalToolConstants.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "launchConfigurations"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "BackgroundResourceRefresher.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsCoreUtil.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsProgramMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsProgramMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProgramLaunchDelegate.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "model"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "BuilderCoreUtils.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolBuilder.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsModelMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsModelMessages.properties"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "registry"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "ExternalToolMigration.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsMigrationMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsMigrationMessages.properties"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.core.variables"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "schema"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "dynamicVariables.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "valueVariables.exsd"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "src"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "core"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "internal"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "variables"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "ContributedValueVariable.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DynamicVariable.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "EclipseHomeVariableResolver.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "StringSubstitutionEngine.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "StringVariable.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "StringVariableManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ValueVariable.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "VariablesMessages.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "VariablesMessages.properties"
+																		},
+																		"incompressible": true
+																	}
+																]
+															}
+														]
+													},
+													{
+														"element": {
+															"name": "variables"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "IDynamicVariable.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDynamicVariableResolver.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IStringVariable.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IStringVariableManager.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IValueVariable.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IValueVariableInitializer.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IValueVariableListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "VariablesPlugin.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "package.html"
+																},
+																"incompressible": true
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.debug.core"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".options"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "core"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "core"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "DebugEvent.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "DebugException.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "DebugPlugin.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IBreakpointListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IBreakpointManager.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IBreakpointManagerListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IBreakpointsListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDebugEventFilter.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDebugEventSetListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IExpressionListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IExpressionManager.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IExpressionsListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunch.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchConfiguration.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchConfigurationListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchConfigurationMigrationDelegate.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchConfigurationType.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchConfigurationWorkingCopy.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchDelegate.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchManager.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchMode.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchesListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchesListener2.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILogicalStructureProvider.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILogicalStructureType.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IMemoryBlockListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IMemoryBlockManager.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IProcessFactory.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IPrototypeAttributesLabelProvider.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IRequest.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IStatusHandler.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IStreamListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "Launch.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "RefreshUtil.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "commands"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "AbstractDebugCommand.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugCommandHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugCommandRequest.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDisconnectHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDropToFrameHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IEnabledStateRequest.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IRestartHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IResumeHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStepFiltersHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStepIntoHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStepOverHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStepReturnHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISuspendHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ITerminateHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "model"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "Breakpoint.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugElement.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IBreakpoint.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IBreakpointImportParticipant.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugElement.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugModelProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugTarget.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDisconnect.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDropToFrame.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IErrorReportingExpression.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IExpression.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IFilteredStep.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IFlushableStreamMonitor.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IIndexedValue.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ILaunchConfigurationDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ILaunchConfigurationDelegate2.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ILineBreakpoint.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ILogicalStructureTypeDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ILogicalStructureTypeDelegate2.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryBlock.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryBlockExtension.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryBlockRetrieval.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryBlockRetrievalExtension.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IPersistableSourceLocator.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IProcess.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IRegister.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IRegisterGroup.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourceLocator.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStackFrame.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStep.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStepFilter.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStepFilters.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStreamMonitor.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStreamsProxy.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IStreamsProxy2.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISuspendResume.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ITerminate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IThread.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ITriggerPoint.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IValue.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IValueModification.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IVariable.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IWatchExpression.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IWatchExpressionDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IWatchExpressionListener.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IWatchExpressionResult.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IWatchpoint.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchConfigurationDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LineBreakpoint.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "MemoryByte.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RuntimeProcess.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "package.html"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "sourcelookup"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "AbstractSourceLookupDirector.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "AbstractSourceLookupParticipant.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IPersistableSourceLocator2.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourceContainer.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourceContainerType.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourceContainerTypeDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourceLookupDirector.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourceLookupParticipant.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourcePathComputer.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourcePathComputerDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "containers"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "AbstractSourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AbstractSourceContainerTypeDelegate.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ArchiveSourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "CompositeSourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ContainerSourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DefaultSourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DirectorySourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalArchiveSourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "FolderSourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LocalFileStorage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProjectSourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "WorkspaceSourceContainer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ZipEntryStorage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "package.html"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															}
+														]
+													},
+													{
+														"element": {
+															"name": "internal"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "core"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "BreakpointImportParticipantDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "BreakpointManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugCoreMessages.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugCoreMessages.properties"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugOptions.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugPreferenceInitializer.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "EnvironmentVariableResolver.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ExpressionManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IConfigurationElementConstants.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IExpressionsListener2.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IInternalDebugCoreConstants.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMementoConstants.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "InputStreamMonitor.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchConfiguration.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchConfigurationComparator.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchConfigurationInfo.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchConfigurationType.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchConfigurationWorkingCopy.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchMode.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchablePropertyTester.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LogicalStructureManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LogicalStructureProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LogicalStructureType.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "MemoryBlockManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "NullStreamsProxy.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "OutputStreamMonitor.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "Preferences.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "PreferredDelegateModifyListener.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RefreshScopeComparator.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ResourceFactory.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "StepFilter.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "StepFilterManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "StreamsProxy.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "SystemPropertyResolver.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "SystemVariableResolver.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "WatchExpression.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "XMLMemento.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "commands"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "CommandAdapterFactory.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugCommandRequest.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DisconnectCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DropToFrameCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ForEachCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "Request.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ResumeCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StepCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StepFiltersCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StepIntoCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StepOverCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StepReturnCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SuspendCommand.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TerminateCommand.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "groups"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "GroupLaunch.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "GroupLaunchConfigurationDelegate.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "GroupLaunchElement.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "GroupMemberChangeListener.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "observer"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ProcessObserver.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StreamObserver.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "sourcelookup"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "SourceContainerType.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLocatorMementoComparator.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupUtils.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourcePathComputer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "containers"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ArchiveSourceContainerType.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultSourceContainerType.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DirectorySourceContainerType.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExternalArchiveSourceContainerType.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "FolderSourceContainerType.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProjectSourceContainerType.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WorkspaceSourceContainerType.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "variables"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "ContainerResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DateTimeResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "Messages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "Messages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProjectResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ResourceResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "WorkspaceResolver.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "plugin.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "schema"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "breakpointImportParticipants.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "breakpoints.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchConfigurationComparators.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchConfigurationTypes.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchDelegates.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchModes.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchers.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "logicalStructureProviders.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "logicalStructureTypes.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "processFactories.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "sourceContainerTypes.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "sourceLocators.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "sourcePathComputers.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "statusHandlers.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "stepFilters.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "watchExpressionDelegates.exsd"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "scripts"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "exportplugin.xml"
+								},
+								"incompressible": true
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.debug.examples.core"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "OSGI-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "l10n"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "bundle.properties"
+										},
+										"incompressible": true
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "forceQualifierUpdate.txt"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pdavm"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "src"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "org"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "eclipse"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "debug"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "examples"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "pdavm"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "PDAVirtualMachine.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							},
+							{
+								"element": {
+									"name": "tests"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "vmtest10.pda"
+										},
+										"incompressible": true
+									},
+									{
+										"element": {
+											"name": "vmtest2.pda"
+										},
+										"incompressible": true
+									},
+									{
+										"element": {
+											"name": "vmtest3.pda"
+										},
+										"incompressible": true
+									},
+									{
+										"element": {
+											"name": "vmtest6.pda"
+										},
+										"incompressible": true
+									},
+									{
+										"element": {
+											"name": "vmtest8.pda"
+										},
+										"incompressible": true
+									},
+									{
+										"element": {
+											"name": "vmtest9.pda"
+										},
+										"incompressible": true
+									},
+									{
+										"element": {
+											"name": "vmtest_children.pda"
+										},
+										"incompressible": true
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "readme.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "samples"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "counter.pda"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "drop.pda"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "example.pda"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "fibonacci.pda"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "registers.pda"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "stack.pda"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "structures.pda"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "scripts"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "build.xml"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "src"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "examples"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "core"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "midi"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "launcher"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ClockControl.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LengthControl.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MidiLaunch.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MidiLaunchDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SequencerControl.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TempoControl.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TimeControl.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "pda"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "DebugCorePlugin.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "breakpoints"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "PDALineBreakpoint.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDARunToLineBreakpoint.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAWatchpoint.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "launcher"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "PDALaunchDelegate.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "model"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "IPDAEventListener.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAArray.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAArrayEntry.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDADebugElement.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDADebugTarget.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAMemoryBlock.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAStackFrame.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAStackValue.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAThread.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAValue.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAVariable.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WordStructureDelegate.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "protocol"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "PDABitFieldData.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAChildrenCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAClearBreakpointCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDACommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDACommandResult.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDADataCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDADropFrameCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAEvalCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAEvalResultEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAEventStopCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAExitedEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAFrameCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAFrameCommandResult.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAFrameData.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAGroupsCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAListResult.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDANoSuchLabelEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAPopDataCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAPushDataCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDARegisterData.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDARegistersCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDARegistersCommandResult.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDARegistersEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDARestartCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAResumeCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAResumedEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDARunControlEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDASetBreakpointCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDASetDataCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDASetVarCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAStackCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAStackCommandResult.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAStackDepthCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAStackDepthCommandResult.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAStartedEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAStepCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAStepReturnCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDASuspendCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDASuspendedEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDATerminateCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDATerminatedEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAUnimplementedInstructionEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAVMResumeCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAVMResumedEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAVMStartedEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAVMSuspendCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAVMSuspendedEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAVMTerminatedEvent.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAVarCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAWatchCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "package.html"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "sourcelookup"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "PDASourceLookupDirector.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDASourceLookupParticipant.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDASourcePathComputerDelegate.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "src_ant"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "examples"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "ant"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "tasks"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "PreProcessor.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.debug.examples.memory"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "icons"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "full"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "obj16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "hex_tree.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "launch.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memory_segment.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memory_unit.gif"
+												},
+												"incompressible": true
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "plugin.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "src"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "examples"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "internal"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "memory"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "MemoryViewSamplePlugin.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "core"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "Messages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleDebugTarget.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleMemoryBlock.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleRegister.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleRegisterGroup.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleStackFrame.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleThread.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleValue.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleVariable.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "messages.properties"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "engine"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "SampleEngine.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleMemoryUnit.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "launchconfig"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "SampleLaunchConfigurationDelegateEx.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleLaunchTabGroup.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SampleModelPresentation.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.debug.examples.mixedmode"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "OSGI-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "l10n"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "bundle.properties"
+										},
+										"incompressible": true
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "src"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "internal"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "examples"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "mixedmode"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "Activator.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AntExtraTab.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ClearPreferredDelegatesHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DoNothingLaunchConfigurationDelegate.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DoNothingMainTab.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "Messages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "messages.properties"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.debug.examples.ui"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "OSGI-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "l10n"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "bundle.properties"
+										},
+										"incompressible": true
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "icons"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "full"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "dlcl16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "pop.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "push.gif"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "elcl16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "pop.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "push.gif"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "obj16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "clef.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "note.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pda.gif"
+												},
+												"incompressible": true
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "src"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "examples"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "ui"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "midi"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "adapters"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "CheckboxModelProxyFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ControlCellModifier.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ControlEditor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ControlEventHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ControlLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ControlsMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MidiAdapterFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MidiEventLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MidiEventModelProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MidiStepOverHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SequencerColumnFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SequencerColumnPresentation.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SequencerContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SequencerControlsModelProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SequencerModelProxyFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TrackColumnFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TrackColumnPresentation.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TrackContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TrackLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TrackModelProxy.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "detailpanes"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ClockSliderDetailPane.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ControlDetailPaneFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TempoSliderDetailPane.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "launcher"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ExampleLaunchStatusHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MidiLaunchShortcut.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MidiMainTab.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MidiTabGroup.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "pda"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "DebugUIPlugin.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "adapters"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AdapterFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AddPDAMemoryBlockAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "CommandAdapterFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ModelProxyFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDADebugTargetContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDADebugTargetProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDARestartDebugCommand.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAThreadEventHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAViewActionProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAVirtualFindAction.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "breakpoints"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "PDABreakpointAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAEditorAdapterFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDARunToLineAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAToggleWatchpointsTarget.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAToggleWatchpointsTargetFactory.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "editor"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AnnotationHover.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAContentAssistProcessor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAContentAssistant.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAEditor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAEditorMessages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAScanner.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDASourceViewerConfiguration.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PopFrameActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TextHover.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WordFinder.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "launcher"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "PDALaunchShortcut.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDAMainTab.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PDATabGroup.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "presentation"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "PDAModelPresentation.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "views"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AbstractDataStackViewHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "CanPushTester.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "CheckboxView.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DataStackView.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PopHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PushHandler.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.debug.tests"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "Platform Debug Test Suite.launch"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "forceQualifierUpdate.txt"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "icons"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "image1.gif"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "image2.gif"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "plugin.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "src"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "tests"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "AbstractDebugTest.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "AutomatedSuite.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "LocalSuite.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "PerformanceSuite.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "TestUtil.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "TestsPlugin.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "breakpoint"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "BreakpointOrderingTests.java"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "console"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "ConsoleDocumentAdapterTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleManagerTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IOConsoleTestUtil.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IOConsoleTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "MockProcess.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ProcessConsoleManagerTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ProcessConsoleTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "StreamsProxyTests.java"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "expressions"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "ExpressionManagerTests.java"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "launching"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "AbstractLaunchTest.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "AcceleratorSubstitutionTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ArgumentParsingTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ArgumentsPrinter.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "CancellingLaunchDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugFileStore.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugFileSystem.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchConfigurationTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchFavoriteTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchGroupTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchHistoryTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchManagerTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RefreshTabTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TestLaunchDelegate.java"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "sourcelookup"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "SourceLookupFacilityTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TestLaunch.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TestSourceDirector.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TestSourceLocator.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TestStackFrame.java"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "statushandlers"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "StatusHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "StatusHandlerTests.java"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "stepfilters"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "StepFiltersTests.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TestStepFilter.java"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "view"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "memory"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "DynamicRenderingBindings.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "MemoryBlock.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "MemoryBlockDynamic.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "MemoryBlockOne.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "MemoryBlockThree.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "MemoryBlockTwo.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "MemoryRenderingTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RenderingTypeDelegate.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "viewer"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "model"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "AbstractViewerModelTest.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "CheckTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ChildrenUpdateTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ColumnPresentationTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ContentTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DeltaTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "FilterTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "FilterTransformTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ITestModelUpdatesListenerConstants.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerCheckTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerContentTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerDeltaTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerFilterTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerLazyTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerPerformanceTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerPopupTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerSelectionTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerStateTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerTopIndexTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "JFaceViewerUpdateTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LazyTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "PerformanceTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "PopupTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "PresentationContextTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SelectionTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StateTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TestModel.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TestModelUpdatesListener.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TreeModelViewerAutopopulateAgent.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TreePathWrapper.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "UpdateTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VirtualViewerContentTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VirtualViewerDeltaTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VirtualViewerFilterTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VirtualViewerLazyModeTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VirtualViewerPerformanceTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VirtualViewerPopupTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VirtualViewerSelectionTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VirtualViewerStateTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VirtualViewerUpdateTests.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VisibleVirtualItemValidator.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "test-import"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "Import1.launch"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "Import2.launch"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "Import3.launch"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "Import4.launch"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "Import5.launch"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "test.xml"
+						},
+						"incompressible": true
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.debug.ui"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".options"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": ".api_filters"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "css"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "e4-dark_debug_prefstyle.css"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "e4-light_debug_prefstyle.css"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "forceQualifierUpdate.txt"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "icons"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "full"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "dlcl16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "changevariablevalue_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "changevariablevalue_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "clear_co.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "collapseall.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "collapseall@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "copy_edit_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "copy_edit_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "copyviewtoclipboard_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "copyviewtoclipboard_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_auto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_auto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_compact.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_compact@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_tree.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_tree@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debuglast_co.gif.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debuglast_co.gif@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debuglast_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debuglast_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "delete_config.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "delete_config@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_auto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_auto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_hide.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_hide@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_right.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_right@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_under.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_under@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "disabled_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "disabled_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "disconnect_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "disconnect_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "display_selected_mb.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "display_selected_mb@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "dissolve_group.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "dissolve_group@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "drop_to_frame.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "drop_to_frame@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "edtsrclkup_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "edtsrclkup_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "enabled_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "enabled_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "expandall.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "expandall@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_brkpts.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_brkpts@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_config.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_config@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "filter_ps.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "filter_ps@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "hierarchicalLayout.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "hierarchicalLayout@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "import_brkpts.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "import_brkpts@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "link_proto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "link_proto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memoryreset_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memoryreset_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "metharg_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "metharg_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "monitorexpression_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "monitorexpression_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_con.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_con@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_proto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_proto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "next_thread_nav.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "next_thread_nav@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prev_thread_nav.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prev_thread_nav@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "printview_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "printview_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prop_ps.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prop_ps@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_all_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_all_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_all_triggers.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "removememory_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "removememory_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "reset_proto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "reset_proto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "restart_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "restart_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "resume_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "resume_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "runlast_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "runlast_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "runtoline_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "runtoline_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "skip_brkp.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "skip_brkp@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepbystep_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepbystep_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepinto_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepinto_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepover_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepover_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepreturn_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepreturn_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "suspend_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "suspend_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "synced.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "synced@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_all_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_all_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_rem_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_rem_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "tnames_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "tnames_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "toggledetailpane_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "toggledetailpane_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "unlink_proto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "unlink_proto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "var_cntnt_prvdr.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "var_cntnt_prvdr@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "writeerr_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "writeerr_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "writeout_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "writeout_co@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "dtool16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug_exc.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_exc@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "environment_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "environment_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "profile_exc.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "profile_exc@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "run_exc.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "run_exc@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "term_restart.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "term_restart@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "watch_exp.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "watch_exp@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "dview16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "breakpoint_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "breakpoint_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_persp.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_persp@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "details_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "details_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memory_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memory_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "module_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "module_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "register_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "register_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "variable_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "variable_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "watchlist_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "watchlist_view@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "elcl16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "changevariablevalue_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "changevariablevalue_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "collapseall.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "collapseall@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "copy_edit_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "copy_edit_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "copyviewtoclipboard_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "copyviewtoclipboard_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_auto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_auto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_compact.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_compact@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_tree.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view_tree@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debuglast_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debuglast_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "delete_config.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "delete_config@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_auto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_auto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_hide.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_hide@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_right.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_right@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_under.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "det_pane_under@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "disabled_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "disabled_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "disconnect_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "disconnect_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "display_selected_mb.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "display_selected_mb@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "dissolve_group.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "dissolve_group@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "drop_to_frame.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "drop_to_frame@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "edtsrclkup_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "edtsrclkup_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "enabled_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "enabled_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "expandall.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "expandall@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_brkpts.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_brkpts@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_config.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_config@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "filter_ps.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "filter_ps@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "hierarchicalLayout.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "hierarchicalLayout@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "import_brkpts.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "import_brkpts@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "link_proto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "link_proto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memoryreset_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memoryreset_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "metharg_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "metharg_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "monitorexpression_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "monitorexpression_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_con.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_con@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_proto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_proto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "next_thread_nav.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "next_thread_nav@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prev_thread_nav.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prev_thread_nav@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "printview_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "printview_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prop_ps.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prop_ps@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_all_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_all_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_all_triggers.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "removememory_tsk.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "removememory_tsk@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "reset_proto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "reset_proto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "restart_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "restart_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "resume_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "resume_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "runlast_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "runlast_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "runtoline_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "runtoline_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "skip_brkp.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "skip_brkp@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepbystep_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepbystep_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepinto_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepinto_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepover_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepover_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepreturn_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stepreturn_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "suspend_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "suspend_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "synced.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "synced@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_all_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_all_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_rem_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminate_rem_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "tnames_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "tnames_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "toggledetailpane_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "toggledetailpane_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "unlink_proto.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "unlink_proto@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "var_cntnt_prvdr.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "var_cntnt_prvdr@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "writeerr_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "writeerr_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "writeout_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "writeout_co@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "etool16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug_exc.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_exc@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "environment_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "environment_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "profile_exc.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "profile_exc@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "run_exc.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "run_exc@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "term_restart.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "term_restart@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "watch_exp.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "watch_exp@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "eview16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "breakpoint_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "breakpoint_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "breakpoint_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_persp.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_persp.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_persp@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "details_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "details_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "details_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memory_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memory_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memory_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "module_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "module_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "module_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "register_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "register_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "register_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "variable_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "variable_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "variable_view@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "watchlist_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "watchlist_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "watchlist_view@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "obj16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "arraypartition_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "arraypartition_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkp_grp.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkp_grp@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkp_grp_disabled.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkp_grp_disabled@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkp_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkp_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkp_type.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkp_type@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkpd_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "brkpd_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "check.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "check@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "common_tab.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "common_tab@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debugt_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debugt_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debugts_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debugts_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debugtt_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debugtt_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "environment_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "environment_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "envvar_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "envvar_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_config_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_config_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "expression_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "expression_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "file_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "file_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "fldr_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "fldr_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "genericreggroup_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "genericreggroup_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "genericregister_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "genericregister_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "genericvariable_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "genericvariable_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "import_config_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "import_config_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "inst_ptr.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "inst_ptr@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "inst_ptr_top.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "inst_ptr_top@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "jar_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "jar_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "ldebug_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "ldebug_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lgroup_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lgroup_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lrun_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lrun_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memory_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memory_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memorychanged_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "memorychanged_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "osprc_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "osprc_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "osprct_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "osprct_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "persp_tab.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "persp_tab@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prj_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prj_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "proto_tab.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "proto_tab@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "read_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "read_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "read_obj_disabled.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "read_obj_disabled@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "readwrite_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "readwrite_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "readwrite_obj_disabled.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "readwrite_obj_disabled@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "refresh_tab.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "refresh_tab@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rundebug.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rundebug@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stckframe_obj.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stckframe_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stckframe_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stckframe_running_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stckframe_running_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminatedlaunch_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "terminatedlaunch_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "thread_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "thread_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "threads_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "threads_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "threadt_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "threadt_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "uncheck.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "uncheck@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "workset.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "workset@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "write_obj.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "write_obj@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "write_obj_disabled.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "write_obj_disabled@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "ovr16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "error.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "error@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prototype.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "prototype@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "skip_breakpoint_ov.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "skip_breakpoint_ov@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stcksync_ov.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "stcksync_ov@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "transparent.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "transparent@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "var_cntnt_prvdr_ov.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "var_cntnt_prvdr_ov@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "wizban"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "adddir_wiz.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "addsrcloc_wiz.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "debug_wiz.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "editdir_wiz.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "edtsrclkup_wiz.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_brkpts_wizban.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "export_config_wizban.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "import_brkpts_wizban.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "import_config_wizban.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "profile_wiz.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "run_wiz.png"
+												},
+												"incompressible": true
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "plugin.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "schema"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "breakpointOrganizers.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "consoleColorProviders.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "consoleLineTrackers.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "contextViewBindings.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "debugModelContextBindings.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "debugModelPresentations.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "detailPaneFactories.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchConfigurationTabGroups.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchConfigurationTabs.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchConfigurationTypeImages.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchGroups.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "launchShortcuts.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "memoryRenderings.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "sourceContainerPresentations.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "stringVariablePresentations.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "toggleBreakpointsTargetFactories.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "variableValueEditors.exsd"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "scripts"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "exportplugin.xml"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "ui"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "debug"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "internal"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "ui"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "AbstractDebugCheckboxSelectionDialog.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "AbstractDebugListSelectionDialog.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "AbstractDebugSelectionDialog.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "BreakpointImageProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "BuildBeforeLaunchStatusHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ColorManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "CompositeDebugImageDescriptor.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugModelPropertyTester.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugPerspectiveFactory.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugPluginImages.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugUIAdapterFactory.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugUIMessages.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugUIMessages.properties"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugUIPlugin.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugUIPreferenceInitializer.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DefaultLabelProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DelegatingModelPresentation.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DynamicInstructionPointerAnnotation.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugHelpContextIds.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IInternalDebugUIConstants.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ILaunchHistoryChangedListener.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ILaunchLabelChangedListener.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ImageDescriptorRegistry.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "InstructionPointerAnnotation.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "InstructionPointerContext.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "InstructionPointerImageProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "InstructionPointerManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchConfigurationTabExtension.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LazyModelPresentation.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "MultipleInputDialog.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "Pair.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ResourceExtender.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "SWTFactory.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TerminateToggleValue.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TextGetSetEditingSupport.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "VariableValueEditorManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "VariablesViewModelPresentation.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "WorkingDirectoryStatusHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "actions"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "AbstractDebugActionDelegate.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AbstractRemoveAllActionDelegate.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AbstractSelectionActionDelegate.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ActionMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ActionMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AddToFavoritesAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "CollapseAllAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ConfigureColumnsAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugAsAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugContextualLaunchAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugHistoryMenuAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugLastAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugToolbarAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "EditLaunchConfigurationAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExecutionAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchShortcutAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchablePropertyTester.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "OpenDebugConfigurations.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "OpenProfileConfigurations.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "OpenRunConfigurations.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProfileAsAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProfileContextualLaunchAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProfileHistoryMenuAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProfileLastAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProfileToolbarAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RelaunchActionDelegate.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RelaunchLastAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RemoveAllTerminatedAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RetargetAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RetargetRunToLineAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RunAsAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RunContextualLaunchAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RunHistoryMenuAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RunLastAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RunToolbarAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SelectAllAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StatusInfo.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ToggleBreakpointsTargetManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ToggleFilterAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ViewManagementAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "breakpointGroups"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AbstractBreakpointsViewAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AdvancedGroupBreakpointsByAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointGroupMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointGroupMessages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointSelectionAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointWorkingSetAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ClearDefaultBreakpointGroupAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "CopyBreakpointsActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "EditBreakpointGroupAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "GroupBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "GroupBreakpointsByAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "GroupBreakpointsByDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PasteBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RemoveFromWorkingSetAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SelectBreakpointWorkingsetDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SetDefaultBreakpointGroupAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleDefaultGroupAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WorkingSetsAction.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "breakpointSortBy"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "Messages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "Messages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SortBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SortBreakpointsByAction.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "breakpoints"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AccessWatchpointToggleAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsCollapseAllAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsExpandAllAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DeleteWorkingsetsMessageDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DisableBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "EnableBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LinkBreakpointsWithDebugViewAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "Messages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "Messages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ModificationWatchpointToggleAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ModifyWatchpointAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "OpenBreakpointMarkerAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RemoveAllBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RemoveAllTriggerPointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RemoveBreakpointAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RetargetBreakpointAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RetargetMethodBreakpointAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RetargetToggleBreakpointAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RetargetToggleLineBreakpointAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RetargetWatchpointAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RulerEnableDisableBreakpointAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SelectAllBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ShowSupportedBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ShowTargetBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SkipAllBreakpointsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleBreakpointObjectActionDelegate.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "expressions"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AddWatchExpressionAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ConvertToWatchExpressionAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "CopyExpressionsToClipboardActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DisableWatchExpressionAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "EditWatchExpressinInPlaceAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "EditWatchExpressionAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "EnableWatchExpressionAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PasteWatchExpressionsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ReevaluateWatchExpressionAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RemoveAllExpressionsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RemoveExpressionAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SelectAllExpressionsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WatchExpressionAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WatchExpressionDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WatchExpressionFactoryTester.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WatchHandler.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "variables"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ChangeVariableValueAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ChangeVariableValueInputDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SelectAllVariablesAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ShowTypesAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleDetailPaneAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "details"
+																						},
+																						"children": [
+																							{
+																								"element": {
+																									"name": "DetailPaneAssignValueAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DetailPaneMaxLengthAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DetailPaneMaxLengthDialog.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DetailPaneWordWrapAction.java"
+																								},
+																								"incompressible": true
+																							}
+																						]
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "breakpoints"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "provisional"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "IBreakpointContainer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IBreakpointOrganizer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IBreakpointUIConstants.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "OtherBreakpointCategory.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "commands"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "actions"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AbstractRequestMonitor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ActionsUpdater.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugActionHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugCommandService.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DisconnectCommandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DisconnectCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DisconnectCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DropToFrameCommandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DropToFrameCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DropToFrameCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExecuteActionRequest.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ICommandParticipant.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IEnabledTarget.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RestartCommandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RestartCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RestartCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ResumeCommandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ResumeCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ResumeCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StepIntoCommandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StepIntoCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StepIntoCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StepOverCommandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StepOverCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StepOverCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StepReturnCommandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StepReturnCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StepReturnCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SuspendCommandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SuspendCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SuspendCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TerminateAllAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TerminateAllActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TerminateAndRelaunchAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TerminateAndRelaunchHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TerminateAndRemoveAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TerminateCommandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TerminateCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TerminateCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleStepFiltersAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleStepFiltersCommandActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleStepFiltersCommandHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "UpdateActionsRequest.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "UpdateHandlerRequest.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "contextlaunching"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "ContextMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ContextMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ContextRunner.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchingResourceManager.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "contexts"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "DebugContextManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugContextSourceProvider.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugModelContextBindingManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugWindowContextService.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchSuspendTrigger.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SuspendTriggerAdapterFactory.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "elements"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "adapters"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AsynchronousDebugLabelAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultBreakpointsViewInput.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultVariableCellModifier.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultViewerInputProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryBlockContentAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryBlockLabelAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryRetrievalContentAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemorySegmentLabelAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "Messages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "Messages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RegisterGroupProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StackFrameSourceDisplayAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StackFrameViewerInputProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariableColumnFactoryAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariableColumnPresentation.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WatchExpressionCellModifier.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "groups"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "CommonTabLite.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "GroupCycleHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "GroupElementLaunchedHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "GroupLaunchConfigurationSelectionDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "GroupLaunchConfigurationTabGroup.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "GroupLaunchHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "UnsupportedModeHandler.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "hover"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "DebugTextHover.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExpressionInformationControlCreator.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "importexport"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "breakpoints"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "BreakpointImportExport.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsPathDecorator.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "EmbeddedBreakpointsViewer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExportBreakpoints.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IImportExportConstants.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ImportBreakpoints.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ImportExportMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WizardExportBreakpoints.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WizardExportBreakpointsPage.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WizardImportBreakpoints.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WizardImportBreakpointsPage.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WizardImportBreakpointsSelectionPage.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "launchconfigurations"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ExportLaunchConfigurationsWizard.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExportLaunchConfigurationsWizardPage.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ImportLaunchConfigurationsWizard.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ImportLaunchConfigurationsWizardPage.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WizardMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WizardMessages.properties"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "launchConfigurations"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "AbstractLaunchConfigurationAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ClosedProjectFilter.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "CollapseAllLaunchConfigurationAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "CompileErrorProjectPromptStatusHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "CompileErrorPromptStatusHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "CreateLaunchConfigurationAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "CreateLaunchConfigurationPrototypeAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugModePromptStatusHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DeleteLaunchConfigurationAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DeletedProjectFilter.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DuplicateLaunchConfigurationAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DuplicateLaunchDelegatesStatusHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "EnvironmentVariable.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExportLaunchConfigurationAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "FavoritesDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "FilterDropDownMenuCreator.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "FilterLaunchConfigurationAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchCategoryFilter.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationComparator.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationEditDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationFilteredTree.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationPresentationManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationPropertiesDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationSelectionDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationTabGroupExtension.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationTabGroupViewer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationTabGroupWrapper.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationTabImageDescriptor.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationTreeContentProvider.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationTypeContribution.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationTypeFilter.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationView.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationViewer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationsDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationsMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationsMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchDelegateContribution.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchDelegateNotAvailableHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchGroupExtension.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchGroupFilter.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchHistory.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchShortcutExtension.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchShortcutSelectionDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchTabContribution.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LinkPrototypeAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "OrganizeFavoritesAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "PerspectiveManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ResetWithPrototypeValuesAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SaveScopeResourcesHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SelectFavoritesDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SelectLaunchModesDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SelectLaunchersDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ShowCommandLineDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "UnlinkPrototypeAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "WorkingSetComparator.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "WorkingSetsFilter.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "memory"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "IMemoryBlockConnection.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "IMemoryRenderingUpdater.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "IPersistableDebugElement.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "MemoryRenderingManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "MemoryRenderingType.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RenderingBindings.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "provisional"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AbstractAsyncTableRendering.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AbstractAsyncTextRendering.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryViewPresentationContext.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "model"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "elements"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "BreakpointContainerLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointContainerMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointManagerContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointManagerInputMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugElementLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugElementMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugTargetContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ElementContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ElementLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ElementMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExpressionContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExpressionLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExpressionManagerContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExpressionManagerMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExpressionMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LaunchContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LaunchManagerContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryBlockContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryBlockLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryRetrievalContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryViewElementMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProcessContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RegisterGroupContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RegisterGroupLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RegisterGroupMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StackFrameContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StackFrameMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ThreadContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariableContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariableEditor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariableLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariableMementoProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ViewerInputProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WatchExpressionEditor.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "preferences"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "BooleanFieldEditor2.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ConsolePreferencePage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugPreferencePage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugPreferencesMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugPreferencesMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "IDebugPreferenceConstants.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchConfigurationsPreferencePage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchPerspectivePreferencePage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchersPreferencePage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchingPreferencePage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProcessPropertyPage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RunDebugPropertiesPage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StringVariablePreferencePage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ViewManagementPreferencePage.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "quickaccess"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "AbstractLaunchQuickAccessComputer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugQuickAccessComputer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LaunchQuickAccessElement.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ProfileQuickAccessComputer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RunQuickAccessComputer.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "sourcelookup"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "AddContainerAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AddSourceContainerDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "BasicContainerContentProvider.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DownAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "EditContainerAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "EditSourceLookupPathAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LookupSourceAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "Prompter.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RemoveAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ResolveDuplicatesHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "RestoreDefaultAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceContainerAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceContainerAdapterFactory.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceContainerLabelProvider.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceContainerViewer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceContainerWorkbenchAdapter.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceElementAdapterFactory.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceElementLabelProvider.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceElementWorkbenchAdapter.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupFacility.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupPanel.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupResult.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupService.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupUIMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupUIMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SourceLookupUIUtils.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "UpAction.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "WorkingSetSourceContainerType.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "browsers"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ArchiveFilter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ArchiveSourceContainerBrowser.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DirectorySourceContainerBrowser.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DirectorySourceContainerDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExternalArchiveSourceContainerBrowser.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "FolderSourceContainerBrowser.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "FolderSourceContainerDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProjectSourceContainerBrowser.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProjectSourceContainerDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WorkingSetSourceContainerBrowser.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WorkspaceSourceContainerBrowser.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "stringsubstitution"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "FilePrompt.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "FolderPrompt.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "IArgumentSelector.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "PasswordPrompt.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "PromptingResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ResourceSelector.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SelectedResourceManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SelectedResourceResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SelectedTextResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StringPrompt.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StringSubstitutionMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StringSubstitutionMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StringVariableLabelProvider.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "StringVariablePresentationManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SystemPropertyArgumentSelector.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "viewers"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "AbstractUpdatePolicy.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AsynchronousModel.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AsynchronousRequestMonitor.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AsynchronousSchedulingRuleFactory.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AsynchronousTableModel.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AsynchronousTableViewer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "AsynchronousViewer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ChildrenRequestMonitor.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "FindElementDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ILabelResult.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LabelRequestMonitor.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "LabelResult.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ModelNode.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "PartPresentationContext.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TableAddRequestMonitor.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TableEditorImpl.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TableInsertRequestMonitor.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TableRemoveRequestMonitor.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TableReplaceRequestMonitor.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TableUpdatePolicy.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "breadcrumb"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AbstractBreadcrumb.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreadcrumbItem.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreadcrumbItemDetails.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreadcrumbItemDropDown.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreadcrumbMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreadcrumbMessages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreadcrumbViewer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IBreadcrumbDropDownSite.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TreeViewerDropDown.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "model"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ChildrenCountUpdate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ChildrenUpdate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ElementCompareRequest.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ElementMementoRequest.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "FilterTransform.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "HasChildrenUpdate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IInternalTreeModelViewer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ILabelUpdateListener.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ITreeModelContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ITreeModelLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ITreeModelViewer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "InternalTreeModelViewer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "InternalVirtualTreeModelViewer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LabelUpdate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MementoUpdate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SubTreeModelViewer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TimeTriggeredProgressMonitorDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TreeModelContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TreeModelLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ViewerAdapterService.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ViewerInputUpdate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ViewerStateTracker.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ViewerUpdateMonitor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VirtualCopyToClipboardActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VirtualFindAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "provisional"
+																						},
+																						"children": [
+																							{
+																								"element": {
+																									"name": "ICheckUpdate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "ICheckboxModelProxy.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IChildrenCountUpdate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IChildrenUpdate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IColumnPresentation.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IColumnPresentation2.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IColumnPresentationFactory.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IElementCompareRequest.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IElementContentProvider.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IElementEditor.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IElementLabelProvider.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IElementMementoProvider.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IElementMementoRequest.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IHasChildrenUpdate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "ILabelUpdate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IModelChangedListener.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IModelDelta.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IModelDeltaVisitor.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IModelProxy.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IModelProxy2.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IModelProxyFactory.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IModelProxyFactory2.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IModelSelectionPolicy.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IModelSelectionPolicyFactory.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IPresentationContext.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IStateUpdateListener.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IStatusMonitor.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "ITreeModelViewer.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IViewActionProvider.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IViewerInputProvider.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IViewerInputRequestor.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IViewerInputUpdate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IViewerUpdate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IViewerUpdateListener.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IVirtualItemListener.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IVirtualItemValidator.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "ModelDelta.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "PresentationContext.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TreeModelViewer.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TreeModelViewerFilter.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "ViewerInputService.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "VirtualItem.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "VirtualTree.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "VirtualTreeModelViewer.java"
+																								},
+																								"incompressible": true
+																							}
+																						]
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "provisional"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AbstractColumnPresentation.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AbstractModelProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AsynchronousContentAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AsynchronousLabelAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IAsynchronousContentAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IAsynchronousLabelAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IChildrenRequestMonitor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IContainerRequestMonitor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ILabelRequestMonitor.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "update"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "BreakpointContainerProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointManagerProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugEventHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugTargetEventHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugTargetProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultExpressionModelProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultModelProxyFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultModelSelectionPolicyFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultSelectionPolicy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultVariableViewModelProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DefaultWatchExpressionModelProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "EventHandlerModelProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExpressionEventHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExpressionManagerModelProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LaunchManagerProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LaunchProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryBlockProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryRetrievalProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProcessProxy.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StackFrameEventHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ThreadEventHandler.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariablesViewEventHandler.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "views"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "DebugModelPresentationContext.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugUIViewsMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "DebugUIViewsMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "IDebugExceptionHandler.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ViewContextManager.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ViewContextService.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "breakpoints"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "BreakpointContainer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointContainerWorkbenchAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointOrganizerExtension.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointOrganizerManager.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointPersistableElementAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointSetOrganizer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointTypeOrganizer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointWorkingSetCache.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointWorkingSetElementAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointWorkingSetPage.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsComparator.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsDragAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsDropAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsLabelProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsView.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreakpointsViewer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ElementComparator.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "FileBreakpointOrganizer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProjectBreakpointOrganizer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WorkingSetBreakpointOrganizer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "WorkingSetCategory.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "console"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ConsoleLineNotifier.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ConsoleMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ConsoleMessages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ConsoleRemoveAllTerminatedAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ConsoleRemoveLaunchAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ConsoleShowPreferencesAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ConsoleTerminateAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProcessConsole.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProcessConsoleManager.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProcessConsolePageParticipant.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProcessTypePropertyTester.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ShowStandardErrorAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ShowStandardOutAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ShowWhenContentChangesAction.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "expression"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ExpressionDropAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExpressionView.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "launch"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "BreadcrumbDropDownAutoExpandAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "BreadcrumbWorkbenchPart.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugElementAdapterFactory.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugElementHelper.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugToolBarAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DebugViewModeAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "Decoration.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "DecorationManager.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ImageImageDescriptor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LaunchView.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LaunchViewBreadcrumb.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LaunchViewCopyToClipboardActionDelegate.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LaunchViewMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LaunchViewMessages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SourceNotFoundEditor.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SourceNotFoundEditorInput.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "StandardDecoration.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "TerminateAndRemoveHandler.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "memory"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AbstractMemoryViewPane.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AddMemoryBlockAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AddMemoryRenderingAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AddMemoryRenderingContextAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "AddMemoryRenderingDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "CodePagesPreferencePage.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IMemoryView.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IMemoryViewPane.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IMemoryViewTab.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LinkRenderingPanesAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryBlocksTreeViewPane.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryView.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryViewIdRegistry.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryViewPrefAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryViewSynchronizationService.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryViewTab.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryViewTreeModelContentProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryViewTreeViewer.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MemoryViewUtil.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "MonitorMemoryBlockDialog.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "NewMemoryViewAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PinMemoryBlockAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "PropertyChangeNotifier.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RemoveMemoryRenderingAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RemoveRenderingContextAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RenderingViewPane.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ResetMemoryBlockAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ResetMemoryBlockPreferencePage.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RetargetAddMemoryBlockAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SetPaddedStringPreferencePage.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SwitchMemoryBlockAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SynchronizeInfo.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleMemoryMonitorsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleSplitPaneAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleViewPaneAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ViewPaneOrientationAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ViewPaneRenderingMgr.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ViewPaneSelectionProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ViewTabEnablementManager.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "renderings"
+																						},
+																						"children": [
+																							{
+																								"element": {
+																									"name": "ASCIIRendering.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "ASCIIRenderingTypeDelegate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AbstractBaseTableRendering.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AbstractIntegerRendering.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AbstractTableRenderingLabelProvider.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AbstractVirtualContentTableModel.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AsyncCopyTableRenderingAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AsyncPrintTableRenderingAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AsyncTableRenderingCellModifier.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AsyncTableRenderingUpdatePolicy.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AsyncTableRenderingViewer.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AsyncVirtualContentTableViewer.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "BasicDebugViewContentProvider.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "BigEndianAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "CopyTableRenderingToClipboardAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "CreateRendering.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DefaultEndianessAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "ErrorRendering.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "FormatTableRenderingAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "FormatTableRenderingDialog.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "GoToAddressAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "GoToAddressComposite.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "GoToAddressDialog.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "HexIntegerRendering.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "HexIntegerRenderingDelegate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "HexRendering.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "HexRenderingTypeDelegate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IContentChangeComputer.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IPresentationErrorListener.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IVirtualContentListener.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "LittleEndianAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "MemorySegment.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "PendingPropertyChanges.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "PrintTableRenderingAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "ReformatAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "RenderingsUtil.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "ResetToBaseAddressAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "SignedIntegerRendering.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "SignedIntegerRenderingTypeDelegate.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingCellModifier.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingContentDescriptor.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingContentInput.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingContentProvider.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingLabelProvider.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingLabelProviderEx.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingLine.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingModel.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingPrefAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingPreferencePage.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "TableRenderingPropertiesPage.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "UnsignedIntegerRendering.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "UnsignedIntegerRenderingTypeDelegate.java"
+																								},
+																								"incompressible": true
+																							}
+																						]
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "modules"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "IHelpContextIdProvider.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ModulesView.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ModulesViewMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ModulesViewMessages.properties"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "registers"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "RegistersView.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RegistersViewMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "RegistersViewMessages.properties"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			},
+																			{
+																				"element": {
+																					"name": "variables"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "AvailableLogicalStructuresAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "EditVariableLogicalStructureAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IndexedValuePartition.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "IndexedVariablePartition.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "LogicalStructureCache.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SelectLogicalStructureAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "SelectionDragAdapter.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleLogicalStructureAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ToggleShowColumnsAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariableViewToggleAction.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariablesView.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariablesViewMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariablesViewMessages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "VariablesViewResourceBundleMessages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "details"
+																						},
+																						"children": [
+																							{
+																								"element": {
+																									"name": "AbstractDetailPane.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "AvailableDetailPanesAction.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DefaultDetailPane.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DefaultDetailPaneFactory.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DetailMessages.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DetailMessages.properties"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DetailPaneManager.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "DetailPaneProxy.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IDetailPaneContainer.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "IDetailPaneContainer2.java"
+																								},
+																								"incompressible": true
+																							},
+																							{
+																								"element": {
+																									"name": "MessageDetailPane.java"
+																								},
+																								"incompressible": true
+																							}
+																						]
+																					}
+																				]
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													},
+													{
+														"element": {
+															"name": "ui"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "AbstractBreakpointOrganizerDelegate.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "AbstractDebugView.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "AbstractLaunchConfigurationTab.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "AbstractLaunchConfigurationTabGroup.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "BreakpointTypeCategory.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "CommonTab.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "DebugElementWorkbenchAdapter.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "DebugPopup.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "DebugUITools.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "DeferredDebugElementWorkbenchAdapter.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "EnvironmentTab.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IBreakpointOrganizerDelegate.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IBreakpointOrganizerDelegateExtension.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IBreakpointTypeCategory.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDebugEditorPresentation.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDebugModelPresentation.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDebugModelPresentationExtension.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDebugUIConstants.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDebugView.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDetailPane.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDetailPane2.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDetailPane3.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IDetailPaneFactory.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IInstructionPointerPresentation.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchConfigurationDialog.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchConfigurationTab.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchConfigurationTab2.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchConfigurationTabGroup.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchGroup.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchShortcut.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ILaunchShortcut2.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ISourcePresentation.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IValueDetailListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "InspectPopupDialog.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "PrototypeDecorator.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "PrototypeTab.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "RefreshTab.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "StringVariableSelectionDialog.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "WorkingDirectoryBlock.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "actions"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "AbstractLaunchHistoryAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "AbstractLaunchToolbarAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "AddMemoryRenderingActionDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "BreakpointTypesContribution.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ContextualLaunchAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugCommandAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugCommandHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ExportBreakpointsOperation.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IAddMemoryBlocksTarget.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IAddMemoryRenderingsTarget.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ILaunchable.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IRunToLineTarget.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IToggleBreakpointsTarget.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IToggleBreakpointsTargetExtension.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IToggleBreakpointsTargetExtension2.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IToggleBreakpointsTargetFactory.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IToggleBreakpointsTargetManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IToggleBreakpointsTargetManagerListener.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IVariableValueEditor.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IWatchExpressionFactoryAdapter.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IWatchExpressionFactoryAdapter2.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IWatchExpressionFactoryAdapterExtension.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ImportBreakpointsOperation.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchAsAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "LaunchShortcutsAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "OpenLaunchDialogAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RelaunchLastAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RulerBreakpointAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RulerBreakpointTypesActionDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RulerEnableDisableBreakpointActionDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RulerRunToLineActionDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RulerToggleBreakpointActionDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RunAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RunToLineAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RunToLineActionDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "RunToLineHandler.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ToggleBreakpointAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ToggleMethodBreakpointActionDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ToggleWatchpointActionDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "console"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "ConsoleColorProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "FileLink.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IConsole.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IConsoleColorProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IConsoleHyperlink.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IConsoleLineTracker.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IConsoleLineTrackerExtension.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "contexts"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "AbstractDebugContextProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "DebugContextEvent.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugContextListener.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugContextManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugContextProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugContextProvider2.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IDebugContextService.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISuspendTrigger.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISuspendTriggerListener.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "memory"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "AbstractMemoryRendering.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "AbstractMemoryRenderingBindingsProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "AbstractTableRendering.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "AbstractTextRendering.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryBlockTablePresentation.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRendering.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRenderingBindingsListener.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRenderingBindingsProvider.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRenderingContainer.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRenderingManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRenderingSite.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRenderingSite2.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRenderingSynchronizationService.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRenderingType.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IMemoryRenderingTypeDelegate.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IRepositionableMemoryRendering.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IResettableMemoryRendering.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "MemoryRenderingElement.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "package.html"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "sourcelookup"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "AbstractSourceContainerBrowser.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "CommonSourceNotFoundEditor.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "CommonSourceNotFoundEditorInput.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourceContainerBrowser.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourceDisplay.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ISourceLookupResult.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "SourceLookupDialog.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "SourceLookupTab.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "WorkingSetSourceContainer.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "stringsubstitution"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "IArgumentSelector.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.ui.console"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "icons"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "full"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "clcl16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "clear_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "clear_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "wordwrap.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "cview16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "console_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "console_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "console_view@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "dlcl16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "clear_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "clear_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_con.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_con@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "wordwrap.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "wordwrap@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "dview16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "console_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "console_view@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "elcl16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "clear_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "clear_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "lock_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_con.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "new_con@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "pin@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_co.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "rem_co@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "wordwrap.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "wordwrap@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "eview16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "console_view.gif"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "console_view.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "console_view@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "plugin.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "schema"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "consoleFactories.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "consolePageParticipants.exsd"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "consolePatternMatchListeners.exsd"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "scripts"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "exportplugin.xml"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "src"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "ui"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "console"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "AbstractConsole.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "ConsolePlugin.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IConsole.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IConsoleConstants.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IConsoleDocumentPartitioner.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IConsoleFactory.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IConsoleListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IConsoleManager.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IConsolePageParticipant.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IConsoleView.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IHyperlink.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IHyperlink2.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IOConsole.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IOConsoleInputStream.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IOConsoleOutputStream.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IPatternMatchListener.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IPatternMatchListenerDelegate.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "IScrollLockStateProvider.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "MessageConsole.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "MessageConsoleStream.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "PatternMatchEvent.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "TextConsole.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "TextConsolePage.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "TextConsoleViewer.java"
+																},
+																"incompressible": true
+															},
+															{
+																"element": {
+																	"name": "actions"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "ClearOutputAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "CloseConsoleAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TextViewerAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "TextViewerGotoLineAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "package.html"
+																		},
+																		"incompressible": true
+																	}
+																]
+															},
+															{
+																"element": {
+																	"name": "package.html"
+																},
+																"incompressible": true
+															}
+														]
+													},
+													{
+														"element": {
+															"name": "internal"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "console"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "ConsoleDocument.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleDocumentAdapter.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleDropDownAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleFactoryExtension.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleHyperlinkPosition.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleManager.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleMessages.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleMessages.properties"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsolePageParticipantExtension.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsolePatternMatcher.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsolePluginImages.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleResourceBundleMessages.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleResourceBundleMessages.properties"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleTypePropertyTester.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleUIPreferenceInitializer.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleView.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleViewConsoleFactory.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ConsoleWorkbenchPart.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "FollowHyperlinkAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "HyperlinkUpdater.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IConsoleHelpContextIds.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IInternalConsoleConstants.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IOConsolePage.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IOConsolePartition.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IOConsolePartitioner.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "IOConsoleViewer.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "OpenConsoleAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "PatternMatchListener.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "PatternMatchListenerExtension.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "PinConsoleAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ScrollLockAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "ShowConsoleAction.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "StreamDecoder.java"
+																		},
+																		"incompressible": true
+																	},
+																	{
+																		"element": {
+																			"name": "WordWrapAction.java"
+																		},
+																		"incompressible": true
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "org.eclipse.ui.externaltools"
+				},
+				"children": [
+					{
+						"element": {
+							"name": ".classpath"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".gitignore"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".project"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": ".settings"
+						},
+						"children": [
+							{
+								"element": {
+									"name": ".api_filters"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.resources.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.core.runtime.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.core.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.jdt.ui.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.api.tools.prefs"
+								},
+								"incompressible": true
+							},
+							{
+								"element": {
+									"name": "org.eclipse.pde.prefs"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "External Tools Base"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "ui"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "externaltools"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "internal"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "launchConfigurations"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "ExternalToolsBuildTab.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsBuilderTab.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsLaunchConfigurationMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsLaunchConfigurationMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsMainTab.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsUtil.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "IgnoreWhiteSpaceComparator.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "WorkingSetComparator.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "menu"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "ExternalToolMenuDelegate.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "OpenExternalToolsConfigurations.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "model"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "BuilderUtils.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsImages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsModelMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsModelMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsPlugin.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsPreferenceInitializer.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "IExternalToolConstants.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "IExternalToolsHelpContextIds.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "IPreferenceConstants.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ImageDescriptorRegistry.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "ui"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "BuilderLabelProvider.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "BuilderPropertyPage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "EditCommandDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsPreferencePage.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsUIMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "ExternalToolsUIMessages.properties"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "FileSelectionDialog.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "TreeAndListGroup.java"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	},
+																	{
+																		"element": {
+																			"name": "variables"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "BuildFilesResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "BuildProjectResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "BuildTypeResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "SystemPathResolver.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VariableMessages.java"
+																				},
+																				"incompressible": true
+																			},
+																			{
+																				"element": {
+																					"name": "VariableMessages.properties"
+																				},
+																				"incompressible": true
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "META-INF"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "MANIFEST.MF"
+								},
+								"incompressible": true
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "Program Tools Support"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "org"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "eclipse"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "ui"
+												},
+												"children": [
+													{
+														"element": {
+															"name": "externaltools"
+														},
+														"children": [
+															{
+																"element": {
+																	"name": "internal"
+																},
+																"children": [
+																	{
+																		"element": {
+																			"name": "program"
+																		},
+																		"children": [
+																			{
+																				"element": {
+																					"name": "launchConfigurations"
+																				},
+																				"children": [
+																					{
+																						"element": {
+																							"name": "ExternalToolsProgramMessages.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ExternalToolsProgramMessages.properties"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProgramBuilderTabGroup.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProgramMainTab.java"
+																						},
+																						"incompressible": true
+																					},
+																					{
+																						"element": {
+																							"name": "ProgramTabGroup.java"
+																						},
+																						"incompressible": true
+																					}
+																				]
+																			}
+																		]
+																	}
+																]
+															}
+														]
+													}
+												]
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "about.html"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "build.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "icons"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "full"
+								},
+								"children": [
+									{
+										"element": {
+											"name": "dtool16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "external_tools.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "external_tools@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "etool16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "external_tools.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "external_tools@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "obj16"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "build_tab.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "build_tab@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "builder.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "builder@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "classpath.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "classpath@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "external_tools.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "external_tools@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "invalid_build_tool.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "invalid_build_tool@2x.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "main_tab.png"
+												},
+												"incompressible": true
+											},
+											{
+												"element": {
+													"name": "main_tab@2x.png"
+												},
+												"incompressible": true
+											}
+										]
+									},
+									{
+										"element": {
+											"name": "wizban"
+										},
+										"children": [
+											{
+												"element": {
+													"name": "ext_tools_wiz.png"
+												},
+												"incompressible": true
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					{
+						"element": {
+							"name": "plugin.properties"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "plugin.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "pom.xml"
+						},
+						"incompressible": true
+					},
+					{
+						"element": {
+							"name": "schema"
+						},
+						"children": [
+							{
+								"element": {
+									"name": "configurationDuplicationMaps.exsd"
+								},
+								"incompressible": true
+							}
+						]
+					}
+				]
+			},
+			{
+				"element": {
+					"name": "pom.xml"
+				},
+				"incompressible": true
+			}
+		]
+	}
+]
\ No newline at end of file
diff --git a/test/tree/public/index.html b/test/tree/public/index.html
index 7c83e9b045c..17c88461c4b 100644
--- a/test/tree/public/index.html
+++ b/test/tree/public/index.html
@@ -44,7 +44,7 @@
 
 		require.config({ baseUrl: '/static' });
 
-		require(['vs/base/browser/ui/tree/indexTree', 'vs/base/browser/ui/tree/asyncDataTree', 'vs/base/browser/ui/tree/dataTree', 'vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ IndexTree }, { AsyncDataTree }, { DataTree }, { TreeVisibility }, { iter }) => {
+		require(['vs/base/browser/ui/tree/indexTree', 'vs/base/browser/ui/tree/compressedObjectTree', 'vs/base/browser/ui/tree/asyncDataTree', 'vs/base/browser/ui/tree/dataTree', 'vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ IndexTree }, { CompressedObjectTree }, { AsyncDataTree }, { DataTree }, { TreeVisibility }, { iter }) => {
 			function createIndexTree(opts) {
 				opts = opts || {};
 
@@ -100,6 +100,57 @@
 				return { tree, treeFilter };
 			}
 
+			function createCompressedObjectTree(opts) {
+				opts = opts || {};
+
+				const delegate = {
+					getHeight() { return 22; },
+					getTemplateId() { return 'template'; },
+					hasDynamicHeight() { return true; }
+				};
+
+				const renderer = {
+					templateId: 'template',
+					renderTemplate(container) { return container; },
+					renderElement(element, index, container) {
+						if (element.element.elements.length > 1) {
+							container.innerHTML = `🙈 ${element.element.elements.map(el => el.name).join('/')}`;
+						} else {
+							container.innerHTML = element.element.elements[0].name;
+						}
+					},
+					disposeElement() { },
+					disposeTemplate() { }
+				};
+
+				const treeFilter = new class {
+					constructor() {
+						this.pattern = null;
+						let timeout;
+						filter.oninput = () => {
+							clearTimeout(timeout);
+							timeout = setTimeout(() => this.updatePattern(), 300);
+						};
+					}
+					updatePattern() {
+						if (!filter.value) {
+							this.pattern = null;
+						} else {
+							this.pattern = new RegExp(filter.value, 'i');
+						}
+
+						perf('refilter', () => tree.refilter());
+					}
+					filter(el) {
+						return (this.pattern ? this.pattern.test(el) : true) ? TreeVisibility.Visible : TreeVisibility.Recurse;
+					}
+				};
+
+				const tree = new CompressedObjectTree(container, delegate, [renderer], { ...opts, filter: treeFilter, setRowLineHeight: false, collapseByDefault: true, setRowLineHeight: true });
+
+				return { tree, treeFilter };
+			}
+
 			function createAsyncDataTree() {
 				const delegate = {
 					getHeight() { return 22; },
@@ -155,7 +206,7 @@
 					getChildren(element) {
 						return new Promise((c, e) => {
 							const xhr = new XMLHttpRequest();
-							xhr.open('GET', element ? `/api/readdir?path=${element.element.path}` : '/api/readdir');
+							xhr.open('GET', element ? `/ api / readdir ? path = ${element.element.path} ` : '/api/readdir');
 							xhr.send();
 							xhr.onreadystatechange = function () {
 								if (this.readyState == 4 && this.status == 200) {
@@ -258,7 +309,7 @@
 						const errors = [];
 
 						for (let j = 1; j <= 3; j++) {
-							errors.push({ element: `error #${j}` });
+							errors.push({ element: `error #${j} ` });
 						}
 
 						files.push({ element: `file #${i}`, children: errors });
@@ -289,6 +340,23 @@
 
 					break;
 				}
+				case '?compressed': {
+					const { tree, treeFilter } = createCompressedObjectTree();
+
+					expandall.onclick = () => perf('expand all', () => tree.expandAll());
+					collapseall.onclick = () => perf('collapse all', () => tree.collapseAll());
+
+					const xhr = new XMLHttpRequest();
+					xhr.open('GET', '/compressed.json');
+					xhr.send();
+					xhr.onreadystatechange = function () {
+						if (this.readyState == 4 && this.status == 200) {
+							tree.setChildren(null, JSON.parse(this.responseText));
+						}
+					};
+
+					break;
+				}
 				case '?height': {
 					const { tree, treeFilter } = createIndexTree({ supportDynamicHeights: true });
 
diff --git a/test/tree/tree.js b/test/tree/tree.js
new file mode 100644
index 00000000000..4d5a9b5f271
--- /dev/null
+++ b/test/tree/tree.js
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const fs = require('fs');
+
+function collect(location) {
+	const element = { name: path.basename(location) };
+	const stat = fs.statSync(location);
+
+	if (!stat.isDirectory()) {
+		return { element, incompressible: true };
+	}
+
+	const children = fs.readdirSync(location)
+		.map(child => path.join(location, child))
+		.map(collect);
+
+	return { element, children };
+}
+
+console.log(JSON.stringify(collect(process.cwd())));
\ No newline at end of file