Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues

extensions/vscode-colorize-tests/package.json

@@ -5,14 +5,22 @@
 	"publisher": "vscode",
 	"license": "MIT",
 	"private": true,
+	"activationEvents": [
+		"onLanguage:json"
+	],
+	"main": "./out/colorizerTestMain",
+	"enableProposedApi": true,
 	"engines": {
 		"vscode": "*"
 	},
 	"scripts": {
 		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-colorize-tests ./tsconfig.json"
 	},
+	"dependencies": {
+		"jsonc-parser": "2.2.0"
+	},
 	"devDependencies": {
-		"@types/node": "^10.14.8",
+		"@types/node": "^12.11.7",
 		"mocha-junit-reporter": "^1.17.0",
 		"mocha-multi-reporters": "^1.1.7",
 		"vscode": "1.1.5"

extensions/vscode-colorize-tests/src/colorizerTestMain.ts

@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 * as jsoncParser from 'jsonc-parser';
+
+export function activate(context: vscode.ExtensionContext): any {
+
+	const tokenModifiers = ['static', 'abstract', 'deprecated'];
+	const tokenTypes = ['strings', 'types', 'structs', 'classes', 'functions', 'variables'];
+	const legend = new vscode.SemanticTokensLegend(tokenTypes, tokenModifiers);
+
+	const semanticHighlightProvider: vscode.SemanticTokensProvider = {
+		provideSemanticTokens(document: vscode.TextDocument): vscode.ProviderResult<vscode.SemanticTokens> {
+			const builder = new vscode.SemanticTokensBuilder();
+
+			const visitor: jsoncParser.JSONVisitor = {
+				onObjectProperty: (property: string, _offset: number, length: number, startLine: number, startCharacter: number) => {
+					const [type, ...modifiers] = property.split('.');
+					let tokenType = legend.tokenTypes.indexOf(type);
+					if (tokenType === -1) {
+						tokenType = 0;
+					}
+
+					let tokenModifiers = 0;
+					for (let i = 0; i < modifiers.length; i++) {
+						const index = legend.tokenModifiers.indexOf(modifiers[i]);
+						if (index !== -1) {
+							tokenModifiers = tokenModifiers | 1 << index;
+						}
+					}
+
+					builder.push(startLine, startCharacter, length, tokenType, tokenModifiers);
+				}
+			};
+			jsoncParser.visit(document.getText(), visitor);
+
+			return new vscode.SemanticTokens(builder.build());
+		}
+	};
+
+
+	context.subscriptions.push(vscode.languages.registerSemanticTokensProvider({ pattern: '**/color-test.json' }, semanticHighlightProvider, legend));
+
+}

extensions/vscode-colorize-tests/src/index.ts

@@ -10,7 +10,7 @@ const suite = 'Integration Colorize Tests';
 
 const options: any = {
 	ui: 'tdd',
-	useColors: true,
+	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
 	timeout: 60000
 };
 

extensions/vscode-colorize-tests/src/typings/ref.d.ts

@@ -3,5 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/// <reference path="../../../../src/vs/vscode.d.ts" />
+/// <reference path="../../../../src/vs/vscode.proposed.d.ts" />
 /// <reference types='@types/node'/>
-/// <reference path='../../../../src/vs/vscode.d.ts'/>
+

extensions/vscode-colorize-tests/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^10.14.8":
-  version "10.14.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.8.tgz#fe444203ecef1162348cd6deb76c62477b2cc6e9"
-  integrity sha512-I4+DbJEhLEg4/vIy/2gkWDvXBOOtPKV9EnLhYjMoqxcRW+TTZtUftkHktz/a8suoD5mUL7m6ReLrkPvSsCQQmw==
+"@types/node@^12.11.7":
+  version "12.11.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
+  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
 
 ajv@^5.1.0:
   version "5.3.0"
@@ -1042,6 +1042,11 @@ json3@3.3.2:
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
   integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
+jsonc-parser@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.0.tgz#f206f87f9d49d644b7502052c04e82dd6392e9ef"
+  integrity sha512-4fLQxW1j/5fWj6p78vAlAafoCKtuBm6ghv+Ij5W2DrDx0qE+ZdEl2c6Ko1mgJNF5ftX1iEWQQ4Ap7+3GlhjkOA==
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"