Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f (#7282)

* Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f * fix various icon issues * fix preview features
2026-02-16 10:58:30 -05:00 · 2019-09-19 21:50:52 -07:00
parent 9d3d64eef3
commit db498db0a8
459 changed files with 10195 additions and 7528 deletions
--- a/extensions/configuration-editing/src/settingsDocumentHelper.ts
+++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts
@@ -54,6 +54,7 @@ export class SettingsDocument {
 		completions.push(this.newSimpleCompletionItem('${folderName}', range, localize('folderName', "name of the workspace folder the file is contained in (e.g. myFolder)")));
 		completions.push(this.newSimpleCompletionItem('${folderPath}', range, localize('folderPath', "file path of the workspace folder the file is contained in (e.g. /Users/Development/myFolder)")));
 		completions.push(this.newSimpleCompletionItem('${appName}', range, localize('appName', "e.g. VS Code")));
+		completions.push(this.newSimpleCompletionItem('${remoteName}', range, localize('remoteName', "e.g. SSH")));
 		completions.push(this.newSimpleCompletionItem('${dirty}', range, localize('dirty', "a dirty indicator if the active editor is dirty")));
 		completions.push(this.newSimpleCompletionItem('${separator}', range, localize('separator', "a conditional separator (' - ') that only shows when surrounded by variables with values")));

--- a/extensions/git/src/decorationProvider.ts
+++ b/extensions/git/src/decorationProvider.ts
@@ -9,7 +9,7 @@ import { Repository, GitResourceGroup } from './repository';
 import { Model } from './model';
 import { debounce } from './decorators';
 import { filterEvent, dispose, anyEvent, fireEvent } from './util';
-import { GitErrorCodes } from './api/git';
+import { GitErrorCodes, Status } from './api/git';

 type Callback = { resolve: (status: boolean) => void, reject: (err: any) => void };

@@ -122,12 +122,18 @@ class GitDecorationProvider implements DecorationProvider {
 	}

 	private collectDecorationData(group: GitResourceGroup, bucket: Map<string, Decoration>): void {
-		group.resourceStates.forEach(r => {
-			if (r.resourceDecoration) {
+		for (const r of group.resourceStates) {
+			const decoration = r.resourceDecoration;
+
+			if (decoration) {
 				// not deleted and has a decoration
-				bucket.set(r.original.toString(), r.resourceDecoration);
+				bucket.set(r.original.toString(), decoration);
+
+				if (r.type === Status.INDEX_RENAMED) {
+					bucket.set(r.resourceUri.toString(), decoration);
+				}
 			}
-		});
+		}
 	}

 	private collectSubmoduleDecorationData(bucket: Map<string, Decoration>): void {
--- a/extensions/image-preview/icon.png
+++ b/extensions/image-preview/icon.png
--- a/extensions/image-preview/icon.svg
+++ b/extensions/image-preview/icon.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.6, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#C5C5C5;}
+</style>
+<g>
+	<path class="st0" d="M2,14.1l-1.1-1L0.9,3l1-1.1l12.1,0l1.1,1l0,10.1L14,14.1H2z M13.9,12.9V3.1H2.1v9.8H13.9z M8.9,12.1V7.9h4.2
+		v4.2H8.9z M11.9,10.9V9.1h-1.8v1.8H11.9z M2.9,12.1v-1.2h4.2v1.2H2.9z M2.9,9.1V7.9h4.2v1.2H2.9z M2.9,7.1V3.9h10.2v3.2H2.9z
+		 M11.9,5.9V5.1H4.1v0.8H11.9z"/>
+	<path d="M14,2l1,1v10l-1,1H2l-1-1V3l1-1H14 M2,13h12V3H2V13 M13,4v3H3V4H13 M4,6h8V5H4V6 M13,8v4H9V8H13 M10,11h2V9h-2V11 M7,8v1H3
+		V8H7 M7,11v1H3v-1H7 M14.1,1.8L14.1,1.8H2H1.9L1.9,1.9l-1,1L0.8,2.9V3v10v0.1l0.1,0.1l1,1l0.1,0.1H2h12h0.1l0.1-0.1l1-1l0.1-0.1V13
+		V3V2.9l-0.1-0.1L14.1,1.8L14.1,1.8L14.1,1.8z M2.2,3.2h11.6v9.6H2.2V3.2L2.2,3.2z M13.2,3.8H13H3H2.8V4v3v0.2H3h10h0.2V7V4V3.8
+		L13.2,3.8z M4.2,5.2h7.6v0.6H4.2V5.2L4.2,5.2z M13.2,7.8H13H9H8.8V8v4v0.2H9h4h0.2V12V8V7.8L13.2,7.8z M10.2,9.2h1.6v1.6h-1.6V9.2
+		L10.2,9.2z M7.2,7.8H7H3H2.8V8v1v0.2H3h4h0.2V9V8V7.8L7.2,7.8z M7.2,10.8H7H3H2.8V11v1v0.2H3h4h0.2V12v-1V10.8L7.2,10.8z"/>
+</g>
+</svg>
--- a/extensions/image-preview/media/main.js
+++ b/extensions/image-preview/media/main.js
@@ -58,7 +58,8 @@
 		20
 	];

-	const isMac = getSettings().isMac;
+	const settings = getSettings();
+	const isMac = settings.isMac;

 	const vscode = acquireVsCodeApi();

@@ -71,7 +72,7 @@

 	// Elements
 	const container =  /** @type {HTMLElement} */(document.querySelector('body'));
-	const image = document.querySelector('img');
+	const image = document.createElement('img');

 	function updateScale(newScale) {
 		if (!image || !image.parentElement) {
@@ -248,6 +249,9 @@
 		}
 	});

+	image.src = decodeURI(settings.src);
+	document.body.append(image);
+
 	window.addEventListener('message', e => {
 		switch (e.data.type) {
 			case 'setScale':
--- a/extensions/image-preview/package.json
+++ b/extensions/image-preview/package.json
@@ -4,6 +4,7 @@
  "description": "%description%",
  "version": "1.0.0",
  "publisher": "vscode",
+  "icon": "icon.png",
  "enableProposedApi": true,
  "license": "MIT",
  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
@@ -24,7 +25,8 @@
        "displayName": "%webviewEditors.displayName%",
        "selector": [
          {
-            "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,tga,tif,tiff,webp}"
+            "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,tga,tif,tiff,webp}",
+            "mime": "image/*"
          }
        ]
      }
--- a/extensions/image-preview/src/preview.ts
+++ b/extensions/image-preview/src/preview.ts
@@ -80,7 +80,8 @@ export class Preview extends Disposable {

 	private getWebiewContents(webviewEditor: vscode.WebviewEditor, resource: vscode.Uri): string {
 		const settings = {
-			isMac: process.platform === 'darwin'
+			isMac: process.platform === 'darwin',
+			src: this.getResourcePath(webviewEditor, resource)
 		};

 		return /* html */`<!DOCTYPE html>
@@ -95,12 +96,19 @@ export class Preview extends Disposable {
 	<meta id="image-preview-settings" data-settings="${escapeAttribute(JSON.stringify(settings))}">
 </head>
 <body class="container image scale-to-fit">
-	<img src="${escapeAttribute(webviewEditor.webview.asWebviewUri(resource))}">
 	<script src="${escapeAttribute(this.extensionResource('/media/main.js'))}"></script>
 </body>
 </html>`;
 	}

+	private getResourcePath(webviewEditor: vscode.WebviewEditor, resource: vscode.Uri) {
+		if (resource.scheme === 'data') {
+			return encodeURI(resource.toString(true));
+		}
+
+		return encodeURI(webviewEditor.webview.asWebviewUri(resource).toString(true));
+	}
+
 	private extensionResource(path: string) {
 		return this.webviewEditor.webview.asWebviewUri(this.extensionRoot.with({
 			path: this.extensionRoot.path + path
--- a/extensions/image-preview/src/typings/ref.d.ts
+++ b/extensions/image-preview/src/typings/ref.d.ts
@@ -1,6 +1,6 @@
 /*---------------------------------------------------------------------------------------------
 *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

 /// <reference path='../../../../src/vs/vscode.d.ts'/>
--- a/extensions/json/syntaxes/JSON.tmLanguage.json
+++ b/extensions/json/syntaxes/JSON.tmLanguage.json
@@ -5,7 +5,7 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/Microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70",
-	"name": "JSON (Javascript Next)",
+	"name": "JSON (JavaScript Next)",
 	"scopeName": "source.json",
 	"patterns": [
 		{
@@ -210,4 +210,4 @@
 			]
 		}
 	}
-}
+}
--- a/extensions/markdown-language-features/src/docIndex.ts
+++ b/extensions/markdown-language-features/src/docIndex.ts
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { Disposable } from './util/dispose';
-
-
-export class DocumentIndex extends Disposable {
-	private readonly _uriMap = new Map();
-
-	constructor() {
-		super();
-
-		for (let doc of vscode.workspace.textDocuments) {
-			this._registerDoc(doc);
-		}
-
-		this._register(
-			vscode.workspace.onDidOpenTextDocument((doc) => {
-				this._registerDoc(doc);
-			})
-		);
-		this._register(
-			vscode.workspace.onDidCloseTextDocument((doc) => {
-				this._unregisterDoc(doc.uri);
-			})
-		);
-	}
-
-	getByUri(uri: vscode.Uri): vscode.TextDocument | undefined {
-		return this._uriMap.get(uri.toString());
-	}
-
-	private _registerDoc(doc: vscode.TextDocument) {
-		const uri = doc.uri.toString();
-		if (this._uriMap.has(uri)) {
-			throw new Error(`The document ${uri} is already registered.`);
-		}
-		this._uriMap.set(uri, doc);
-	}
-
-	private _unregisterDoc(uri: vscode.Uri) {
-		if (!this._uriMap.has(uri.toString())) {
-			throw new Error(`The document ${uri.toString()} is not registered.`);
-		}
-		this._uriMap.delete(uri.toString());
-	}
-}
--- a/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
+++ b/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
@@ -10,7 +10,6 @@ import { Lazy, lazy } from '../util/lazy';
 import MDDocumentSymbolProvider from './documentSymbolProvider';
 import { SkinnyTextDocument, SkinnyTextLine } from '../tableOfContentsProvider';
 import { flatten } from '../util/arrays';
-import { DocumentIndex } from '../docIndex';

 export interface WorkspaceMarkdownDocumentProvider {
 	getAllMarkdownDocuments(): Thenable<Iterable<SkinnyTextDocument>>;
@@ -27,7 +26,6 @@ class VSCodeWorkspaceMarkdownDocumentProvider extends Disposable implements Work
 	private readonly _onDidDeleteMarkdownDocumentEmitter = this._register(new vscode.EventEmitter<vscode.Uri>());

 	private _watcher: vscode.FileSystemWatcher | undefined;
-	private _docIndex: DocumentIndex = this._register(new DocumentIndex());

 	async getAllMarkdownDocuments() {
 		const resources = await vscode.workspace.findFiles('**/*.md', '**/node_modules/**');
@@ -83,9 +81,9 @@ class VSCodeWorkspaceMarkdownDocumentProvider extends Disposable implements Work
 	}

 	private async getMarkdownDocument(resource: vscode.Uri): Promise<SkinnyTextDocument | undefined> {
-		const existingDocument = this._docIndex.getByUri(resource);
-		if (existingDocument) {
-			return existingDocument;
+		const matchingDocuments = vscode.workspace.textDocuments.filter((doc) => doc.uri.toString() === resource.toString());
+		if (matchingDocuments.length !== 0) {
+			return matchingDocuments[0];
 		}

 		const bytes = await vscode.workspace.fs.readFile(resource);
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -941,7 +941,7 @@
    "figures": "^2.0.0",
    "find-remove": "1.2.1",
    "fs-extra": "^3.0.1",
-    "kerberos": "^1.1.2",
+    "kerberos": "^1.1.3",
    "request": "^2.88.0",
    "request-promise": "^4.2.2",
    "service-downloader": "github:anthonydresser/service-downloader#0.1.6",
--- a/extensions/mssql/yarn.lock
+++ b/extensions/mssql/yarn.lock
@@ -132,7 +132,7 @@ bcrypt-pbkdf@^1.0.0:
  dependencies:
    tweetnacl "^0.14.3"

-bindings@^1.3.0:
+bindings@^1.5.0:
  version "1.5.0"
  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
@@ -147,6 +147,13 @@ bl@^1.0.0:
    readable-stream "^2.3.5"
    safe-buffer "^5.1.1"

+bl@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz#3611ec00579fd18561754360b21e9f784500ff88"
+  integrity sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==
+  dependencies:
+    readable-stream "^3.0.1"
+
 bluebird@^3.5.0:
  version "3.5.3"
  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
@@ -206,7 +213,7 @@ caseless@~0.12.0:
  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=

-chownr@^1.0.1:
+chownr@^1.1.1:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
  integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
@@ -372,7 +379,7 @@ ecc-jsbn@~0.1.1:
    jsbn "~0.1.0"
    safer-buffer "^2.1.0"

-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
@@ -738,14 +745,14 @@ jsprim@^1.2.2:
    json-schema "0.2.3"
    verror "1.10.0"

-kerberos@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-1.1.2.tgz#f213dae89c57e729786664fcf99117221e18e257"
-  integrity sha512-N+CeRTi0f6ov85Fx+w/epVPTBy6bovoWjUCD6pvXoHWBWeqI6+ViV2psdoSc4CRtiZfJkhvYO3b47I4hJfOu7Q==
+kerberos@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-1.1.3.tgz#74c5620d09289e4a53beddc2d9a93eccfebd964d"
+  integrity sha512-R6LdXnkSTALLnrKaByYdIc+eRNhDf+ezA83BeqHiCcKhKE9R6m1PBD579YuX9KANPAakhWHEu/u6H7ZQBc/+Wg==
  dependencies:
-    bindings "^1.3.0"
-    nan "^2.10.0"
-    prebuild-install "^5.0.0"
+    bindings "^1.5.0"
+    nan "^2.14.0"
+    prebuild-install "^5.3.0"

 lodash@^4.13.1:
  version "4.17.11"
@@ -810,7 +817,7 @@ ms@^2.1.1:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==

-nan@^2.10.0:
+nan@^2.14.0:
  version "2.14.0"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -864,11 +871,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
  dependencies:
    wrappy "1"

-os-homedir@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
 os-tmpdir@~1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -911,10 +913,10 @@ pinkie@^2.0.0:
  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=

-prebuild-install@^5.0.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.0.tgz#58b4d8344e03590990931ee088dd5401b03004c8"
-  integrity sha512-aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==
+prebuild-install@^5.3.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.2.tgz#6392e9541ac0b879ef0f22b3d65037417eb2035e"
+  integrity sha512-INDfXzTPnhT+WYQemqnAXlP7SvfiFMopMozSgXCZ+RDLb279gKfIuLk4o7PgEawLp3WrMgIYGBpkxpraROHsSA==
  dependencies:
    detect-libc "^1.0.3"
    expand-template "^2.0.3"
@@ -925,11 +927,10 @@ prebuild-install@^5.0.0:
    node-abi "^2.7.0"
    noop-logger "^0.1.1"
    npmlog "^4.0.1"
-    os-homedir "^1.0.1"
-    pump "^2.0.1"
+    pump "^3.0.0"
    rc "^1.2.7"
-    simple-get "^2.7.0"
-    tar-fs "^1.13.0"
+    simple-get "^3.0.3"
+    tar-fs "^2.0.0"
    tunnel-agent "^0.6.0"
    which-pm-runs "^1.0.0"

@@ -943,18 +944,10 @@ psl@^1.1.24, psl@^1.1.28:
  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==

-pump@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
-  integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
  dependencies:
    end-of-stream "^1.1.0"
    once "^1.3.1"
@@ -984,7 +977,7 @@ rc@^1.2.7:
    minimist "^1.2.0"
    strip-json-comments "~2.0.1"

-"readable-stream@2 || 3":
+"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.1.1:
  version "3.4.0"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
@@ -1119,10 +1112,10 @@ simple-concat@^1.0.0:
  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
  integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=

-simple-get@^2.7.0:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d"
-  integrity sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==
+simple-get@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.0.3.tgz#924528ac3f9d7718ce5e9ec1b1a69c0be4d62efa"
+  integrity sha512-Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==
  dependencies:
    decompress-response "^3.3.0"
    once "^1.3.1"
@@ -1212,17 +1205,17 @@ strip-json-comments@~2.0.1:
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=

-tar-fs@^1.13.0:
-  version "1.16.3"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
-  integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
+tar-fs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
+  integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==
  dependencies:
-    chownr "^1.0.1"
+    chownr "^1.1.1"
    mkdirp "^0.5.1"
-    pump "^1.0.0"
-    tar-stream "^1.1.2"
+    pump "^3.0.0"
+    tar-stream "^2.0.0"

-tar-stream@^1.1.2, tar-stream@^1.5.2:
+tar-stream@^1.5.2:
  version "1.6.2"
  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
@@ -1235,6 +1228,17 @@ tar-stream@^1.1.2, tar-stream@^1.5.2:
    to-buffer "^1.1.1"
    xtend "^4.0.0"

+tar-stream@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"
+  integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==
+  dependencies:
+    bl "^3.0.0"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
 through2@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -3,7 +3,7 @@
  "version": "0.0.1",
  "description": "Dependencies shared by all extensions",
  "dependencies": {
-    "typescript": "3.6.3-insiders.20190909"
+    "typescript": "3.6.3"
  },
  "scripts": {
    "postinstall": "node ./postinstall"
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -170,6 +170,73 @@
 			"settings": {
 				"foreground": "#d7ba7d"
 			}
+		},
+		// Scopes that are potentially C++ only follow
+		{
+			"scope": "source.cpp entity.name",
+			"settings": {
+				"foreground": "#C8C8C8"
+			}
+		},
+		{
+			"scope": "source.cpp keyword.control.directive",
+			"settings": {
+				"foreground": "#9B9B9B"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.function.operator",
+			"settings": {
+				"foreground": "#B4B4B4"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.function.preprocessor",
+			"settings": {
+				"foreground": "#C586C0"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.label",
+			"settings": {
+				"foreground": "#C8C8C8"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.operator.custom-literal",
+			"settings": {
+				"foreground": "#DADADA"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.operator.custom-literal.number",
+			"settings": {
+				"foreground": "#B5CEA8"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.operator.custom-literal.string",
+			"settings": {
+				"foreground": "#ce9178"
+			}
+		},
+		{
+			"scope": "source.cpp variable.other.enummember",
+			"settings": {
+				"foreground": "#B8D7A3"
+			}
+		},
+		{
+			"scope": "source.cpp variable.other.property",
+			"settings": {
+				"foreground": "#DADADA"
+			}
+		},
+		{
+			"scope": "source.cpp variable.parameter",
+			"settings": {
+				"foreground": "#7F7F7F"
+			}
 		}
 	]
 }
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -170,7 +170,55 @@
 			"settings": {
 				"foreground": "#ff0000"
 			}
+		},
+		// Scopes that are potentially C++ only follow
+		{
+			"scope": "source.cpp entity.name",
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"scope": "source.cpp keyword.control.directive",
+			"settings": {
+				"foreground": "#808080"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.function.operator",
+			"settings": {
+				"foreground": "#008080"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.function.preprocessor",
+			"settings": {
+				"foreground": "#AF00DB"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.label",
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"scope": "source.cpp entity.name.operator.custom-literal.string",
+			"settings": {
+				"foreground": "#0451a5"
+			}
+		},
+		{
+			"scope": "source.cpp variable.other.enummember",
+			"settings": {
+				"foreground": "#2F4F4F"
+			}
+		},
+		{
+			"scope": "source.cpp variable.parameter",
+			"settings": {
+				"foreground": "#808080"
+			}
 		}
-
 	]
 }
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1


-typescript@3.6.3-insiders.20190909:
-  version "3.6.3-insiders.20190909"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3-insiders.20190909.tgz#65b6b2d809288311a970819849e1964ac73e1fda"
-  integrity sha512-Lr7ONd8Y05EhrI+zKoI5tgvO5dhuRDrK5pyOLG33DeMln8zb8w7Yc8AoIEyqvxB5Btj9F7zBmXBXJdTI3SuX0Q==
+typescript@3.6.3:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da"
+  integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==