Merge from vscode 718331d6f3ebd1b571530ab499edb266ddd493d5

.eslintrc.json

@@ -26,7 +26,17 @@
         "no-throw-literal": "warn",
         "no-unsafe-finally": "warn",
         "no-unused-labels": "warn",
-        "no-restricted-globals": ["warn", "name", "length", "event", "closed", "external", "status", "origin", "orientation"], // non-complete list of globals that are easy to access unintentionally
+        "no-restricted-globals": [
+            "warn",
+            "name",
+            "length",
+            "event",
+            "closed",
+            "external",
+            "status",
+            "origin",
+            "orientation"
+        ], // non-complete list of globals that are easy to access unintentionally
         "no-var": "warn",
         "jsdoc/no-types": "warn",
         "semi": "off",
@@ -259,6 +269,50 @@
             "rules": {
                 "jsdoc/no-types": "off"
             }
+        },
+        {
+            "files": [
+                "**/vscode.d.ts",
+                "**/vscode.proposed.d.ts"
+            ],
+            "rules": {
+                "vscode-dts-create-func": "warn",
+                "vscode-dts-literal-or-types": "warn",
+                "vscode-dts-interface-naming": "warn",
+                "vscode-dts-event-naming": [
+                    "warn",
+                    {
+                        "allowed": [
+                            "onCancellationRequested",
+                            "event"
+                        ],
+                        "verbs": [
+                            "accept",
+                            "change",
+                            "close",
+                            "collapse",
+                            "create",
+                            "delete",
+                            "dispose",
+                            "end",
+                            "expand",
+                            "hide",
+                            "open",
+                            "override",
+                            "receive",
+                            "register",
+                            "rename",
+                            "save",
+                            "send",
+                            "start",
+                            "terminate",
+                            "trigger",
+                            "unregister",
+                            "write"
+                        ]
+                    }
+                ]
+            }
         }
     ]
 }

.vscode/launch.json

@@ -95,7 +95,9 @@
 			"webRoot": "${workspaceFolder}",
 			// Settings for js-debug:
 			"pauseForSourceMap": false,
-			"outFiles": ["${workspaceFolder}/out/**/*.js"],
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
 		},
 		{
 			"type": "node",
@@ -197,7 +199,7 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Run Unit Tests",
-			"program": "${workspaceFolder}/test/electron/index.js",
+			"program": "${workspaceFolder}/test/unit/electron/index.js",
 			"runtimeExecutable": "${workspaceFolder}/.build/electron/Azure Data Studio.app/Contents/MacOS/Electron",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio.exe"

.vscode/searches/ts36031.code-search

@@ -1,7 +1,6 @@
 # Query: \\w+\\?\\..+![(.[]
 # Flags: RegExp
 # ContextLines: 2
-
 src/vs/base/browser/ui/tree/asyncDataTree.ts:
   270  			} : undefined,
   271  			isChecked: options.ariaProvider!.isChecked ? (e) => {

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "6.1.6"
+target "7.1.11"
 runtime "electron"

build/azure-pipelines/common/createAsset.ts

@@ -44,15 +44,16 @@ async function doesAssetExist(blobService: azure.BlobService, quality: string, b
 	return existsResult.exists;
 }
 
-async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, file: string): Promise<void> {
+async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, filePath: string, fileName: string): Promise<void> {
 	const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
 		contentSettings: {
-			contentType: mime.lookup(file),
+			contentType: mime.lookup(filePath),
+			contentDisposition: `attachment; filename="${fileName}"`,
 			cacheControl: 'max-age=31536000, public'
 		}
 	};
 
-	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, filePath, blobOptions, err => err ? e(err) : c()));
 }
 
 function getEnv(name: string): string {
@@ -66,24 +67,24 @@ function getEnv(name: string): string {
 }
 
 async function main(): Promise<void> {
-	const [, , platform, type, name, file] = process.argv;
+	const [, , platform, type, fileName, filePath] = process.argv;
 	const quality = getEnv('VSCODE_QUALITY');
 	const commit = getEnv('BUILD_SOURCEVERSION');
 
 	console.log('Creating asset...');
 
-	const stat = await new Promise<fs.Stats>((c, e) => fs.stat(file, (err, stat) => err ? e(err) : c(stat)));
+	const stat = await new Promise<fs.Stats>((c, e) => fs.stat(filePath, (err, stat) => err ? e(err) : c(stat)));
 	const size = stat.size;
 
 	console.log('Size:', size);
 
-	const stream = fs.createReadStream(file);
+	const stream = fs.createReadStream(filePath);
 	const [sha1hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]);
 
 	console.log('SHA1:', sha1hash);
 	console.log('SHA256:', sha256hash);
 
-	const blobName = commit + '/' + name;
+	const blobName = commit + '/' + fileName;
 	const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2']!;
 
 	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']!)
@@ -98,7 +99,7 @@ async function main(): Promise<void> {
 
 	console.log('Uploading blobs to Azure storage...');
 
-	await uploadBlob(blobService, quality, blobName, file);
+	await uploadBlob(blobService, quality, blobName, filePath, fileName);
 
 	console.log('Blobs successfully uploaded.');
 

build/azure-pipelines/darwin/continuous-build-darwin.yml

@@ -44,6 +44,9 @@ steps:
 - script: |
     ./scripts/test.sh --tfs "Unit Tests"
   displayName: Run Unit Tests
+- script: |
+    yarn test-browser --browser chromium --browser webkit
+  displayName: Run Unit Tests (Browsers)
 # - script: | {{SQL CARBON EDIT}} remove step
 #     ./scripts/test-integration.sh --tfs "Integration Tests"
 #   displayName: Run Integration Tests

build/azure-pipelines/darwin/entitlements.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+</dict>
+</plist>

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -44,6 +44,13 @@ steps:
 
     git config user.email "vscode@microsoft.com"
     git config user.name "VSCode"
+
+    security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+    security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+    security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
+    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
   displayName: Prepare tooling
 
 - script: |
@@ -114,30 +121,25 @@ steps:
   displayName: Run integration tests
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-# Web Smoke Tests disabled due to https://github.com/microsoft/vscode/issues/80308
-# - script: |
-#     set -e
-#     cd test/smoke
-#     yarn compile
-#     cd -
-#     yarn smoketest --web --headless
-#   continueOnError: true
-#   displayName: Run web smoke tests
-#   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
 - script: |
     set -e
     cd test/smoke
     yarn compile
     cd -
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
     yarn smoketest --web --headless
   continueOnError: true
-  displayName: Run smoke tests
+  displayName: Run web smoke tests
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
-    pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin.zip * && popd
+    codesign -s 99FM488X57 --deep --force --options runtime --entitlements build/azure-pipelines/darwin/entitlements.plist $(agent.builddirectory)/VSCode-darwin/*.app
+  displayName: Set Hardened Entitlements
+
+- script: |
+    set -e
+    pushd $(agent.builddirectory)/VSCode-darwin && zip -r -X -y $(agent.builddirectory)/VSCode-darwin.zip * && popd
   displayName: Archive build
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -151,13 +153,53 @@ steps:
         {
           "keyCode": "CP-401337-Apple",
           "operationSetCode": "MacAppDeveloperSign",
-          "parameters": [ ],
+          "parameters": [
+            {
+              "parameterName": "Hardening",
+              "parameterValue": "--options=runtime"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 60
+  displayName: Codesign
+
+- script: |
+    zip -d $(agent.builddirectory)/VSCode-darwin.zip "*.pkg"
+  displayName: Clean Archive
+
+- script: |
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
+    BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
+    echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
+  displayName: Export bundle identifier
+
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSign'
+    FolderPath: '$(agent.builddirectory)'
+    Pattern: 'VSCode-darwin.zip'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-401337-Apple",
+          "operationSetCode": "MacAppNotarize",
+          "parameters": [
+            {
+              "parameterName": "BundleId",
+              "parameterValue": "$(BundleIdentifier)"
+            }
+          ],
           "toolName": "sign",
           "toolVersion": "1.0"
         }
       ]
     SessionTimeout: 120
-  displayName: Codesign
+  displayName: Notarization
 
 - script: |
     set -e

build/azure-pipelines/darwin/publish.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-# remove pkg from archive
-zip -d ../VSCode-darwin.zip "*.pkg"
-
 # publish the build
 node build/azure-pipelines/common/createAsset.js \
 	darwin \

build/azure-pipelines/linux/continuous-build-linux.yml

@@ -52,6 +52,9 @@ steps:
 - script: |
     DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
   displayName: Run Unit Tests
+- script: |
+    DISPLAY=:10 yarn test-browser --browser chromium
+  displayName: Run Unit Tests (Browser)
 # - script: | {{SQL CARBON EDIT}} remove step
 #     DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
 #   displayName: Run Integration Tests

build/azure-pipelines/linux/xvfb.init

@@ -19,7 +19,7 @@
 [ "${NETWORKING}" = "no" ] && exit 0
 
 PROG="/usr/bin/Xvfb"
-PROG_OPTIONS=":10 -ac"
+PROG_OPTIONS=":10 -ac -screen 0 1024x768x24"
 PROG_OUTPUT="/tmp/Xvfb.out"
 
 case "$1" in
@@ -50,4 +50,4 @@ case "$1" in
 		exit 1
 esac
 
-exit $RETVAL
+exit $RETVAL

build/azure-pipelines/win32/ESRPClient/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EsrpClient" version="1.0.27" />
+  <package id="Microsoft.ESRPClient" version="1.2.25" />
 </packages>

build/azure-pipelines/win32/continuous-build-win32.yml

@@ -49,6 +49,9 @@ steps:
 - powershell: |
     .\scripts\test.bat --tfs "Unit Tests"
   displayName: Run Unit Tests
+- powershell: |
+    yarn test-browser --browser chromium --browser webkit
+  displayName: Run Unit Tests (Browser)
 # - powershell: | {{SQL CARBON EDIT}} remove step
 #     .\scripts\test-integration.bat --tfs "Integration Tests"
 #   displayName: Run Integration Tests

build/azure-pipelines/win32/sign.ps1

@@ -67,4 +67,4 @@ $Input = Create-TmpJson @{
 
 $Output = [System.IO.Path]::GetTempFileName()
 $ScriptPath = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-& "$ScriptPath\ESRPClient\packages\EsrpClient.1.0.27\tools\ESRPClient.exe" Sign -a $Auth -p $Policy -i $Input -o $Output
+& "$ScriptPath\ESRPClient\packages\Microsoft.ESRPClient.1.2.25\tools\ESRPClient.exe" Sign -a $Auth -p $Policy -i $Input -o $Output

build/gulpfile.editor.js

@@ -227,8 +227,13 @@ function toExternalDTS(contents) {
 		if (line.indexOf('declare namespace monaco.') === 0) {
 			lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
 		}
+
+		if (line.indexOf('declare let MonacoEnvironment') === 0) {
+			lines[i] = `declare global {\n    let MonacoEnvironment: Environment | undefined;\n}`;
+			// lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
+		}
 	}
-	return lines.join('\n');
+	return lines.join('\n').replace(/\n\n\n+/g, '\n\n');
 }
 
 function filterStream(testFunc) {

build/gulpfile.hygiene.js

@@ -33,6 +33,7 @@ const all = [
 	'scripts/**/*',
 	'src/**/*',
 	'test/**/*',
+	'!test/**/out/**',
 	'!**/node_modules/**'
 ];
 
@@ -53,8 +54,7 @@ const indentationFilter = [
 	'!src/vs/base/common/marked/marked.js',
 	'!src/vs/base/node/terminateProcess.sh',
 	'!src/vs/base/node/cpuUsage.sh',
-	'!test/assert.js',
-	'!build/testSetup.js',
+	'!test/unit/assert.js',
 
 	// except specific folders
 	'!test/automation/out/**',
@@ -84,7 +84,7 @@ const indentationFilter = [
 	'!src/vs/*/**/*.d.ts',
 	'!src/typings/**/*.d.ts',
 	'!extensions/**/*.d.ts',
-	'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns}',
+	'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns,plist}',
 	'!build/{lib,download}/**/*.js',
 	'!build/**/*.sh',
 	'!build/azure-pipelines/**/*.js',

build/lib/eslint/vscode-dts-create-func.js

@@ -0,0 +1,35 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+module.exports = new class ApiLiteralOrTypes {
+    constructor() {
+        this.meta = {
+            docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' },
+            messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', }
+        };
+    }
+    create(context) {
+        return {
+            ['TSDeclareFunction Identifier[name=/create.*/]']: (node) => {
+                var _a;
+                const decl = node.parent;
+                if (((_a = decl.returnType) === null || _a === void 0 ? void 0 : _a.typeAnnotation.type) !== experimental_utils_1.AST_NODE_TYPES.TSTypeReference) {
+                    return;
+                }
+                if (decl.returnType.typeAnnotation.typeName.type !== experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                    return;
+                }
+                const ident = decl.returnType.typeAnnotation.typeName.name;
+                if (ident === 'Promise' || ident === 'Thenable') {
+                    context.report({
+                        node,
+                        messageId: 'sync'
+                    });
+                }
+            }
+        };
+    }
+};

build/lib/eslint/vscode-dts-create-func.ts

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' },
+		messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', }
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		return {
+			['TSDeclareFunction Identifier[name=/create.*/]']: (node: any) => {
+
+				const decl = <TSESTree.FunctionDeclaration>(<TSESTree.Identifier>node).parent;
+
+				if (decl.returnType?.typeAnnotation.type !== AST_NODE_TYPES.TSTypeReference) {
+					return;
+				}
+				if (decl.returnType.typeAnnotation.typeName.type !== AST_NODE_TYPES.Identifier) {
+					return;
+				}
+
+				const ident = decl.returnType.typeAnnotation.typeName.name;
+				if (ident === 'Promise' || ident === 'Thenable') {
+					context.report({
+						node,
+						messageId: 'sync'
+					});
+				}
+			}
+		};
+	}
+};

build/lib/eslint/vscode-dts-event-naming.js

@@ -0,0 +1,81 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+module.exports = new (_a = class ApiEventNaming {
+        constructor() {
+            this.meta = {
+                docs: {
+                    url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#event-naming'
+                },
+                messages: {
+                    naming: 'Event names must follow this patten: `on[Did|Will]<Verb><Subject>`',
+                    verb: 'Unknown verb \'{{verb}}\' - is this really a verb? Iff so, then add this verb to the configuration',
+                    subject: 'Unknown subject \'{{subject}}\' - This subject has not been used before but it should refer to something in the API',
+                    unknown: 'UNKNOWN event declaration, lint-rule needs tweaking'
+                }
+            };
+        }
+        create(context) {
+            const config = context.options[0];
+            const allowed = new Set(config.allowed);
+            const verbs = new Set(config.verbs);
+            return {
+                ['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node) => {
+                    var _a, _b;
+                    const def = (_b = (_a = node.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.parent;
+                    let ident;
+                    if ((def === null || def === void 0 ? void 0 : def.type) === experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                        ident = def;
+                    }
+                    else if (((def === null || def === void 0 ? void 0 : def.type) === experimental_utils_1.AST_NODE_TYPES.TSPropertySignature || (def === null || def === void 0 ? void 0 : def.type) === experimental_utils_1.AST_NODE_TYPES.ClassProperty) && def.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                        ident = def.key;
+                    }
+                    if (!ident) {
+                        // event on unknown structure...
+                        return context.report({
+                            node,
+                            message: 'unknown'
+                        });
+                    }
+                    if (allowed.has(ident.name)) {
+                        // configured exception
+                        return;
+                    }
+                    const match = ApiEventNaming._nameRegExp.exec(ident.name);
+                    if (!match) {
+                        context.report({
+                            node: ident,
+                            messageId: 'naming'
+                        });
+                        return;
+                    }
+                    // check that <verb> is spelled out (configured) as verb
+                    if (!verbs.has(match[2].toLowerCase())) {
+                        context.report({
+                            node: ident,
+                            messageId: 'verb',
+                            data: { verb: match[2] }
+                        });
+                    }
+                    // check that a subject (if present) has occurred
+                    if (match[3]) {
+                        const regex = new RegExp(match[3], 'ig');
+                        const parts = context.getSourceCode().getText().split(regex);
+                        if (parts.length < 3) {
+                            context.report({
+                                node: ident,
+                                messageId: 'subject',
+                                data: { subject: match[3] }
+                            });
+                        }
+                    }
+                }
+            };
+        }
+    },
+    _a._nameRegExp = /on(Did|Will)([A-Z][a-z]+)([A-Z][a-z]+)?/,
+    _a);

build/lib/eslint/vscode-dts-event-naming.ts

@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiEventNaming implements eslint.Rule.RuleModule {
+
+	private static _nameRegExp = /on(Did|Will)([A-Z][a-z]+)([A-Z][a-z]+)?/;
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#event-naming'
+		},
+		messages: {
+			naming: 'Event names must follow this patten: `on[Did|Will]<Verb><Subject>`',
+			verb: 'Unknown verb \'{{verb}}\' - is this really a verb? Iff so, then add this verb to the configuration',
+			subject: 'Unknown subject \'{{subject}}\' - This subject has not been used before but it should refer to something in the API',
+			unknown: 'UNKNOWN event declaration, lint-rule needs tweaking'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const config = <{ allowed: string[], verbs: string[] }>context.options[0];
+		const allowed = new Set(config.allowed);
+		const verbs = new Set(config.verbs);
+
+		return {
+			['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node: any) => {
+
+				const def = (<TSESTree.Identifier>node).parent?.parent?.parent;
+				let ident: TSESTree.Identifier | undefined;
+
+				if (def?.type === AST_NODE_TYPES.Identifier) {
+					ident = def;
+
+				} else if ((def?.type === AST_NODE_TYPES.TSPropertySignature || def?.type === AST_NODE_TYPES.ClassProperty) && def.key.type === AST_NODE_TYPES.Identifier) {
+					ident = def.key;
+				}
+
+				if (!ident) {
+					// event on unknown structure...
+					return context.report({
+						node,
+						message: 'unknown'
+					});
+				}
+
+				if (allowed.has(ident.name)) {
+					// configured exception
+					return;
+				}
+
+				const match = ApiEventNaming._nameRegExp.exec(ident.name);
+				if (!match) {
+					context.report({
+						node: ident,
+						messageId: 'naming'
+					});
+					return;
+				}
+
+				// check that <verb> is spelled out (configured) as verb
+				if (!verbs.has(match[2].toLowerCase())) {
+					context.report({
+						node: ident,
+						messageId: 'verb',
+						data: { verb: match[2] }
+					});
+				}
+
+				// check that a subject (if present) has occurred
+				if (match[3]) {
+					const regex = new RegExp(match[3], 'ig');
+					const parts = context.getSourceCode().getText().split(regex);
+					if (parts.length < 3) {
+						context.report({
+							node: ident,
+							messageId: 'subject',
+							data: { subject: match[3] }
+						});
+					}
+				}
+			}
+		};
+	}
+};
+

build/lib/eslint/vscode-dts-interface-naming.js

@@ -0,0 +1,30 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+module.exports = new (_a = class ApiInterfaceNaming {
+        constructor() {
+            this.meta = {
+                messages: {
+                    naming: 'Interfaces must not be prefixed with uppercase `I`',
+                }
+            };
+        }
+        create(context) {
+            return {
+                ['TSInterfaceDeclaration Identifier']: (node) => {
+                    const name = node.name;
+                    if (ApiInterfaceNaming._nameRegExp.test(name)) {
+                        context.report({
+                            node,
+                            messageId: 'naming'
+                        });
+                    }
+                }
+            };
+        }
+    },
+    _a._nameRegExp = /I[A-Z]/,
+    _a);

build/lib/eslint/vscode-dts-interface-naming.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiInterfaceNaming implements eslint.Rule.RuleModule {
+
+	private static _nameRegExp = /I[A-Z]/;
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			naming: 'Interfaces must not be prefixed with uppercase `I`',
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		return {
+			['TSInterfaceDeclaration Identifier']: (node: any) => {
+
+				const name = (<TSESTree.Identifier>node).name;
+				if (ApiInterfaceNaming._nameRegExp.test(name)) {
+					context.report({
+						node,
+						messageId: 'naming'
+					});
+				}
+			}
+		};
+	}
+};
+

build/lib/eslint/vscode-dts-literal-or-types.js

@@ -0,0 +1,23 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+module.exports = new class ApiLiteralOrTypes {
+    constructor() {
+        this.meta = {
+            docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' },
+            messages: { useEnum: 'Use enums, not literal-or-types', }
+        };
+    }
+    create(context) {
+        return {
+            ['TSTypeAnnotation TSUnionType TSLiteralType']: (node) => {
+                context.report({
+                    node: node,
+                    messageId: 'useEnum'
+                });
+            }
+        };
+    }
+};

build/lib/eslint/vscode-dts-literal-or-types.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+
+export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' },
+		messages: { useEnum: 'Use enums, not literal-or-types', }
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		return {
+			['TSTypeAnnotation TSUnionType TSLiteralType']: (node: any) => {
+				context.report({
+					node: node,
+					messageId: 'useEnum'
+				});
+			}
+		};
+	}
+};

build/lib/i18n.resources.json

@@ -142,6 +142,10 @@
 			"name": "vs/workbench/contrib/search",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/searchEditor",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/snippets",
 			"project": "vscode-workbench"
@@ -321,6 +325,10 @@
 		{
 			"name": "vs/workbench/services/userDataSync",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/timeline",
+			"project": "vscode-workbench"
 		}
 	]
 }

build/lib/layersChecker.js

@@ -38,6 +38,7 @@ const CORE_TYPES = [
     'group',
     'groupEnd',
     'table',
+    'assert',
     'Error',
     'String',
     'throws',
@@ -60,7 +61,7 @@ const RULES = [
     },
     // Common: vs/base/common/platform.ts
     {
-        target: '**/vs/base/common/platform.ts',
+        target: '**/{vs,sql}/base/common/platform.ts',
         allowedTypes: [
             ...CORE_TYPES,
             // Safe access to postMessage() and friends
@@ -74,7 +75,7 @@ const RULES = [
     },
     // Common: vs/workbench/api/common/extHostExtensionService.ts
     {
-        target: '**/vs/workbench/api/common/extHostExtensionService.ts',
+        target: '**/{vs,sql}/workbench/api/common/extHostExtensionService.ts',
         allowedTypes: [
             ...CORE_TYPES,
             // Safe access to global
@@ -102,6 +103,14 @@ const RULES = [
             '@types/node' // no node.js
         ]
     },
+    // Browser (editor contrib)
+    {
+        target: '**/src/{vs,sql}/editor/contrib/**',
+        allowedTypes: CORE_TYPES,
+        disallowedDefinitions: [
+            '@types/node' // no node.js
+        ]
+    },
     // node.js
     {
         target: '**/{vs,sql}/**/node/**',

build/lib/layersChecker.ts

@@ -39,6 +39,7 @@ const CORE_TYPES = [
 	'group',
 	'groupEnd',
 	'table',
+	'assert',
 	'Error',
 	'String',
 	'throws',
@@ -64,7 +65,7 @@ const RULES = [
 
 	// Common: vs/base/common/platform.ts
 	{
-		target: '**/vs/base/common/platform.ts',
+		target: '**/{vs,sql}/base/common/platform.ts',
 		allowedTypes: [
 			...CORE_TYPES,
 
@@ -80,7 +81,7 @@ const RULES = [
 
 	// Common: vs/workbench/api/common/extHostExtensionService.ts
 	{
-		target: '**/vs/workbench/api/common/extHostExtensionService.ts',
+		target: '**/{vs,sql}/workbench/api/common/extHostExtensionService.ts',
 		allowedTypes: [
 			...CORE_TYPES,
 
@@ -112,6 +113,15 @@ const RULES = [
 		]
 	},
 
+	// Browser (editor contrib)
+	{
+		target: '**/src/{vs,sql}/editor/contrib/**',
+		allowedTypes: CORE_TYPES,
+		disallowedDefinitions: [
+			'@types/node'	// no node.js
+		]
+	},
+
 	// node.js
 	{
 		target: '**/{vs,sql}/**/node/**',

build/monaco/monaco.d.ts.recipe

@@ -3,12 +3,18 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+declare let MonacoEnvironment: monaco.Environment | undefined;
+
 declare namespace monaco {
 
-	// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.
-
 	export type Thenable<T> = PromiseLike<T>;
 
+	export interface Environment {
+		baseUrl?: string;
+		getWorker?(workerId: string, label: string): Worker;
+		getWorkerUrl?(workerId: string, label: string): string;
+	}
+
 	export interface IDisposable {
 		dispose(): void;
 	}

build/npm/postinstall.js

@@ -72,4 +72,5 @@ runtime "${runtime}"`;
 yarnInstall(`build`); // node modules required for build
 yarnInstall('test/automation'); // node modules required for smoketest
 yarnInstall('test/smoke'); // node modules required for smoketest
+yarnInstall('test/integration/browser'); // node modules required for integration
 yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron

build/package.json

@@ -50,7 +50,7 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "service-downloader": "github:anthonydresser/service-downloader#0.1.7",
     "terser": "4.3.8",
-    "typescript": " 3.8.0-beta",
+    "typescript": "^3.8.1-rc",
     "vsce": "1.48.0",
     "vscode-telemetry-extractor": "^1.5.4",
     "xml2js": "^0.4.17"

build/yarn.lock

@@ -3823,16 +3823,16 @@ typed-rest-client@^0.9.0:
     tunnel "0.0.4"
     underscore "1.8.3"
 
-"typescript@ 3.8.0-beta":
-  version "3.8.0-beta"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-beta.tgz#acdcaf9f24c7e20b1ff0a6329d1e8d63691e2e13"
-  integrity sha512-mQEmQUJg0CQBhf/GSVnGscKv/jrKsrLxE01AhdjYmBNoXX2Iah3i38ufxXByXacK6Fc5Nr9oMz7MjpjgddiknA==
-
 typescript@^3.0.1:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
   integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
 
+typescript@^3.8.1-rc:
+  version "3.8.1-rc"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.1-rc.tgz#f94333c14da70927ccd887be2e91be652a9a09f6"
+  integrity sha512-aOIe066DyZn2uYIiND6fXMUUJ70nxwu/lKhA92QuQzXyC86fr0ywo1qvO8l2m0EnDcfjprYPuFRgNgDj7U2GlQ==
+
 typical@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"

cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "91f08db83c2ce8c722ddf0911ead8f7c473bedfa"
+					"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "76.0.3809.146"
+			"version": "78.0.3904.130"
 		},
 		{
 			"component": {
@@ -48,11 +48,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "64219741218aa87e259cf8257596073b8e747f0a"
+					"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "12.4.0"
+			"version": "12.8.1"
 		},
 		{
 			"component": {
@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "19c705ab80cd6fdccca3d65803ec2c4addb9540a"
+					"commitHash": "d17dfabfcba7bd0bc994b8dac5f5d2000bef572c"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "6.1.6"
+			"version": "7.1.11"
 		},
 		{
 			"component": {
@@ -98,7 +98,7 @@
 				"git": {
 					"name": "vscode-codicons",
 					"repositoryUrl": "https://github.com/microsoft/vscode-codicons",
-					"commitHash": "65d11e0839d0ce09faa1a159dc0b3c0bd1aa50be"
+					"commitHash": "f0caa623812a8ed5059516277675b4158d4c4867"
 				}
 			},
 			"license": "MIT and Creative Commons Attribution 4.0",

extensions/configuration-editing/schemas/attachContainer.schema.json

@@ -2,6 +2,7 @@
 	"$schema": "http://json-schema.org/draft-07/schema#",
 	"description": "Configures an attached to container",
 	"allowComments": true,
+	"allowTrailingCommas": true,
 	"type": "object",
 	"definitions": {
 		"attachContainer": {

extensions/configuration-editing/schemas/devContainer.schema.json

@@ -2,6 +2,7 @@
 	"$schema": "http://json-schema.org/draft-07/schema#",
 	"description": "Defines a dev container",
 	"allowComments": true,
+	"allowTrailingCommas": true,
 	"type": "object",
 	"definitions": {
 		"devContainerCommon": {
@@ -28,7 +29,9 @@
 					"type": "array",
 					"description": "Ports that are forwarded from the container to the local machine.",
 					"items": {
-						"type": "integer"
+						"type": "integer",
+						"maximum": 65535,
+						"minimum": 0
 					}
 				},
 				"remoteEnv": {

extensions/git/package.json

@@ -26,6 +26,11 @@
   },
   "contributes": {
     "commands": [
+      {
+        "command": "git.setLogLevel",
+        "title": "%command.setLogLevel%",
+        "category": "Git"
+      },
       {
         "command": "git.clone",
         "title": "%command.clone%",
@@ -1760,6 +1765,7 @@
   },
   "dependencies": {
     "byline": "^5.0.0",
+    "dayjs": "1.8.19",
     "file-type": "^7.2.0",
     "iconv-lite": "^0.4.24",
     "jschardet": "2.1.1",
@@ -1774,6 +1780,9 @@
     "@types/mocha": "2.2.43",
     "@types/node": "^12.11.7",
     "@types/which": "^1.0.28",
-    "mocha": "^3.2.0"
+    "mocha": "^3.2.0",
+    "mocha-junit-reporter": "^1.23.3",
+    "mocha-multi-reporters": "^1.1.7",
+    "vscode": "^1.1.36"
   }
 }

extensions/git/package.nls.json

@@ -1,6 +1,7 @@
 {
 	"displayName": "Git",
 	"description": "Git SCM Integration",
+	"command.setLogLevel": "Set Log Level...",
 	"command.clone": "Clone",
 	"command.init": "Initialize Repository",
 	"command.openRepository": "Open Repository",

extensions/git/src/api/api1.ts

@@ -5,7 +5,7 @@
 
 import { Model } from '../model';
 import { Repository as BaseRepository, Resource } from '../repository';
-import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState } from './git';
+import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions } from './git';
 import { Event, SourceControlInputBox, Uri, SourceControl } from 'vscode';
 import { mapEvent } from '../util';
 import { toGitUri } from '../uri';
@@ -202,6 +202,10 @@ export class ApiRepository implements Repository {
 	log(options?: LogOptions): Promise<Commit[]> {
 		return this._repository.log(options);
 	}
+
+	commit(message: string, opts?: CommitOptions): Promise<void> {
+		return this._repository.commit(message, opts);
+	}
 }
 
 export class ApiGit implements Git {

extensions/git/src/api/git.d.ts

@@ -41,7 +41,9 @@ export interface Commit {
 	readonly hash: string;
 	readonly message: string;
 	readonly parents: string[];
-	readonly authorEmail?: string | undefined;
+	readonly authorDate?: Date;
+	readonly authorName?: string;
+	readonly authorEmail?: string;
 }
 
 export interface Submodule {
@@ -119,6 +121,14 @@ export interface LogOptions {
 	readonly maxEntries?: number;
 }
 
+export interface CommitOptions {
+	all?: boolean | 'tracked';
+	amend?: boolean;
+	signoff?: boolean;
+	signCommit?: boolean;
+	empty?: boolean;
+}
+
 export interface Repository {
 
 	readonly rootUri: Uri;
@@ -174,6 +184,8 @@ export interface Repository {
 
 	blame(path: string): Promise<string>;
 	log(options?: LogOptions): Promise<Commit[]>;
+
+	commit(message: string, opts?: CommitOptions): Promise<void>;
 }
 
 export type APIState = 'uninitialized' | 'initialized';

extensions/git/src/commands.ts

@@ -9,13 +9,14 @@ import * as path from 'path';
 import { commands, Disposable, LineChange, MessageOptions, OutputChannel, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder } from 'vscode';
 import TelemetryReporter from 'vscode-extension-telemetry';
 import * as nls from 'vscode-nls';
-import { Branch, GitErrorCodes, Ref, RefType, Status } from './api/git';
-import { CommitOptions, ForcePushMode, Git, Stash } from './git';
+import { Branch, GitErrorCodes, Ref, RefType, Status, CommitOptions } from './api/git';
+import { ForcePushMode, Git, Stash } from './git';
 import { Model } from './model';
 import { Repository, Resource, ResourceGroupType } from './repository';
 import { applyLineChanges, getModifiedRange, intersectDiffWithRange, invertLineChange, toLineRanges } from './staging';
 import { fromGitUri, toGitUri, isGitUri } from './uri';
 import { grep, isDescendant, pathEquals } from './util';
+import { Log, LogLevel } from './log';
 
 const localize = nls.loadMessageBundle();
 
@@ -252,6 +253,36 @@ export class CommandCenter {
 		});
 	}
 
+	@command('git.setLogLevel')
+	async setLogLevel(): Promise<void> {
+		const createItem = (logLevel: LogLevel) => ({
+			label: LogLevel[logLevel],
+			logLevel,
+			description: Log.logLevel === logLevel ? localize('current', "Current") : undefined
+		});
+
+		const items = [
+			createItem(LogLevel.Trace),
+			createItem(LogLevel.Debug),
+			createItem(LogLevel.Info),
+			createItem(LogLevel.Warning),
+			createItem(LogLevel.Error),
+			createItem(LogLevel.Critical),
+			createItem(LogLevel.Off)
+		];
+
+		const choice = await window.showQuickPick(items, {
+			placeHolder: localize('select log level', "Select log level")
+		});
+
+		if (!choice) {
+			return;
+		}
+
+		Log.logLevel = choice.logLevel;
+		this.outputChannel.appendLine(localize('changed', "Log level changed to: {0}", LogLevel[Log.logLevel]));
+	}
+
 	@command('git.refresh', { repository: true })
 	async refresh(repository: Repository): Promise<void> {
 		await repository.status();
@@ -1292,6 +1323,9 @@ export class CommandCenter {
 		}
 
 		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
+		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
+		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
+		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
 
 		if (promptToSaveFilesBeforeCommit !== 'never') {
 			let documents = workspace.textDocuments
@@ -1312,17 +1346,13 @@ export class CommandCenter {
 
 				if (pick === saveAndCommit) {
 					await Promise.all(documents.map(d => d.save()));
-					await repository.add([]);
+					await repository.add(documents.map(d => d.uri));
 				} else if (pick !== commit) {
 					return false; // do not commit on cancel
 				}
 			}
 		}
 
-		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
-		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
-		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
-
 		// no changes, and the user has not configured to commit all in this case
 		if (!noUnstagedChanges && noStagedChanges && !enableSmartCommit) {
 			const suggestSmartCommit = config.get<boolean>('suggestSmartCommit') === true;
@@ -1590,7 +1620,7 @@ export class CommandCenter {
 
 		const rawBranchName = defaultName || await window.showInputBox({
 			placeHolder: localize('branch name', "Branch name"),
-			prompt: localize('provide branch name', "Please provide a branch name"),
+			prompt: localize('provide branch name', "Please provide a new branch name"),
 			value: initialValue,
 			ignoreFocusOut: true,
 			validateInput: (name: string) => {
@@ -2301,6 +2331,23 @@ export class CommandCenter {
 		return result && result.stash;
 	}
 
+	@command('git.openDiff', { repository: false })
+	async openDiff(uri: Uri, lhs: string, rhs: string) {
+		const basename = path.basename(uri.fsPath);
+
+		let title;
+		if ((lhs === 'HEAD' || lhs === '~') && rhs === '') {
+			title = `${basename} (Working Tree)`;
+		}
+		else if (lhs === 'HEAD' && rhs === '~') {
+			title = `${basename} (Index)`;
+		} else {
+			title = `${basename} (${lhs.endsWith('^') ? `${lhs.substr(0, 8)}^` : lhs.substr(0, 8)}) \u27f7 ${basename} (${rhs.endsWith('^') ? `${rhs.substr(0, 8)}^` : rhs.substr(0, 8)})`;
+		}
+
+		return commands.executeCommand('vscode.diff', toGitUri(uri, lhs), rhs === '' ? uri : toGitUri(uri, rhs), title);
+	}
+
 	private createCommand(id: string, key: string, method: Function, options: CommandOptions): (...args: any[]) => any {
 		const result = (...args: any[]) => {
 			let result: Promise<any>;

extensions/git/src/git.ts

@@ -12,10 +12,10 @@ import { EventEmitter } from 'events';
 import iconv = require('iconv-lite');
 import * as filetype from 'file-type';
 import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter } from './util';
-import { CancellationToken, Progress } from 'vscode';
+import { CancellationToken, Progress, Uri } from 'vscode';
 import { URI } from 'vscode-uri';
 import { detectEncoding } from './encoding';
-import { Ref, RefType, Branch, Remote, GitErrorCodes, LogOptions, Change, Status } from './api/git';
+import { Ref, RefType, Branch, Remote, GitErrorCodes, LogOptions, Change, Status, CommitOptions } from './api/git';
 import * as byline from 'byline';
 import { StringDecoder } from 'string_decoder';
 
@@ -45,6 +45,15 @@ interface MutableRemote extends Remote {
 	isReadOnly: boolean;
 }
 
+// TODO[ECA]: Move to git.d.ts once we are good with the api
+/**
+ * Log file options.
+ */
+export interface LogFileOptions {
+	/** Max number of log entries to retrieve. If not specified, the default is 32. */
+	readonly maxEntries?: number;
+}
+
 function parseVersion(raw: string): string {
 	return raw.replace(/^git version /, '');
 }
@@ -318,7 +327,13 @@ function getGitErrorCode(stderr: string): string | undefined {
 	return undefined;
 }
 
-const COMMIT_FORMAT = '%H\n%ae\n%P\n%B';
+// https://github.com/microsoft/vscode/issues/89373
+// https://github.com/git-for-windows/git/issues/2478
+function sanitizePath(path: string): string {
+	return path.replace(/^([a-z]):\\/i, (_, letter) => `${letter.toUpperCase()}:\\`);
+}
+
+const COMMIT_FORMAT = '%H\n%aN\n%aE\n%at\n%P\n%B';
 
 export class Git {
 
@@ -487,6 +502,10 @@ export class Git {
 			LANG: 'en_US.UTF-8'
 		});
 
+		if (options.cwd) {
+			options.cwd = sanitizePath(options.cwd);
+		}
+
 		if (options.log !== false) {
 			this.log(`> git ${args.join(' ')}\n`);
 		}
@@ -503,7 +522,9 @@ export interface Commit {
 	hash: string;
 	message: string;
 	parents: string[];
-	authorEmail?: string | undefined;
+	authorDate?: Date;
+	authorName?: string;
+	authorEmail?: string;
 }
 
 export class GitStatusParser {
@@ -634,14 +655,43 @@ export function parseGitmodules(raw: string): Submodule[] {
 	return result;
 }
 
-export function parseGitCommit(raw: string): Commit | null {
-	const match = /^([0-9a-f]{40})\n(.*)\n(.*)(\n([^]*))?$/m.exec(raw.trim());
-	if (!match) {
-		return null;
-	}
+const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)/gm;
 
-	const parents = match[3] ? match[3].split(' ') : [];
-	return { hash: match[1], message: match[5], parents, authorEmail: match[2] };
+export function parseGitCommits(data: string): Commit[] {
+	let commits: Commit[] = [];
+
+	let ref;
+	let name;
+	let email;
+	let date;
+	let parents;
+	let message;
+	let match;
+
+	do {
+		match = commitRegex.exec(data);
+		if (match === null) {
+			break;
+		}
+
+		[, ref, name, email, date, parents, message] = match;
+
+		if (message[message.length - 1] === '\n') {
+			message = message.substr(0, message.length - 1);
+		}
+
+		// Stop excessive memory usage by using substr -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+		commits.push({
+			hash: ` ${ref}`.substr(1),
+			message: ` ${message}`.substr(1),
+			parents: parents ? parents.split(' ') : [],
+			authorDate: new Date(Number(date) * 1000),
+			authorName: ` ${name}`.substr(1),
+			authorEmail: ` ${email}`.substr(1)
+		});
+	} while (true);
+
+	return commits;
 }
 
 interface LsTreeElement {
@@ -675,14 +725,6 @@ export function parseLsFiles(raw: string): LsFilesElement[] {
 		.map(([, mode, object, stage, file]) => ({ mode, object, stage, file }));
 }
 
-export interface CommitOptions {
-	all?: boolean | 'tracked';
-	amend?: boolean;
-	signoff?: boolean;
-	signCommit?: boolean;
-	empty?: boolean;
-}
-
 export interface PullOptions {
 	unshallow?: boolean;
 	tags?: boolean;
@@ -760,38 +802,28 @@ export class Repository {
 
 	async log(options?: LogOptions): Promise<Commit[]> {
 		const maxEntries = options && typeof options.maxEntries === 'number' && options.maxEntries > 0 ? options.maxEntries : 32;
-		const args = ['log', '-' + maxEntries, `--pretty=format:${COMMIT_FORMAT}%x00%x00`];
+		const args = ['log', '-' + maxEntries, `--format:${COMMIT_FORMAT}`, '-z'];
 
-		const gitResult = await this.run(args);
-		if (gitResult.exitCode) {
+		const result = await this.run(args);
+		if (result.exitCode) {
 			// An empty repo
 			return [];
 		}
 
-		const s = gitResult.stdout;
-		const result: Commit[] = [];
-		let index = 0;
-		while (index < s.length) {
-			let nextIndex = s.indexOf('\x00\x00', index);
-			if (nextIndex === -1) {
-				nextIndex = s.length;
-			}
+		return parseGitCommits(result.stdout);
+	}
 
-			let entry = s.substr(index, nextIndex - index);
-			if (entry.startsWith('\n')) {
-				entry = entry.substring(1);
-			}
+	async logFile(uri: Uri, options?: LogFileOptions): Promise<Commit[]> {
+		const maxEntries = options?.maxEntries ?? 32;
+		const args = ['log', `-${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--', uri.fsPath];
 
-			const commit = parseGitCommit(entry);
-			if (!commit) {
-				break;
-			}
-
-			result.push(commit);
-			index = nextIndex + 2;
+		const result = await this.run(args);
+		if (result.exitCode) {
+			// No file history, e.g. a new file or untracked
+			return [];
 		}
 
-		return result;
+		return parseGitCommits(result.stdout);
 	}
 
 	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
@@ -857,12 +889,12 @@ export class Repository {
 	}
 
 	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
-		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', path]);
+		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', sanitizePath(path)]);
 		return parseLsTree(stdout);
 	}
 
 	async lsfiles(path: string): Promise<LsFilesElement[]> {
-		const { stdout } = await this.run(['ls-files', '--stage', '--', path]);
+		const { stdout } = await this.run(['ls-files', '--stage', '--', sanitizePath(path)]);
 		return parseLsFiles(stdout);
 	}
 
@@ -956,7 +988,7 @@ export class Repository {
 			return await this.diffFiles(false);
 		}
 
-		const args = ['diff', '--', path];
+		const args = ['diff', '--', sanitizePath(path)];
 		const result = await this.run(args);
 		return result.stdout;
 	}
@@ -969,7 +1001,7 @@ export class Repository {
 			return await this.diffFiles(false, ref);
 		}
 
-		const args = ['diff', ref, '--', path];
+		const args = ['diff', ref, '--', sanitizePath(path)];
 		const result = await this.run(args);
 		return result.stdout;
 	}
@@ -982,7 +1014,7 @@ export class Repository {
 			return await this.diffFiles(true);
 		}
 
-		const args = ['diff', '--cached', '--', path];
+		const args = ['diff', '--cached', '--', sanitizePath(path)];
 		const result = await this.run(args);
 		return result.stdout;
 	}
@@ -995,7 +1027,7 @@ export class Repository {
 			return await this.diffFiles(true, ref);
 		}
 
-		const args = ['diff', '--cached', ref, '--', path];
+		const args = ['diff', '--cached', ref, '--', sanitizePath(path)];
 		const result = await this.run(args);
 		return result.stdout;
 	}
@@ -1015,7 +1047,7 @@ export class Repository {
 			return await this.diffFiles(false, range);
 		}
 
-		const args = ['diff', range, '--', path];
+		const args = ['diff', range, '--', sanitizePath(path)];
 		const result = await this.run(args);
 
 		return result.stdout.trim();
@@ -1128,7 +1160,7 @@ export class Repository {
 		args.push('--');
 
 		if (paths && paths.length) {
-			args.push.apply(args, paths);
+			args.push.apply(args, paths.map(sanitizePath));
 		} else {
 			args.push('.');
 		}
@@ -1143,13 +1175,13 @@ export class Repository {
 			return;
 		}
 
-		args.push(...paths);
+		args.push(...paths.map(sanitizePath));
 
 		await this.run(args);
 	}
 
 	async stage(path: string, data: string): Promise<void> {
-		const child = this.stream(['hash-object', '--stdin', '-w', '--path', path], { stdio: [null, null, null] });
+		const child = this.stream(['hash-object', '--stdin', '-w', '--path', sanitizePath(path)], { stdio: [null, null, null] });
 		child.stdin!.end(data, 'utf8');
 
 		const { exitCode, stdout } = await exec(child);
@@ -1194,7 +1226,7 @@ export class Repository {
 
 		try {
 			if (paths && paths.length > 0) {
-				for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
+				for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
 					await this.run([...args, '--', ...chunk]);
 				}
 			} else {
@@ -1333,7 +1365,7 @@ export class Repository {
 	}
 
 	async clean(paths: string[]): Promise<void> {
-		const pathsByGroup = groupBy(paths, p => path.dirname(p));
+		const pathsByGroup = groupBy(paths.map(sanitizePath), p => path.dirname(p));
 		const groups = Object.keys(pathsByGroup).map(k => pathsByGroup[k]);
 
 		const limiter = new Limiter(5);
@@ -1379,7 +1411,7 @@ export class Repository {
 		}
 
 		if (paths && paths.length) {
-			args.push.apply(args, paths);
+			args.push.apply(args, paths.map(sanitizePath));
 		} else {
 			args.push('.');
 		}
@@ -1530,11 +1562,8 @@ export class Repository {
 
 	async blame(path: string): Promise<string> {
 		try {
-			const args = ['blame'];
-			args.push(path);
-
-			let result = await this.run(args);
-
+			const args = ['blame', sanitizePath(path)];
+			const result = await this.run(args);
 			return result.stdout.trim();
 		} catch (err) {
 			if (/^fatal: no such path/.test(err.stderr || '')) {
@@ -1853,14 +1882,18 @@ export class Repository {
 	}
 
 	async getCommit(ref: string): Promise<Commit> {
-		const result = await this.run(['show', '-s', `--format=${COMMIT_FORMAT}`, ref]);
-		return parseGitCommit(result.stdout) || Promise.reject<Commit>('bad commit format');
+		const result = await this.run(['show', '-s', `--format=${COMMIT_FORMAT}`, '-z', ref]);
+		const commits = parseGitCommits(result.stdout);
+		if (commits.length === 0) {
+			return Promise.reject<Commit>('bad commit format');
+		}
+		return commits[0];
 	}
 
 	async updateSubmodules(paths: string[]): Promise<void> {
 		const args = ['submodule', 'update', '--'];
 
-		for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
+		for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
 			await this.run([...args, ...chunk]);
 		}
 	}

extensions/git/src/log.ts

@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event, EventEmitter } from 'vscode';
+
+/**
+ * The severity level of a log message
+ */
+export enum LogLevel {
+	Trace = 1,
+	Debug = 2,
+	Info = 3,
+	Warning = 4,
+	Error = 5,
+	Critical = 6,
+	Off = 7
+}
+
+let _logLevel: LogLevel = LogLevel.Info;
+const _onDidChangeLogLevel = new EventEmitter<LogLevel>();
+
+export const Log = {
+	/**
+	 * Current logging level.
+	 */
+	get logLevel(): LogLevel {
+		return _logLevel;
+	},
+
+	/**
+	 * Current logging level.
+	 */
+	set logLevel(logLevel: LogLevel) {
+		if (_logLevel === logLevel) {
+			return;
+		}
+
+		_logLevel = logLevel;
+		_onDidChangeLogLevel.fire(logLevel);
+	},
+
+	/**
+	 * An [event](#Event) that fires when the log level has changed.
+	 */
+	get onDidChangeLogLevel(): Event<LogLevel> {
+		return _onDidChangeLogLevel.event;
+	}
+};

extensions/git/src/main.ts

@@ -22,6 +22,7 @@ import { GitExtensionImpl } from './api/extension';
 // import * as path from 'path';
 // import * as fs from 'fs';
 import { createIPCServer, IIPCServer } from './ipc/ipcServer';
+import { GitTimelineProvider } from './timelineProvider';
 
 const deactivateTasks: { (): Promise<any>; }[] = [];
 
@@ -82,7 +83,8 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
 		new GitContentProvider(model),
 		new GitFileSystemProvider(model),
 		new GitDecorations(model),
-		new GitProtocolHandler()
+		new GitProtocolHandler(),
+		new GitTimelineProvider(model)
 	);
 
 	await checkGitVersion(info);

extensions/git/src/repository.ts

@@ -5,16 +5,17 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import { CancellationToken, Command, Disposable, env, Event, EventEmitter, LogLevel, Memento, OutputChannel, ProgressLocation, ProgressOptions, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, ThemeColor, Uri, window, workspace, WorkspaceEdit, Decoration } from 'vscode';
+import { CancellationToken, Command, Disposable, Event, EventEmitter, Memento, OutputChannel, ProgressLocation, ProgressOptions, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, ThemeColor, Uri, window, workspace, WorkspaceEdit, Decoration } from 'vscode';
 import * as nls from 'vscode-nls';
-import { Branch, Change, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status } from './api/git';
+import { Branch, Change, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status, CommitOptions } from './api/git';
 import { AutoFetcher } from './autofetch';
 import { debounce, memoize, throttle } from './decorators';
-import { Commit, CommitOptions, ForcePushMode, GitError, Repository as BaseRepository, Stash, Submodule } from './git';
+import { Commit, ForcePushMode, GitError, Repository as BaseRepository, Stash, Submodule, LogFileOptions } from './git';
 import { StatusBarCommands } from './statusbar';
 import { toGitUri } from './uri';
 import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, IDisposable, isDescendant, onceEvent } from './util';
 import { IFileWatcher, watch } from './watch';
+import { Log, LogLevel } from './log';
 
 const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
 
@@ -303,15 +304,22 @@ export const enum Operation {
 	Apply = 'Apply',
 	Blame = 'Blame',
 	Log = 'Log',
+	LogFile = 'LogFile',
 }
 
 function isReadOnly(operation: Operation): boolean {
 	switch (operation) {
-		case Operation.Show:
-		case Operation.GetCommitTemplate:
+		case Operation.Blame:
 		case Operation.CheckIgnore:
+		case Operation.Diff:
+		case Operation.FindTrackingBranches:
+		case Operation.GetBranch:
+		case Operation.GetCommitTemplate:
 		case Operation.GetObjectDetails:
+		case Operation.Log:
+		case Operation.LogFile:
 		case Operation.MergeBase:
+		case Operation.Show:
 			return true;
 		default:
 			return false;
@@ -457,8 +465,8 @@ class FileEventLogger {
 		private onDotGitFileChange: Event<Uri>,
 		private outputChannel: OutputChannel
 	) {
-		this.logLevelDisposable = env.onDidChangeLogLevel(this.onDidChangeLogLevel, this);
-		this.onDidChangeLogLevel(env.logLevel);
+		this.logLevelDisposable = Log.onDidChangeLogLevel(this.onDidChangeLogLevel, this);
+		this.onDidChangeLogLevel(Log.logLevel);
 	}
 
 	private onDidChangeLogLevel(level: LogLevel): void {
@@ -519,7 +527,7 @@ class DotGitWatcher implements IFileWatcher {
 			this.transientDisposables.push(upstreamWatcher);
 			upstreamWatcher.event(this.emitter.fire, this.emitter, this.transientDisposables);
 		} catch (err) {
-			if (env.logLevel <= LogLevel.Error) {
+			if (Log.logLevel <= LogLevel.Error) {
 				this.outputChannel.appendLine(`Failed to watch ref '${upstreamPath}', is most likely packed.\n${err.stack || err}`);
 			}
 		}
@@ -682,7 +690,7 @@ export class Repository implements Disposable {
 			onDotGitFileChange = dotGitFileWatcher.event;
 			this.disposables.push(dotGitFileWatcher);
 		} catch (err) {
-			if (env.logLevel <= LogLevel.Error) {
+			if (Log.logLevel <= LogLevel.Error) {
 				outputChannel.appendLine(`Failed to watch '${this.dotGit}', reverting to legacy API file watched. Some events might be lost.\n${err.stack || err}`);
 			}
 
@@ -867,6 +875,11 @@ export class Repository implements Disposable {
 		return this.run(Operation.Log, () => this.repository.log(options));
 	}
 
+	logFile(uri: Uri, options?: LogFileOptions): Promise<Commit[]> {
+		// TODO: This probably needs per-uri granularity
+		return this.run(Operation.LogFile, () => this.repository.logFile(uri, options));
+	}
+
 	@throttle
 	async status(): Promise<void> {
 		await this.run(Operation.Status);

extensions/git/src/test/git.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'mocha';
-import { GitStatusParser, parseGitCommit, parseGitmodules, parseLsTree, parseLsFiles } from '../git';
+import { GitStatusParser, parseGitCommits, parseGitmodules, parseLsTree, parseLsFiles } from '../git';
 import * as assert from 'assert';
 import { splitInChunks } from '../util';
 
@@ -189,44 +189,56 @@ suite('git', () => {
 	suite('parseGitCommit', () => {
 		test('single parent commit', function () {
 			const GIT_OUTPUT_SINGLE_PARENT = `52c293a05038d865604c2284aa8698bd087915a1
+John Doe
 john.doe@mail.com
+1580811030
 8e5a374372b8393906c7e380dbb09349c5385554
-This is a commit message.`;
+This is a commit message.\x00`;
 
-			assert.deepEqual(parseGitCommit(GIT_OUTPUT_SINGLE_PARENT), {
+			assert.deepEqual(parseGitCommits(GIT_OUTPUT_SINGLE_PARENT), [{
 				hash: '52c293a05038d865604c2284aa8698bd087915a1',
 				message: 'This is a commit message.',
 				parents: ['8e5a374372b8393906c7e380dbb09349c5385554'],
+				authorDate: new Date(1580811030000),
+				authorName: 'John Doe',
 				authorEmail: 'john.doe@mail.com',
-			});
+			}]);
 		});
 
 		test('multiple parent commits', function () {
 			const GIT_OUTPUT_MULTIPLE_PARENTS = `52c293a05038d865604c2284aa8698bd087915a1
+John Doe
 john.doe@mail.com
+1580811030
 8e5a374372b8393906c7e380dbb09349c5385554 df27d8c75b129ab9b178b386077da2822101b217
-This is a commit message.`;
+This is a commit message.\x00`;
 
-			assert.deepEqual(parseGitCommit(GIT_OUTPUT_MULTIPLE_PARENTS), {
+			assert.deepEqual(parseGitCommits(GIT_OUTPUT_MULTIPLE_PARENTS), [{
 				hash: '52c293a05038d865604c2284aa8698bd087915a1',
 				message: 'This is a commit message.',
 				parents: ['8e5a374372b8393906c7e380dbb09349c5385554', 'df27d8c75b129ab9b178b386077da2822101b217'],
+				authorDate: new Date(1580811030000),
+				authorName: 'John Doe',
 				authorEmail: 'john.doe@mail.com',
-			});
+			}]);
 		});
 
 		test('no parent commits', function () {
 			const GIT_OUTPUT_NO_PARENTS = `52c293a05038d865604c2284aa8698bd087915a1
+John Doe
 john.doe@mail.com
+1580811030
 
-This is a commit message.`;
+This is a commit message.\x00`;
 
-			assert.deepEqual(parseGitCommit(GIT_OUTPUT_NO_PARENTS), {
+			assert.deepEqual(parseGitCommits(GIT_OUTPUT_NO_PARENTS), [{
 				hash: '52c293a05038d865604c2284aa8698bd087915a1',
 				message: 'This is a commit message.',
 				parents: [],
+				authorDate: new Date(1580811030000),
+				authorName: 'John Doe',
 				authorEmail: 'john.doe@mail.com',
-			});
+			}]);
 		});
 	});
 

extensions/git/src/test/index.ts

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const testRunner = require('vscode/lib/testrunner');
+
+const suite = 'Integration Git Tests';
+
+const options: any = {
+	ui: 'tdd',
+	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
+	timeout: 60000
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+testRunner.configure(options);
+
+export = testRunner;

extensions/git/src/test/smoke.test.ts

@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'mocha';
+import * as assert from 'assert';
+import { workspace, commands, window, Uri, WorkspaceEdit, Range, TextDocument, extensions } from 'vscode';
+import * as cp from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import { GitExtension, API, Repository, Status } from '../api/git';
+import { eventToPromise } from '../util';
+
+suite('git smoke test', function () {
+	const cwd = fs.realpathSync(workspace.workspaceFolders![0].uri.fsPath);
+
+	function file(relativePath: string) {
+		return path.join(cwd, relativePath);
+	}
+
+	function uri(relativePath: string) {
+		return Uri.file(file(relativePath));
+	}
+
+	async function open(relativePath: string) {
+		const doc = await workspace.openTextDocument(uri(relativePath));
+		await window.showTextDocument(doc);
+		return doc;
+	}
+
+	async function type(doc: TextDocument, text: string) {
+		const edit = new WorkspaceEdit();
+		const end = doc.lineAt(doc.lineCount - 1).range.end;
+		edit.replace(doc.uri, new Range(end, end), text);
+		await workspace.applyEdit(edit);
+	}
+
+	let git: API;
+	let repository: Repository;
+
+	suiteSetup(async function () {
+		fs.writeFileSync(file('app.js'), 'hello', 'utf8');
+		fs.writeFileSync(file('index.pug'), 'hello', 'utf8');
+		cp.execSync('git init', { cwd });
+		cp.execSync('git config user.name testuser', { cwd });
+		cp.execSync('git config user.email monacotools@microsoft.com', { cwd });
+		cp.execSync('git add .', { cwd });
+		cp.execSync('git commit -m "initial commit"', { cwd });
+
+		// make sure git is activated
+		const ext = extensions.getExtension<GitExtension>('vscode.git');
+		await ext?.activate();
+		git = ext!.exports.getAPI(1);
+
+		if (git.repositories.length === 0) {
+			await eventToPromise(git.onDidOpenRepository);
+		}
+
+		assert.equal(git.repositories.length, 1);
+		assert.equal(fs.realpathSync(git.repositories[0].rootUri.fsPath), cwd);
+
+		repository = git.repositories[0];
+	});
+
+	test('reflects working tree changes', async function () {
+		await commands.executeCommand('workbench.view.scm');
+
+		const appjs = await open('app.js');
+		await type(appjs, ' world');
+		await appjs.save();
+		await repository.status();
+		assert.equal(repository.state.workingTreeChanges.length, 1);
+		repository.state.workingTreeChanges.some(r => r.uri.path === appjs.uri.path && r.status === Status.MODIFIED);
+
+		fs.writeFileSync(file('newfile.txt'), '');
+		const newfile = await open('newfile.txt');
+		await type(newfile, 'hey there');
+		await newfile.save();
+		await repository.status();
+		assert.equal(repository.state.workingTreeChanges.length, 2);
+		repository.state.workingTreeChanges.some(r => r.uri.path === appjs.uri.path && r.status === Status.MODIFIED);
+		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.uri.path && r.status === Status.UNTRACKED);
+	});
+
+	test('opens diff editor', async function () {
+		const appjs = uri('app.js');
+		await commands.executeCommand('git.openChange', appjs);
+
+		assert(window.activeTextEditor);
+		assert.equal(window.activeTextEditor!.document.uri.path, appjs.path);
+
+		// TODO: how do we really know this is a diff editor?
+	});
+
+	test('stages correctly', async function () {
+		const appjs = uri('app.js');
+		const newfile = uri('newfile.txt');
+
+		await commands.executeCommand('git.stage', appjs);
+		assert.equal(repository.state.workingTreeChanges.length, 1);
+		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.path && r.status === Status.UNTRACKED);
+		assert.equal(repository.state.indexChanges.length, 1);
+		repository.state.indexChanges.some(r => r.uri.path === appjs.path && r.status === Status.INDEX_MODIFIED);
+
+		await commands.executeCommand('git.unstage', appjs);
+		assert.equal(repository.state.workingTreeChanges.length, 2);
+		repository.state.workingTreeChanges.some(r => r.uri.path === appjs.path && r.status === Status.MODIFIED);
+		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.path && r.status === Status.UNTRACKED);
+	});
+
+	test('stages, commits changes and verifies outgoing change', async function () {
+		const appjs = uri('app.js');
+		const newfile = uri('newfile.txt');
+
+		await commands.executeCommand('git.stage', appjs);
+		await repository.commit('second commit');
+		assert.equal(repository.state.workingTreeChanges.length, 1);
+		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.path && r.status === Status.UNTRACKED);
+		assert.equal(repository.state.indexChanges.length, 0);
+
+		await commands.executeCommand('git.stageAll', appjs);
+		await repository.commit('third commit');
+		assert.equal(repository.state.workingTreeChanges.length, 0);
+		assert.equal(repository.state.indexChanges.length, 0);
+	});
+});

extensions/git/src/timelineProvider.ts

@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dayjs from 'dayjs';
+import * as advancedFormat from 'dayjs/plugin/advancedFormat';
+import * as relativeTime from 'dayjs/plugin/relativeTime';
+import { CancellationToken, Disposable, Event, EventEmitter, ThemeIcon, TimelineItem, TimelineProvider, Uri, workspace, TimelineChangeEvent } from 'vscode';
+import { Model } from './model';
+import { Repository } from './repository';
+import { debounce } from './decorators';
+import { Status } from './api/git';
+
+dayjs.extend(advancedFormat);
+dayjs.extend(relativeTime);
+
+// TODO[ECA]: Localize all the strings
+// TODO[ECA]: Localize or use a setting for date format
+
+export class GitTimelineProvider implements TimelineProvider {
+	private _onDidChange = new EventEmitter<TimelineChangeEvent>();
+	get onDidChange(): Event<TimelineChangeEvent> {
+		return this._onDidChange.event;
+	}
+
+	readonly id = 'git-history';
+	readonly label = 'Git History';
+
+	private _disposable: Disposable;
+
+	private _repo: Repository | undefined;
+	private _repoDisposable: Disposable | undefined;
+	private _repoStatusDate: Date | undefined;
+
+	constructor(private readonly _model: Model) {
+		this._disposable = Disposable.from(
+			_model.onDidOpenRepository(this.onRepositoriesChanged, this),
+			workspace.registerTimelineProvider('*', this),
+		);
+	}
+
+	dispose() {
+		this._disposable.dispose();
+	}
+
+	async provideTimeline(uri: Uri, _token: CancellationToken): Promise<TimelineItem[]> {
+		// console.log(`GitTimelineProvider.provideTimeline: uri=${uri} state=${this._model.state}`);
+
+		const repo = this._model.getRepository(uri);
+		if (!repo) {
+			this._repoDisposable?.dispose();
+			this._repoStatusDate = undefined;
+			this._repo = undefined;
+
+			return [];
+		}
+
+		if (this._repo?.root !== repo.root) {
+			this._repoDisposable?.dispose();
+
+			this._repo = repo;
+			this._repoStatusDate = new Date();
+			this._repoDisposable = Disposable.from(
+				repo.onDidChangeRepository(uri => this.onRepositoryChanged(repo, uri)),
+				repo.onDidRunGitStatus(() => this.onRepositoryStatusChanged(repo))
+			);
+		}
+
+		// TODO[ECA]: Ensure that the uri is a file -- if not we could get the history of the repo?
+
+		const commits = await repo.logFile(uri);
+
+		let dateFormatter: dayjs.Dayjs;
+		const items = commits.map<TimelineItem>(c => {
+			let message = c.message;
+
+			const index = message.indexOf('\n');
+			if (index !== -1) {
+				message = `${message.substring(0, index)} \u2026`;
+			}
+
+			dateFormatter = dayjs(c.authorDate);
+
+			const item = new TimelineItem(message, c.authorDate?.getTime() ?? 0);
+			item.id = c.hash;
+			item.iconPath = new (ThemeIcon as any)('git-commit');
+			item.description = `${dateFormatter.fromNow()}  \u2022  ${c.authorName}`;
+			item.detail = `${c.authorName} (${c.authorEmail}) \u2014 ${c.hash.substr(0, 8)}\n${dateFormatter.fromNow()} (${dateFormatter.format('MMMM Do, YYYY h:mma')})\n\n${c.message}`;
+			item.command = {
+				title: 'Open Diff',
+				command: 'git.openDiff',
+				arguments: [uri, `${c.hash}^`, c.hash]
+			};
+
+			return item;
+		});
+
+		const index = repo.indexGroup.resourceStates.find(r => r.resourceUri.fsPath === uri.fsPath);
+		if (index) {
+			const date = this._repoStatusDate ?? new Date();
+			dateFormatter = dayjs(date);
+
+			let status;
+			switch (index.type) {
+				case Status.INDEX_MODIFIED:
+					status = 'Modified';
+					break;
+				case Status.INDEX_ADDED:
+					status = 'Added';
+					break;
+				case Status.INDEX_DELETED:
+					status = 'Deleted';
+					break;
+				case Status.INDEX_RENAMED:
+					status = 'Renamed';
+					break;
+				case Status.INDEX_COPIED:
+					status = 'Copied';
+					break;
+				default:
+					status = '';
+					break;
+			}
+
+			const item = new TimelineItem('Staged Changes', date.getTime());
+			item.id = 'index';
+			// TODO[ECA]: Replace with a better icon -- reflecting its status maybe?
+			item.iconPath = new (ThemeIcon as any)('git-commit');
+			item.description = `${dateFormatter.fromNow()}  \u2022  You`;
+			item.detail = `You  \u2014 Index\n${dateFormatter.fromNow()} (${dateFormatter.format('MMMM Do, YYYY h:mma')})\n${status}`;
+			item.command = {
+				title: 'Open Comparison',
+				command: 'git.openDiff',
+				arguments: [uri, 'HEAD', '~']
+			};
+
+			items.push(item);
+		}
+
+
+		const working = repo.workingTreeGroup.resourceStates.find(r => r.resourceUri.fsPath === uri.fsPath);
+		if (working) {
+			const date = new Date();
+			dateFormatter = dayjs(date);
+
+			let status;
+			switch (working.type) {
+				case Status.INDEX_MODIFIED:
+					status = 'Modified';
+					break;
+				case Status.INDEX_ADDED:
+					status = 'Added';
+					break;
+				case Status.INDEX_DELETED:
+					status = 'Deleted';
+					break;
+				case Status.INDEX_RENAMED:
+					status = 'Renamed';
+					break;
+				case Status.INDEX_COPIED:
+					status = 'Copied';
+					break;
+				default:
+					status = '';
+					break;
+			}
+
+			const item = new TimelineItem('Uncommited Changes', date.getTime());
+			item.id = 'working';
+			// TODO[ECA]: Replace with a better icon -- reflecting its status maybe?
+			item.iconPath = new (ThemeIcon as any)('git-commit');
+			item.description = `${dateFormatter.fromNow()}  \u2022  You`;
+			item.detail = `You  \u2014 Working Tree\n${dateFormatter.fromNow()} (${dateFormatter.format('MMMM Do, YYYY h:mma')})\n${status}`;
+			item.command = {
+				title: 'Open Comparison',
+				command: 'git.openDiff',
+				arguments: [uri, index ? '~' : 'HEAD', '']
+			};
+
+			items.push(item);
+		}
+
+		return items;
+	}
+
+	private onRepositoriesChanged(_repo: Repository) {
+		// console.log(`GitTimelineProvider.onRepositoriesChanged`);
+
+		// TODO[ECA]: Being naive for now and just always refreshing each time there is a new repository
+		this.fireChanged();
+	}
+
+	private onRepositoryChanged(_repo: Repository, _uri: Uri) {
+		// console.log(`GitTimelineProvider.onRepositoryChanged: uri=${uri.toString(true)}`);
+
+		this.fireChanged();
+	}
+
+	private onRepositoryStatusChanged(_repo: Repository) {
+		// console.log(`GitTimelineProvider.onRepositoryStatusChanged`);
+
+		// This is crappy, but for now just save the last time a status was run and use that as the timestamp for staged items
+		this._repoStatusDate = new Date();
+
+		this.fireChanged();
+	}
+
+	@debounce(500)
+	private fireChanged() {
+		this._onDidChange.fire();
+	}
+}

extensions/git/src/typings/refs.d.ts

@@ -4,4 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
+/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
+/// <reference path="../../../types/lib.textEncoder.d.ts" />

extensions/git/src/util.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vscode';
+import { Event, Disposable } from 'vscode';
 import { dirname, sep } from 'path';
 import { Readable } from 'stream';
 import { promises as fs, createReadStream } from 'fs';
@@ -33,15 +33,15 @@ export function combinedDisposable(disposables: IDisposable[]): IDisposable {
 export const EmptyDisposable = toDisposable(() => null);
 
 export function fireEvent<T>(event: Event<T>): Event<T> {
-	return (listener, thisArgs = null, disposables?) => event(_ => (listener as any).call(thisArgs), null, disposables);
+	return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => event(_ => (listener as any).call(thisArgs), null, disposables);
 }
 
 export function mapEvent<I, O>(event: Event<I>, map: (i: I) => O): Event<O> {
-	return (listener, thisArgs = null, disposables?) => event(i => listener.call(thisArgs, map(i)), null, disposables);
+	return (listener: (e: O) => any, thisArgs?: any, disposables?: Disposable[]) => event(i => listener.call(thisArgs, map(i)), null, disposables);
 }
 
 export function filterEvent<T>(event: Event<T>, filter: (e: T) => boolean): Event<T> {
-	return (listener, thisArgs = null, disposables?) => event(e => filter(e) && listener.call(thisArgs, e), null, disposables);
+	return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => event(e => filter(e) && listener.call(thisArgs, e), null, disposables);
 }
 
 export function latchEvent<T>(event: Event<T>): Event<T> {
@@ -57,7 +57,7 @@ export function latchEvent<T>(event: Event<T>): Event<T> {
 }
 
 export function anyEvent<T>(...events: Event<T>[]): Event<T> {
-	return (listener, thisArgs = null, disposables?) => {
+	return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => {
 		const result = combinedDisposable(events.map(event => event(i => listener.call(thisArgs, i))));
 
 		if (disposables) {
@@ -73,7 +73,7 @@ export function done<T>(promise: Promise<T>): Promise<void> {
 }
 
 export function onceEvent<T>(event: Event<T>): Event<T> {
-	return (listener, thisArgs = null, disposables?) => {
+	return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => {
 		const result = event(e => {
 			result.dispose();
 			return listener.call(thisArgs, e);
@@ -84,7 +84,7 @@ export function onceEvent<T>(event: Event<T>): Event<T> {
 }
 
 export function debounceEvent<T>(event: Event<T>, delay: number): Event<T> {
-	return (listener, thisArgs = null, disposables?) => {
+	return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => {
 		let timer: NodeJS.Timer;
 		return event(e => {
 			clearTimeout(timer);

extensions/git/yarn.lock

@@ -36,6 +36,28 @@
   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
   integrity sha1-AW44dim4gXvtZT/jLqtdESecjfY=
 
+agent-base@4, agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+ajv@^6.5.5:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
+  integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
 applicationinsights@1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
@@ -45,11 +67,45 @@ applicationinsights@1.0.8:
     diagnostic-channel-publishers "0.2.1"
     zone.js "0.7.6"
 
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
 brace-expansion@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
@@ -63,11 +119,43 @@ browser-stdout@1.3.0:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
   integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8=
 
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
   integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
 
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
+
 commander@2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
@@ -80,6 +168,28 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+dayjs@1.8.19:
+  version "1.8.19"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.19.tgz#5117dc390d8f8e586d53891dbff3fa308f51abfe"
+  integrity sha512-7kqOoj3oQSmqbvtvGFLU5iYqies+SqUiEGNT0UtUPPxcPYgY1BrkXR0Cq2R9HYSimBXN+xHkEN4Hi399W+Ovlg==
+
 debug@2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
@@ -87,6 +197,32 @@ debug@2.6.8:
   dependencies:
     ms "2.0.0"
 
+debug@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
 diagnostic-channel-publishers@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
@@ -104,21 +240,92 @@ diff@3.2.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
   integrity sha1-yc45Okt8vQsFinJck98pkCeGj/k=
 
+diff@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+es6-promise@^4.0.3:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
+  dependencies:
+    es6-promise "^4.0.3"
+
 escape-string-regexp@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
 file-type@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-7.2.0.tgz#113cfed52e1d6959ab80248906e2f25a8cdccb74"
   integrity sha1-ETz+1S4daVmrgCSJBuLyWozcy3Q=
 
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
 glob@7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
@@ -131,26 +338,98 @@ glob@7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.2:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+
 growl@1.9.2:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
   integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.0:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  dependencies:
+    ajv "^6.5.5"
+    har-schema "^2.0.0"
+
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
   integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
 he@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
   integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
 
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-proxy-agent@^2.2.1:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+  dependencies:
+    agent-base "^4.3.0"
+    debug "^3.1.0"
+
 iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -171,21 +450,66 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
+is-buffer@~1.1.1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
 jschardet@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.1.1.tgz#af6f8fd0b3b0f5d46a8fd9614a4fce490575c184"
   integrity sha512-pA5qG9Zwm8CBpGlK/lo2GE9jPxwqRgMV7Lzc/1iaPccw6v4Rhj8Zg2BTyrdmHmxlJojnbLupLeRnaPLsq03x6Q==
 
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
 json3@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
   integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -242,7 +566,33 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-minimatch@^3.0.2:
+lodash@^4.16.4:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
+md5@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
+mime-db@1.43.0:
+  version "1.43.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
+  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
+
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.26"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
+  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
+  dependencies:
+    mime-db "1.43.0"
+
+minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -254,13 +604,32 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-mkdirp@0.5.1:
+mkdirp@0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
+mocha-junit-reporter@^1.23.3:
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz#941e219dd759ed732f8641e165918aa8b167c981"
+  integrity sha512-ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==
+  dependencies:
+    debug "^2.2.0"
+    md5 "^2.1.0"
+    mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
+    xml "^1.0.0"
+
+mocha-multi-reporters@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
+  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.16.4"
+
 mocha@^3.2.0:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
@@ -279,11 +648,38 @@ mocha@^3.2.0:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
+mocha@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
+  integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
+  dependencies:
+    browser-stdout "1.3.1"
+    commander "2.15.1"
+    debug "3.1.0"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    glob "7.1.2"
+    growl "1.10.5"
+    he "1.1.1"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    supports-color "5.4.0"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
+ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -296,7 +692,73 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-"safer-buffer@>= 2.1.2 < 3":
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+psl@^1.1.24:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
+  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+querystringify@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
+
+request@^2.88.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -306,6 +768,46 @@ semver@^5.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
+semver@^5.4.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+source-map-support@^0.5.0:
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
 supports-color@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
@@ -313,6 +815,62 @@ supports-color@3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
+  dependencies:
+    has-flag "^3.0.0"
+
+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  dependencies:
+    punycode "^2.1.0"
+
+url-parse@^1.4.4:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
+  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 vscode-extension-telemetry@0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.1.1.tgz#91387e06b33400c57abd48979b0e790415ae110b"
@@ -325,11 +883,32 @@ vscode-nls@^4.0.0:
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
   integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
 
+vscode-test@^0.4.1:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-0.4.3.tgz#461ebf25fc4bc93d77d982aed556658a2e2b90b8"
+  integrity sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==
+  dependencies:
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+
 vscode-uri@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.0.tgz#2df704222f72b8a71ff266ba0830ed6c51ac1542"
   integrity sha512-lWXWofDSYD8r/TIyu64MdwB4FaSirQ608PP/TzUyslyOeHGwQ0eTHUZeJrK1ILOmwUHaJtV693m2JoUYroUDpw==
 
+vscode@^1.1.36:
+  version "1.1.36"
+  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.36.tgz#5e1a0d1bf4977d0c7bc5159a9a13d5b104d4b1b6"
+  integrity sha512-cGFh9jmGLcTapCpPCKvn8aG/j9zVQ+0x5hzYJq5h5YyUXVGa1iamOaB2M2PZXoumQPES4qeAP1FwkI0b6tL4bQ==
+  dependencies:
+    glob "^7.1.2"
+    mocha "^5.2.0"
+    request "^2.88.0"
+    semver "^5.4.1"
+    source-map-support "^0.5.0"
+    url-parse "^1.4.4"
+    vscode-test "^0.4.1"
+
 which@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
@@ -342,6 +921,11 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+xml@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
+
 zone.js@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"

extensions/json-language-features/server/src/jsonServerMain.ts

@@ -329,7 +329,7 @@ documents.onDidClose(event => {
 });
 
 const pendingValidationRequests: { [uri: string]: NodeJS.Timer; } = {};
-const validationDelayMs = 500;
+const validationDelayMs = 300;
 
 function cleanPendingValidation(textDocument: TextDocument): void {
 	const request = pendingValidationRequests[textDocument.uri];
@@ -363,12 +363,12 @@ function validateTextDocument(textDocument: TextDocument, callback?: (diagnostic
 
 	const documentSettings: DocumentLanguageSettings = textDocument.languageId === 'jsonc' ? { comments: 'ignore', trailingCommas: 'warning' } : { comments: 'error', trailingCommas: 'error' };
 	languageService.doValidation(textDocument, jsonDocument, documentSettings).then(diagnostics => {
-		setTimeout(() => {
+		setImmediate(() => {
 			const currDocument = documents.get(textDocument.uri);
 			if (currDocument && currDocument.version === version) {
 				respond(diagnostics); // Send the computed diagnostics to VSCode.
 			}
-		}, 100);
+		});
 	}, error => {
 		connection.console.error(formatError(`Error while validating ${textDocument.uri}`, error));
 	});

extensions/markdown-language-features/preview-src/tsconfig.json

@@ -2,6 +2,11 @@
 	"extends": "../../shared.tsconfig.json",
 	"compilerOptions": {
 		"outDir": "./dist/",
-		"jsx": "react"
+		"jsx": "react",
+		"lib": [
+			"es2018",
+			"DOM",
+			"DOM.Iterable"
+		]
 	}
 }

extensions/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "3.7.5"
+    "typescript": "^3.8.1-rc"
   },
   "scripts": {
     "postinstall": "node ./postinstall"

extensions/r/cgmanifest.json

@@ -6,11 +6,11 @@
 				"git": {
 					"name": "Ikuyadeu/vscode-R",
 					"repositoryUrl": "https://github.com/Ikuyadeu/vscode-R",
-					"commitHash": "1cd3d42a6b2e54276ef2d71fe33bb3fefb1d6cff"
+					"commitHash": "bc79e9245682ee09b4f0b742b927a37702d91b82"
 				}
 			},
 			"license": "MIT",
-			"version": "0.5.5"
+			"version": "1.1.8"
 		}
 	],
 	"version": 1

extensions/r/syntaxes/r.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/Ikuyadeu/vscode-R/commit/1cd3d42a6b2e54276ef2d71fe33bb3fefb1d6cff",
+	"version": "https://github.com/Ikuyadeu/vscode-R/commit/bc79e9245682ee09b4f0b742b927a37702d91b82",
 	"name": "R",
 	"scopeName": "source.r",
 	"patterns": [
@@ -417,7 +417,7 @@
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.definition.parameters.r"
+					"name": "punctuation.section.parens.end.r"
 				}
 			},
 			"name": "meta.function-call.r",

extensions/r/test/colorize-results/test_r.json

@@ -639,7 +639,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.r meta.function-call.r punctuation.definition.parameters.r",
+		"t": "source.r meta.function-call.r punctuation.section.parens.end.r",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -716,7 +716,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.r meta.function-call.r punctuation.definition.parameters.r",
+		"t": "source.r meta.function-call.r punctuation.section.parens.end.r",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1044,4 +1044,4 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	}
-]
+]

extensions/search-result/src/extension.ts

@@ -77,9 +77,7 @@ export function activate(context: vscode.ExtensionContext) {
 				const lineResult = parseSearchResults(document, token)[position.line];
 				if (!lineResult) { return []; }
 				if (lineResult.type === 'file') {
-					// TODO: The multi-match peek UX isnt very smooth.
-					// return lineResult.allLocations.length > 1 ? lineResult.allLocations : [lineResult.location];
-					return [];
+					return lineResult.allLocations;
 				}
 
 				const translateRangeSidewaysBy = (r: vscode.Range, n: number) =>

extensions/search-result/syntaxes/generateTMLanguage.js

@@ -115,7 +115,7 @@ mappings.forEach(([ext, scope, regexp]) =>
 			{
 				name: [scopes.resultBlock.result.meta, scopes.resultBlock.result.metaMultiLine].join(' '),
 				begin: "^  ((\\d+) )",
-				while: "^  ((\\d+)(:))|((\\d+) )",
+				while: "^  (?:((\\d+)(:))|((\\d+) ))",
 				beginCaptures: {
 					"0": { name: scopes.resultBlock.result.prefix.meta },
 					"1": { name: scopes.resultBlock.result.prefix.metaContext },
@@ -215,7 +215,7 @@ const plainText = [
 		}
 	},
 	{
-		match: "^  ((\\d+)(:))|((\\d+)( ))(.*)",
+		match: "^  (?:((\\d+)(:))|((\\d+)( ))(.*))",
 		name: [scopes.resultBlock.meta, scopes.resultBlock.result.meta].join(' '),
 		captures: {
 			"1": { name: [scopes.resultBlock.result.prefix.meta, scopes.resultBlock.result.prefix.metaMatch].join(' ') },

extensions/search-result/syntaxes/searchResult.tmLanguage.json

@@ -253,7 +253,7 @@
       }
     },
     {
-      "match": "^  ((\\d+)(:))|((\\d+)( ))(.*)",
+      "match": "^  (?:((\\d+)(:))|((\\d+)( ))(.*))",
       "name": "meta.resultBlock.search meta.resultLine.search",
       "captures": {
         "1": {
@@ -297,7 +297,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -383,7 +383,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -469,7 +469,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -555,7 +555,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -641,7 +641,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -727,7 +727,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -813,7 +813,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -899,7 +899,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -985,7 +985,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1071,7 +1071,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1157,7 +1157,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1243,7 +1243,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1329,7 +1329,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1415,7 +1415,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1501,7 +1501,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1587,7 +1587,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1673,7 +1673,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1759,7 +1759,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1845,7 +1845,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -1931,7 +1931,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2017,7 +2017,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2103,7 +2103,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2189,7 +2189,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2275,7 +2275,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2361,7 +2361,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2447,7 +2447,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2533,7 +2533,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2619,7 +2619,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2705,7 +2705,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2791,7 +2791,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2877,7 +2877,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -2963,7 +2963,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3049,7 +3049,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3135,7 +3135,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3221,7 +3221,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3307,7 +3307,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3393,7 +3393,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3479,7 +3479,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3565,7 +3565,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3651,7 +3651,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3737,7 +3737,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3823,7 +3823,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3909,7 +3909,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -3995,7 +3995,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -4081,7 +4081,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -4167,7 +4167,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -4253,7 +4253,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -4339,7 +4339,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -4425,7 +4425,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -4511,7 +4511,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -4597,7 +4597,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -4683,7 +4683,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"
@@ -4769,7 +4769,7 @@
         {
           "name": "meta.resultLine.search meta.resultLine.multiLine.search",
           "begin": "^  ((\\d+) )",
-          "while": "^  ((\\d+)(:))|((\\d+) )",
+          "while": "^  (?:((\\d+)(:))|((\\d+) ))",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.integer meta.resultLinePrefix.search"

extensions/shared.tsconfig.json

@@ -1,6 +1,9 @@
 {
 	"compilerOptions": {
 		"target": "es2018",
+		"lib": [
+			"es2018"
+		],
 		"module": "commonjs",
 		"strict": true,
 		"alwaysStrict": true,

extensions/theme-defaults/themes/light_defaults.json

@@ -13,9 +13,10 @@
 		"sideBarTitle.foreground": "#6F6F6F",
 		"list.hoverBackground": "#E8E8E8",
 		"input.placeholderForeground": "#767676",
+		"searchEditor.textInputBorder": "#CECECE",
 		"settings.textInputBorder": "#CECECE",
 		"settings.numberInputBorder": "#CECECE",
 		"statusBarItem.remoteForeground": "#FFF",
 		"statusBarItem.remoteBackground": "#16825D"
 	}
-}
+}

extensions/theme-seti/cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "seti-ui",
 					"repositoryUrl": "https://github.com/jesseweed/seti-ui",
-					"commitHash": "85a222708824c6f19bbecbec71633d2c97077dad"
+					"commitHash": "4b3e0a3d0ca8999430bc3aa9f2c8324e6922b3de"
 				}
 			},
 			"version": "0.1.0"

extensions/types/lib.textEncoder.d.ts

@@ -0,0 +1,11 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Define TextEncoder + TextDecoder globals for both browser and node runtimes
+//
+// Proper fix: https://github.com/microsoft/TypeScript/issues/31535
+
+declare var TextDecoder: typeof import('util').TextDecoder;
+declare var TextEncoder: typeof import('util').TextEncoder;

extensions/types/lib.url.d.ts

@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Define Url global for both browser and node runtimes
+//
+// Copied from https://github.com/DefinitelyTyped/DefinitelyTyped/issues/34960
+
+declare const URL: typeof import('url').URL;

extensions/vscode-account/package.json

@@ -17,14 +17,13 @@
 	"main": "./out/extension.js",
 	"scripts": {
 		"vscode:prepublish": "npm run compile",
-		"compile": "tsc -p ./",
-		"watch": "tsc -watch -p ./"
+		"compile": "gulp compile-extension:vscode-account",
+		"watch": "gulp watch-extension:vscode-account"
 	},
 	"devDependencies": {
 		"typescript": "^3.7.4",
 		"tslint": "^5.12.1",
 		"@types/node": "^10.12.21",
-		"@types/keytar": "^4.0.1",
-		"@types/vscode": "^1.41.0"
+		"@types/keytar": "^4.0.1"
 	}
 }

extensions/vscode-account/src/AADHelper.ts

@@ -18,11 +18,12 @@ const clientId = 'aebc6443-996d-45c2-90f0-388ff96faa56';
 const tenant = 'organizations';
 
 interface IToken {
-	expiresIn: string; // How long access token is valid, in seconds
-	accessToken: string;
+	accessToken?: string; // When unable to refresh due to network problems, the access token becomes undefined
+
+	expiresIn?: string; // How long access token is valid, in seconds
 	refreshToken: string;
 
-	displayName: string;
+	accountName: string;
 	scope: string;
 	sessionId: string; // The account id + the scope
 }
@@ -33,6 +34,7 @@ interface ITokenClaims {
 	unique_name?: string;
 	oid?: string;
 	altsecid?: string;
+	ipd?: string;
 	scp: string;
 }
 
@@ -40,13 +42,36 @@ interface IStoredSession {
 	id: string;
 	refreshToken: string;
 	scope: string; // Scopes are alphabetized and joined with a space
+	accountName: string;
+}
+
+function parseQuery(uri: vscode.Uri) {
+	return uri.query.split('&').reduce((prev: any, current) => {
+		const queryString = current.split('=');
+		prev[queryString[0]] = queryString[1];
+		return prev;
+	}, {});
 }
 
 export const onDidChangeSessions = new vscode.EventEmitter<void>();
 
+export const REFRESH_NETWORK_FAILURE = 'Network failure';
+
+class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
+	public handleUri(uri: vscode.Uri) {
+		this.fire(uri);
+	}
+}
+
 export class AzureActiveDirectoryService {
 	private _tokens: IToken[] = [];
 	private _refreshTimeouts: Map<string, NodeJS.Timeout> = new Map<string, NodeJS.Timeout>();
+	private _uriHandler: UriEventHandler;
+
+	constructor() {
+		this._uriHandler = new UriEventHandler();
+		vscode.window.registerUriHandler(this._uriHandler);
+	}
 
 	public async initialize(): Promise<void> {
 		const storedData = await keychain.getToken();
@@ -57,7 +82,21 @@ export class AzureActiveDirectoryService {
 					try {
 						await this.refreshToken(session.refreshToken, session.scope);
 					} catch (e) {
-						await this.logout(session.id);
+						if (e.message === REFRESH_NETWORK_FAILURE) {
+							const didSucceedOnRetry = await this.handleRefreshNetworkError(session.id, session.refreshToken, session.scope);
+							if (!didSucceedOnRetry) {
+								this._tokens.push({
+									accessToken: undefined,
+									refreshToken: session.refreshToken,
+									accountName: session.accountName,
+									scope: session.scope,
+									sessionId: session.id
+								});
+								this.pollForReconnect(session.id, session.refreshToken, session.scope);
+							}
+						} else {
+							await this.logout(session.id);
+						}
 					}
 				});
 
@@ -79,7 +118,8 @@ export class AzureActiveDirectoryService {
 			return {
 				id: token.sessionId,
 				refreshToken: token.refreshToken,
-				scope: token.scope
+				scope: token.scope,
+				accountName: token.accountName
 			};
 		});
 
@@ -100,7 +140,11 @@ export class AzureActiveDirectoryService {
 								await this.refreshToken(session.refreshToken, session.scope);
 								didChange = true;
 							} catch (e) {
-								await this.logout(session.id);
+								if (e.message === REFRESH_NETWORK_FAILURE) {
+									// Ignore, will automatically retry on next poll.
+								} else {
+									await this.logout(session.id);
+								}
 							}
 						}
 					});
@@ -136,11 +180,11 @@ export class AzureActiveDirectoryService {
 		}, 1000 * 30);
 	}
 
-	private convertToSession(token: IToken): vscode.Session {
+	private convertToSession(token: IToken): vscode.AuthenticationSession {
 		return {
 			id: token.sessionId,
-			accessToken: token.accessToken,
-			displayName: token.displayName,
+			accessToken: () => !token.accessToken ? Promise.reject('Unavailable due to network problems') : Promise.resolve(token.accessToken),
+			accountName: token.accountName,
 			scopes: token.scope.split(' ')
 		};
 	}
@@ -154,12 +198,18 @@ export class AzureActiveDirectoryService {
 		}
 	}
 
-	get sessions(): vscode.Session[] {
+	get sessions(): vscode.AuthenticationSession[] {
 		return this._tokens.map(token => this.convertToSession(token));
 	}
 
 	public async login(scope: string): Promise<void> {
 		Logger.info('Logging in...');
+
+		if (vscode.env.uiKind === vscode.UIKind.Web) {
+			await this.loginWithoutLocalServer(scope);
+			return;
+		}
+
 		const nonce = crypto.randomBytes(16).toString('base64');
 		const { server, redirectPromise, codePromise } = createServer(nonce);
 
@@ -206,6 +256,13 @@ export class AzureActiveDirectoryService {
 				res.writeHead(302, { Location: `/?error=${encodeURIComponent(err && err.message || 'Unknown error')}` });
 				res.end();
 			}
+		} catch (e) {
+			Logger.error(e.message);
+
+			// If the error was about starting the server, try directly hitting the login endpoint instead
+			if (e.message === 'Error listening to server' || e.message === 'Closed' || e.message === 'Timeout waiting for port') {
+				await this.loginWithoutLocalServer(scope);
+			}
 		} finally {
 			setTimeout(() => {
 				server.close();
@@ -213,28 +270,101 @@ export class AzureActiveDirectoryService {
 		}
 	}
 
+	private getCallbackEnvironment(callbackUri: vscode.Uri): string {
+		switch (callbackUri.authority) {
+			case 'online.visualstudio.com,':
+				return 'vso';
+			case 'online-ppe.core.vsengsaas.visualstudio.com':
+				return 'vsoppe,';
+			case 'online.dev.core.vsengsaas.visualstudio.com':
+				return 'vsodev,';
+			default:
+				return '';
+		}
+	}
+
+	private async loginWithoutLocalServer(scope: string): Promise<IToken> {
+		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.vscode-account`));
+		const nonce = crypto.randomBytes(16).toString('base64');
+		const port = (callbackUri.authority.match(/:([0-9]*)$/) || [])[1] || (callbackUri.scheme === 'https' ? 443 : 80);
+		const callbackEnvironment = this.getCallbackEnvironment(callbackUri);
+		const state = `${callbackEnvironment}${port},${encodeURIComponent(nonce)},${encodeURIComponent(callbackUri.query)}`;
+		const signInUrl = `${loginEndpointUrl}${tenant}/oauth2/v2.0/authorize`;
+		let uri = vscode.Uri.parse(signInUrl);
+		const codeVerifier = toBase64UrlEncoding(crypto.randomBytes(32).toString('base64'));
+		const codeChallenge = toBase64UrlEncoding(crypto.createHash('sha256').update(codeVerifier).digest('base64'));
+		uri = uri.with({
+			query: `response_type=code&client_id=${encodeURIComponent(clientId)}&response_mode=query&redirect_uri=${redirectUrl}&state=${state}&scope=${scope}&prompt=select_account&code_challenge_method=S256&code_challenge=${codeChallenge}`
+		});
+		vscode.env.openExternal(uri);
+
+		const timeoutPromise = new Promise((_: (value: IToken) => void, reject) => {
+			const wait = setTimeout(() => {
+				clearTimeout(wait);
+				reject('Login timed out.');
+			}, 1000 * 60 * 5);
+		});
+
+		return Promise.race([this.handleCodeResponse(state, codeVerifier, scope), timeoutPromise]);
+	}
+
+	private async handleCodeResponse(state: string, codeVerifier: string, scope: string) {
+		let uriEventListener: vscode.Disposable;
+		return new Promise((resolve: (value: IToken) => void, reject) => {
+			uriEventListener = this._uriHandler.event(async (uri: vscode.Uri) => {
+				try {
+					const query = parseQuery(uri);
+					const code = query.code;
+
+					if (query.state !== state) {
+						throw new Error('State does not match.');
+					}
+
+					const token = await this.exchangeCodeForToken(code, codeVerifier, scope);
+					this.setToken(token, scope);
+
+					resolve(token);
+				} catch (err) {
+					reject(err);
+				}
+			});
+		}).then(result => {
+			uriEventListener.dispose();
+			return result;
+		}).catch(err => {
+			uriEventListener.dispose();
+			throw err;
+		});
+	}
+
 	private async setToken(token: IToken, scope: string): Promise<void> {
-		const existingToken = this._tokens.findIndex(t => t.sessionId === token.sessionId);
-		if (existingToken) {
-			this._tokens.splice(existingToken, 1, token);
+		const existingTokenIndex = this._tokens.findIndex(t => t.sessionId === token.sessionId);
+		if (existingTokenIndex > -1) {
+			this._tokens.splice(existingTokenIndex, 1, token);
 		} else {
 			this._tokens.push(token);
 		}
 
-		const existingTimeout = this._refreshTimeouts.get(token.sessionId);
-		if (existingTimeout) {
-			clearTimeout(existingTimeout);
-		}
+		this.clearSessionTimeout(token.sessionId);
 
-		this._refreshTimeouts.set(token.sessionId, setTimeout(async () => {
-			try {
-				await this.refreshToken(token.refreshToken, scope);
-			} catch (e) {
-				await this.logout(token.sessionId);
-			} finally {
-				onDidChangeSessions.fire();
-			}
-		}, 1000 * (parseInt(token.expiresIn) - 10)));
+		if (token.expiresIn) {
+			this._refreshTimeouts.set(token.sessionId, setTimeout(async () => {
+				try {
+					await this.refreshToken(token.refreshToken, scope);
+					onDidChangeSessions.fire();
+				} catch (e) {
+					if (e.message === REFRESH_NETWORK_FAILURE) {
+						const didSucceedOnRetry = await this.handleRefreshNetworkError(token.sessionId, token.refreshToken, scope);
+						if (!didSucceedOnRetry) {
+							this.pollForReconnect(token.sessionId, token.refreshToken, token.scope);
+						}
+					} else {
+						await this.logout(token.sessionId);
+						onDidChangeSessions.fire();
+					}
+				}
+			}, 1000 * (parseInt(token.expiresIn) - 30)));
+		}
 
 		this.storeTokenData();
 	}
@@ -247,8 +377,8 @@ export class AzureActiveDirectoryService {
 			accessToken: json.access_token,
 			refreshToken: json.refresh_token,
 			scope,
-			sessionId: claims.tid + (claims.oid || claims.altsecid) + scope,
-			displayName: claims.email || claims.unique_name || 'user@example.com'
+			sessionId: `${claims.tid}/${(claims.oid || (claims.altsecid || '' + claims.ipd || ''))}/${scope}`,
+			accountName: claims.email || claims.unique_name || 'user@example.com'
 		};
 	}
 
@@ -282,8 +412,10 @@ export class AzureActiveDirectoryService {
 					});
 					result.on('end', () => {
 						if (result.statusCode === 200) {
+							Logger.info('Exchanging login code for token success');
 							resolve(this.getTokenFromResponse(buffer, scope));
 						} else {
+							Logger.error('Exchanging login code for token failed');
 							reject(new Error('Unable to login.'));
 						}
 					});
@@ -344,29 +476,80 @@ export class AzureActiveDirectoryService {
 			post.end();
 			post.on('error', err => {
 				Logger.error(err.message);
-				reject(err);
+				reject(new Error(REFRESH_NETWORK_FAILURE));
 			});
 		});
 	}
 
-	public async logout(sessionId: string) {
-		Logger.info(`Logging out of session '${sessionId}'`);
+	private clearSessionTimeout(sessionId: string): void {
+		const timeout = this._refreshTimeouts.get(sessionId);
+		if (timeout) {
+			clearTimeout(timeout);
+			this._refreshTimeouts.delete(sessionId);
+		}
+	}
+
+	private removeInMemorySessionData(sessionId: string) {
 		const tokenIndex = this._tokens.findIndex(token => token.sessionId === sessionId);
 		if (tokenIndex > -1) {
 			this._tokens.splice(tokenIndex, 1);
 		}
 
+		this.clearSessionTimeout(sessionId);
+	}
+
+	private pollForReconnect(sessionId: string, refreshToken: string, scope: string): void {
+		this.clearSessionTimeout(sessionId);
+
+		this._refreshTimeouts.set(sessionId, setTimeout(async () => {
+			try {
+				await this.refreshToken(refreshToken, scope);
+			} catch (e) {
+				this.pollForReconnect(sessionId, refreshToken, scope);
+			}
+		}, 1000 * 60 * 30));
+	}
+
+	private handleRefreshNetworkError(sessionId: string, refreshToken: string, scope: string, attempts: number = 1): Promise<boolean> {
+		return new Promise((resolve, _) => {
+			if (attempts === 3) {
+				Logger.error('Token refresh failed after 3 attempts');
+				return resolve(false);
+			}
+
+			if (attempts === 1) {
+				const token = this._tokens.find(token => token.sessionId === sessionId);
+				if (token) {
+					token.accessToken = undefined;
+				}
+
+				onDidChangeSessions.fire();
+			}
+
+			const delayBeforeRetry = 5 * attempts * attempts;
+
+			this.clearSessionTimeout(sessionId);
+
+			this._refreshTimeouts.set(sessionId, setTimeout(async () => {
+				try {
+					await this.refreshToken(refreshToken, scope);
+					return resolve(true);
+				} catch (e) {
+					return resolve(await this.handleRefreshNetworkError(sessionId, refreshToken, scope, attempts + 1));
+				}
+			}, 1000 * delayBeforeRetry));
+		});
+	}
+
+	public async logout(sessionId: string) {
+		Logger.info(`Logging out of session '${sessionId}'`);
+		this.removeInMemorySessionData(sessionId);
+
 		if (this._tokens.length === 0) {
 			await keychain.deleteToken();
 		} else {
 			this.storeTokenData();
 		}
-
-		const timeout = this._refreshTimeouts.get(sessionId);
-		if (timeout) {
-			clearTimeout(timeout);
-			this._refreshTimeouts.delete(sessionId);
-		}
 	}
 
 	public async clearSessions() {

extensions/vscode-account/src/authServer.ts

@@ -87,8 +87,8 @@ export async function startServer(server: http.Server): Promise<string> {
 			}
 		});
 
-		server.on('error', err => {
-			reject(err);
+		server.on('error', _ => {
+			reject(new Error('Error listening to server'));
 		});
 
 		server.on('close', () => {

extensions/vscode-account/src/extension.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { AzureActiveDirectoryService, onDidChangeSessions } from './AADHelper';
 
-export async function activate(context: vscode.ExtensionContext) {
+export async function activate(_: vscode.ExtensionContext) {
 
 	const loginService = new AzureActiveDirectoryService();
 

extensions/vscode-account/src/keychain.ts

@@ -7,6 +7,7 @@
 // how we load it
 import * as keytarType from 'keytar';
 import { env } from 'vscode';
+import Logger from './logger';
 
 function getKeytar(): Keytar | undefined {
 	try {
@@ -44,22 +45,27 @@ export class Keychain {
 			return await this.keytar.setPassword(SERVICE_ID, ACCOUNT_ID, token);
 		} catch (e) {
 			// Ignore
+			Logger.error(`Setting token failed: ${e}`);
 		}
 	}
 
-	async getToken() {
+	async getToken(): Promise<string | null | undefined> {
 		try {
 			return await this.keytar.getPassword(SERVICE_ID, ACCOUNT_ID);
 		} catch (e) {
 			// Ignore
+			Logger.error(`Getting token failed: ${e}`);
+			return Promise.resolve(undefined);
 		}
 	}
 
-	async deleteToken() {
+	async deleteToken(): Promise<boolean | undefined> {
 		try {
 			return await this.keytar.deletePassword(SERVICE_ID, ACCOUNT_ID);
 		} catch (e) {
 			// Ignore
+			Logger.error(`Deleting token failed: ${e}`);
+			return Promise.resolve(undefined);
 		}
 	}
 }

extensions/vscode-account/src/typings/refs.d.ts

@@ -0,0 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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'/>

extensions/vscode-account/src/vscode.proposed.d.ts

@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/**
- * This is the place for API experiments and proposals.
- * These API are NOT stable and subject to change. They are only available in the Insiders
- * distribution and CANNOT be used in published extensions.
- *
- * To test these API in local environment:
- * - Use Insiders release of VS Code.
- * - Add `"enableProposedApi": true` to your package.json.
- * - Copy this file to your project.
- */
-
-declare module 'vscode' {
-
-	export interface Session {
-		id: string;
-		accessToken: string;
-		displayName: string;
-		scopes: string[]
-	}
-
-	export interface AuthenticationProvider {
-		readonly id: string;
-		readonly displayName: string;
-		readonly onDidChangeSessions: Event<void>;
-
-		/**
-		 * Returns an array of current sessions.
-		 */
-		getSessions(): Promise<ReadonlyArray<Session>>;
-
-		/**
-		 * Prompts a user to login.
-		 */
-		login(scopes: string[]): Promise<Session>;
-		logout(sessionId: string): Promise<void>;
-	}
-
-	export namespace authentication {
-		export function registerAuthenticationProvider(provider: AuthenticationProvider): Disposable;
-
-		/**
-		 * Fires with the provider id that was registered or unregistered.
-		 */
-		export const onDidRegisterAuthenticationProvider: Event<string>;
-		export const onDidUnregisterAuthenticationProvider: Event<string>;
-
-		export const providers: ReadonlyArray<AuthenticationProvider>;
-	}
-
-	// #region Ben - extension auth flow (desktop+web)
-
-	export namespace env {
-
-		export function asExternalUri(target: Uri): Thenable<Uri>
-	}
-}

extensions/vscode-account/tsconfig.json

@@ -1,24 +1,13 @@
 {
+	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"module": "commonjs",
-		"target": "es6",
-		"outDir": "out",
-		"lib": [
-			"es6",
-			"es2016",
-			"dom"
-		],
+		"outDir": "./out",
+		"experimentalDecorators": true,
 		"typeRoots": [
-			"node_modules/@types",
-			"src/typings"
-		],
-		"sourceMap": true,
-		"rootDir": "src",
-		"strict": true,
-		"noImplicitAny": true
+			"./node_modules/@types"
+		]
 	},
-	"exclude": [
-		"node_modules",
-		".vscode-test"
+	"include": [
+		"src/**/*"
 	]
 }

extensions/vscode-account/yarn.lock

@@ -30,11 +30,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c"
   integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==
 
-"@types/vscode@^1.41.0":
-  version "1.41.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.41.0.tgz#b0d75920220f84e07093285e59180c0f11d336cd"
-  integrity sha512-7SfeY5u9jgiELwxyLB3z7l6l/GbN9CqpCQGkcRlB7tKRFBxzbz2PoBfGrLxI1vRfUCIq5+hg5vtDHExwq5j3+A==
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"

extensions/vscode-colorize-tests/package.json

@@ -26,21 +26,25 @@
 		"vscode": "1.1.5"
 	},
 	"contributes": {
-		"tokenTypes": [
+		"semanticTokenTypes": [
 			{
 				"id": "testToken",
 				"description": "A test token"
 			}
 		],
-		"tokenModifiers": [
+		"semanticTokenModifiers": [
 			{
 				"id": "testModifier",
 				"description": "A test modifier"
 			}
 		],
-		"tokenStyleDefaults": [
+		"semanticTokenStyleDefaults": [
 			{
-				"selector": "testToken.testModifier",
+				"selector": "testToken",
+				"scope": [ "entity.name.function.special" ]
+			},
+			{
+				"selector": "*.testModifier",
 				"light": {
 					"fontStyle": "bold"
 				},
@@ -50,7 +54,6 @@
 				"highContrast": {
 					"fontStyle": "bold"
 				}
-
 			}
 		]
 	}

extensions/yarn.lock

@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-typescript@3.7.5:
-  version "3.7.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
-  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
+typescript@^3.8.1-rc:
+  version "3.8.1-rc"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.1-rc.tgz#f94333c14da70927ccd887be2e91be652a9a09f6"
+  integrity sha512-aOIe066DyZn2uYIiND6fXMUUJ70nxwu/lKhA92QuQzXyC86fr0ywo1qvO8l2m0EnDcfjprYPuFRgNgDj7U2GlQ==

package.json

@@ -10,12 +10,13 @@
   "private": true,
   "scripts": {
     "test": "mocha",
+    "test-browser": "node test/unit/browser/index.js",
     "preinstall": "node build/npm/preinstall.js",
     "postinstall": "node build/npm/postinstall.js",
     "compile": "gulp compile --max_old_space_size=4095",
     "watch": "gulp watch --max_old_space_size=4095",
     "watch-client": "gulp watch-client --max_old_space_size=4095",
-    "monaco-editor-test": "mocha --only-monaco-editor",
+    "mocha": "mocha test/unit/node/all.js --delay",
     "precommit": "node build/gulpfile.hygiene.js",
     "gulp": "gulp --max_old_space_size=8192",
     "electron": "node build/lib/electron",
@@ -47,7 +48,7 @@
     "applicationinsights": "1.0.8",
     "chart.js": "^2.6.0",
     "chokidar": "3.2.3",
-    "graceful-fs": "4.1.11",
+    "graceful-fs": "4.2.3",
     "html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#2.6",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",
@@ -77,10 +78,11 @@
     "vscode-ripgrep": "^1.5.7",
     "vscode-sqlite3": "4.0.9",
     "vscode-textmate": "4.4.0",
-    "xterm": "4.4.0-beta.15",
-    "xterm-addon-search": "0.4.0-beta4",
+    "xterm": "4.4.0",
+    "xterm-addon-search": "0.4.0",
+    "xterm-addon-unicode11": "0.1.1",
     "xterm-addon-web-links": "0.2.1",
-    "xterm-addon-webgl": "0.5.0-beta.7",
+    "xterm-addon-webgl": "0.5.0",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3",
     "zone.js": "^0.8.4"
@@ -91,6 +93,7 @@
     "@types/chart.js": "2.7.57",
     "@types/chokidar": "2.1.3",
     "@types/cookie": "^0.3.3",
+    "@types/debug": "^4.1.5",
     "@types/graceful-fs": "4.1.2",
     "@types/http-proxy-agent": "^2.0.1",
     "@types/iconv-lite": "0.0.1",
@@ -117,11 +120,10 @@
     "coveralls": "^2.11.11",
     "cson-parser": "^1.3.3",
     "debounce": "^1.0.0",
-    "electron": "6.1.6",
+    "electron": "7.1.11",
     "eslint": "6.8.0",
     "eslint-plugin-jsdoc": "^19.1.0",
     "event-stream": "3.3.4",
-    "express": "^4.13.1",
     "fancy-log": "^1.3.3",
     "fast-plist": "0.1.2",
     "glob": "^5.0.13",
@@ -163,6 +165,7 @@
     "opn": "^6.0.0",
     "optimist": "0.3.5",
     "p-all": "^1.0.0",
+    "playwright": "^0.10.0",
     "pump": "^1.0.1",
     "queue": "3.0.6",
     "rcedit": "^1.1.0",
@@ -172,7 +175,7 @@
     "temp-write": "^3.4.0",
     "ts-loader": "^4.4.2",
     "typemoq": "^0.3.2",
-    "typescript": "3.8.0-beta",
+    "typescript": "^3.8.1-rc",
     "typescript-formatter": "7.1.0",
     "vinyl": "^2.0.0",
     "vinyl-fs": "^3.0.0",
@@ -181,7 +184,8 @@
     "vscode-nls-dev": "^3.3.1",
     "webpack": "^4.16.5",
     "webpack-cli": "^3.3.8",
-    "webpack-stream": "^5.1.1"
+    "webpack-stream": "^5.1.1",
+    "yaserver": "^0.2.0"
   },
   "repository": {
     "type": "git",

remote/package.json

@@ -5,7 +5,7 @@
     "applicationinsights": "1.0.8",
     "chokidar": "3.2.3",
     "cookie": "^0.4.0",
-    "graceful-fs": "4.1.11",
+    "graceful-fs": "4.2.3",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",
     "iconv-lite": "0.5.0",
@@ -20,10 +20,11 @@
     "vscode-proxy-agent": "^0.5.2",
     "vscode-ripgrep": "^1.5.7",
     "vscode-textmate": "4.4.0",
-    "xterm": "4.4.0-beta.15",
-    "xterm-addon-search": "0.4.0-beta4",
+    "xterm": "4.4.0",
+    "xterm-addon-search": "0.4.0",
+    "xterm-addon-unicode11": "0.1.1",
     "xterm-addon-web-links": "0.2.1",
-    "xterm-addon-webgl": "0.5.0-beta.7",
+    "xterm-addon-webgl": "0.5.0",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },

remote/web/package.json

@@ -5,9 +5,10 @@
 		"onigasm-umd": "2.2.5",
 		"semver-umd": "^5.5.5",
 		"vscode-textmate": "4.4.0",
-		"xterm": "4.4.0-beta.15",
-		"xterm-addon-search": "0.4.0-beta4",
+		"xterm": "4.4.0",
+		"xterm-addon-search": "0.4.0",
+		"xterm-addon-unicode11": "0.1.1",
 		"xterm-addon-web-links": "0.2.1",
-		"xterm-addon-webgl": "0.5.0-beta.7"
+		"xterm-addon-webgl": "0.5.0"
 	}
 }

remote/web/yarn.lock

@@ -31,22 +31,27 @@ vscode-textmate@4.4.0:
   dependencies:
     oniguruma "^7.2.0"
 
-xterm-addon-search@0.4.0-beta4:
-  version "0.4.0-beta4"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.4.0-beta4.tgz#7762ea342c6b4f5e824d83466bd93793c9d7d779"
-  integrity sha512-TIbEBVhydGIxcyu/CfKJbD+BKHisMGbkAfaWlCPaWis2Xmw8yE7CKrCPn+lhZYl1MdjDVEmb8lQI6WetbC2OZA==
+xterm-addon-search@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.4.0.tgz#a7beadb3caa7330eb31fb1f17d92de25537684a1"
+  integrity sha512-g07qb/Z4aSfrQ25e6Z6rz6KiExm2DvesQXkx+eA715VABBr5VM/9Jf0INoCiDSYy/nn7rpna+kXiGVJejIffKg==
+
+xterm-addon-unicode11@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.1.1.tgz#b209ef137db38096f68636af4ef4d0c0acba85ad"
+  integrity sha512-z6vJTL+dpNljwAYzYoyDjJP8A2XjZuEosl0sRa+FGRf3jEyEVWquDM53MfUd1ztVdAPQ839qR6eYK1BXV04Bhw==
 
 xterm-addon-web-links@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.1.tgz#6d1f2ce613e09870badf17615e7a1170a31542b2"
   integrity sha512-2KnHtiq0IG7hfwv3jw2/jQeH1RBk2d5CH4zvgwQe00rLofSJqSfgnJ7gwowxxpGHrpbPr6Lv4AmH/joaNw2+HQ==
 
-xterm-addon-webgl@0.5.0-beta.7:
-  version "0.5.0-beta.7"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.5.0-beta.7.tgz#b7b95a362e942ad6f86fa286d7b7bd8ee3e7cf67"
-  integrity sha512-v6aCvhm1C6mvaurGwUYQfyhb2cAUyuVnzf3Ob/hy5ebtyzUj4wW0N9NbqDEJk67UeMi1lV2xZqrO5gNeTpVqFA==
+xterm-addon-webgl@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.5.0.tgz#c1031dc7599cce3509824643ab5f15361c928e3e"
+  integrity sha512-hQrvabKCnwXFaEZ+YtoJM9Pm0CIBXL5KSwoU+RiGStU3KYTAcqYP2GsH3dWdvKX6kTWhWLS81dtDsGkfbOciuA==
 
-xterm@4.4.0-beta.15:
-  version "4.4.0-beta.15"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.4.0-beta.15.tgz#5897bf79d29d1a2496ccd54665aded28c341b1cc"
-  integrity sha512-Dvz1CMCYKeoxPF7uIDznbRgUA2Mct49Bq93K2nnrDU0pDMM3Sf1t9fkEyz59wxSx5XEHVdLS80jywsz4sjXBjQ==
+xterm@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.4.0.tgz#5915d3c4c8800fadbcf555a0a603c672ab9df589"
+  integrity sha512-JGIpigWM3EBWvnS3rtBuefkiToIILSK1HYMXy4BCsUpO+O4UeeV+/U1AdAXgCB6qJrnPNb7yLgBsVCQUNMteig==

remote/yarn.lock

@@ -155,12 +155,7 @@ glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-graceful-fs@4.1.11:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@4.2.3, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
@@ -418,25 +413,30 @@ vscode-windows-registry@1.0.2:
   resolved "https://registry.yarnpkg.com/vscode-windows-registry/-/vscode-windows-registry-1.0.2.tgz#b863e704a6a69c50b3098a55fbddbe595b0c124a"
   integrity sha512-/CLLvuOSM2Vme2z6aNyB+4Omd7hDxpf4Thrt8ImxnXeQtxzel2bClJpFQvQqK/s4oaXlkBKS7LqVLeZM+uSVIA==
 
-xterm-addon-search@0.4.0-beta4:
-  version "0.4.0-beta4"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.4.0-beta4.tgz#7762ea342c6b4f5e824d83466bd93793c9d7d779"
-  integrity sha512-TIbEBVhydGIxcyu/CfKJbD+BKHisMGbkAfaWlCPaWis2Xmw8yE7CKrCPn+lhZYl1MdjDVEmb8lQI6WetbC2OZA==
+xterm-addon-search@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.4.0.tgz#a7beadb3caa7330eb31fb1f17d92de25537684a1"
+  integrity sha512-g07qb/Z4aSfrQ25e6Z6rz6KiExm2DvesQXkx+eA715VABBr5VM/9Jf0INoCiDSYy/nn7rpna+kXiGVJejIffKg==
+
+xterm-addon-unicode11@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.1.1.tgz#b209ef137db38096f68636af4ef4d0c0acba85ad"
+  integrity sha512-z6vJTL+dpNljwAYzYoyDjJP8A2XjZuEosl0sRa+FGRf3jEyEVWquDM53MfUd1ztVdAPQ839qR6eYK1BXV04Bhw==
 
 xterm-addon-web-links@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.1.tgz#6d1f2ce613e09870badf17615e7a1170a31542b2"
   integrity sha512-2KnHtiq0IG7hfwv3jw2/jQeH1RBk2d5CH4zvgwQe00rLofSJqSfgnJ7gwowxxpGHrpbPr6Lv4AmH/joaNw2+HQ==
 
-xterm-addon-webgl@0.5.0-beta.7:
-  version "0.5.0-beta.7"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.5.0-beta.7.tgz#b7b95a362e942ad6f86fa286d7b7bd8ee3e7cf67"
-  integrity sha512-v6aCvhm1C6mvaurGwUYQfyhb2cAUyuVnzf3Ob/hy5ebtyzUj4wW0N9NbqDEJk67UeMi1lV2xZqrO5gNeTpVqFA==
+xterm-addon-webgl@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.5.0.tgz#c1031dc7599cce3509824643ab5f15361c928e3e"
+  integrity sha512-hQrvabKCnwXFaEZ+YtoJM9Pm0CIBXL5KSwoU+RiGStU3KYTAcqYP2GsH3dWdvKX6kTWhWLS81dtDsGkfbOciuA==
 
-xterm@4.4.0-beta.15:
-  version "4.4.0-beta.15"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.4.0-beta.15.tgz#5897bf79d29d1a2496ccd54665aded28c341b1cc"
-  integrity sha512-Dvz1CMCYKeoxPF7uIDznbRgUA2Mct49Bq93K2nnrDU0pDMM3Sf1t9fkEyz59wxSx5XEHVdLS80jywsz4sjXBjQ==
+xterm@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.4.0.tgz#5915d3c4c8800fadbcf555a0a603c672ab9df589"
+  integrity sha512-JGIpigWM3EBWvnS3rtBuefkiToIILSK1HYMXy4BCsUpO+O4UeeV+/U1AdAXgCB6qJrnPNb7yLgBsVCQUNMteig==
 
 yauzl@^2.9.2:
   version "2.10.0"

scripts/test-integration.bat

@@ -3,7 +3,7 @@ setlocal
 
 pushd %~dp0\..
 
-set VSCODEUSERDATADIR=%TMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,5%
+set VSCODEUSERDATADIR=%TEMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,2%
 
 :: Figure out which Electron to use for running tests
 if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
@@ -12,7 +12,7 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
 	set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat
 	set VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE=1
 
-	echo "Running integration tests out of sources."
+	echo Running integration tests out of sources.
 ) else (
 	:: Run from a built: need to compile all test extensions
 	call yarn gulp compile-extension:vscode-api-tests
@@ -22,13 +22,14 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
 	call yarn gulp compile-extension:css-language-features-server
 	call yarn gulp compile-extension:html-language-features-server
 	call yarn gulp compile-extension:json-language-features-server
+	call yarn gulp compile-extension:git
 
 	:: Configuration for more verbose output
 	set VSCODE_CLI=1
 	set ELECTRON_ENABLE_LOGGING=1
 	set ELECTRON_ENABLE_STACK_DUMPING=1
 
-	echo "Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build."
+	echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build.
 )
 
 :: Integration & performance tests in AMD
@@ -53,6 +54,12 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\azurecore\test-fixtures --extensionDevelopmentPath=%~dp0\..\extensions\azurecore --extensionTestsPath=%~dp0\..\extensions\azurecore\out\test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
 if %errorlevel% neq 0 exit /b %errorlevel%
 
+for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set TEMPDIR=%%i
+set GITWORKSPACE=%TEMPDIR%\git-%RANDOM%
+mkdir %GITWORKSPACE%
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %GITWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\git --extensionTestsPath=%~dp0\..\extensions\git\out\test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
 :: Tests in commonJS (HTML, CSS, JSON language server tests...)
 call .\scripts\node-electron.bat .\node_modules\mocha\bin\_mocha .\extensions\*\server\out\test\**\*.test.js
 if %errorlevel% neq 0 exit /b %errorlevel%

scripts/test-integration.sh

@@ -4,13 +4,12 @@ set -e
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname $(dirname $(realpath "$0")))
-	VSCODEUSERDATADIR=`mktemp -d -t 'myuserdatadir'`
 else
 	ROOT=$(dirname $(dirname $(readlink -f $0)))
-	VSCODEUSERDATADIR=`mktemp -d 2>/dev/null`
 	LINUX_NO_SANDBOX="--no-sandbox" # Electron 6 introduces a chrome-sandbox that requires root to run. This can fail. Disable sandbox via --no-sandbox.
 fi
 
+VSCODEUSERDATADIR=`mktemp -d 2>/dev/null`
 cd $ROOT
 
 # Figure out which Electron to use for running tests
@@ -29,6 +28,7 @@ else
 	yarn gulp compile-extension:css-language-features-server
 	yarn gulp compile-extension:html-language-features-server
 	yarn gulp compile-extension:json-language-features-server
+	yarn gulp compile-extension:git
 
 	# Configuration for more verbose output
 	export VSCODE_CLI=1
@@ -47,6 +47,7 @@ fi
 "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --user-data-dir=$VSCODEUSERDATADIR
 "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/markdown-language-features/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --user-data-dir=$VSCODEUSERDATADIR
 "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/azurecore/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/azurecore --extensionTestsPath=$ROOT/extensions/azurecore/out/test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --user-data-dir=$VSCODEUSERDATADIR
+# "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --user-data-dir=$VSCODEUSERDATADIR
 
 mkdir -p $ROOT/extensions/emmet/test-fixtures
 "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/emmet/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started  --user-data-dir=$VSCODEUSERDATADIR

scripts/test.bat

@@ -24,7 +24,7 @@ if "%ADS_TEST_GREP%" == "" (
 
 :: Run tests
 set ELECTRON_ENABLE_LOGGING=1
-%CODE% .\test\electron\index.js %*
+%CODE% .\test\unit\electron\index.js %*
 
 popd
 

scripts/test.sh

@@ -36,10 +36,10 @@ if [[ "$OSTYPE" == "darwin"* ]] || [[ "$AGENT_OS" == "Darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		ELECTRON_ENABLE_LOGGING=1 \
 		"$CODE" \
-		test/electron/index.js $PASSED_ARGS
+		test/unit/electron/index.js "$@"
 else
 	cd $ROOT ; \
 		ELECTRON_ENABLE_LOGGING=1 \
 		"$CODE" \
-		test/electron/index.js --no-sandbox $PASSED_ARGS # Electron 6 introduces a chrome-sandbox that requires root to run. This can fail. Disable sandbox via --no-sandbox.
+		test/unit/electron/index.js --no-sandbox "$@" # Electron 6 introduces a chrome-sandbox that requires root to run. This can fail. Disable sandbox via --no-sandbox.
 fi

src/sql/workbench/contrib/charts/test/browser/chartView.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { ChartView } from 'sql/workbench/contrib/charts/browser/chartView';
 import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
-import { TestLayoutService } from 'vs/workbench/test/workbenchTestServices';
+import { TestLayoutService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { IThemeService } from 'vs/platform/theme/common/themeService';

src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts

@@ -22,7 +22,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestEditorService, TestDialogService } from 'vs/workbench/test/workbenchTestServices';
+import { TestEditorService, TestDialogService, TestFileService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { URI } from 'vs/base/common/uri';
 import { UntitledQueryEditorInput } from 'sql/workbench/contrib/query/common/untitledQueryEditorInput';
 import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService';
@@ -393,7 +393,7 @@ suite('commandLineService tests', () => {
 		querymodelService.setup(c => c.onRunQueryComplete).returns(() => Event.None);
 		const instantiationService = new TestInstantiationService();
 		let uri = URI.file(args._[0]);
-		const untitledEditorInput = new UntitledTextEditorInput(uri, false, '', '', '', instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined);
+		const untitledEditorInput = new UntitledTextEditorInput(uri, false, undefined, undefined, undefined, instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined, new TestFileService(), undefined);
 		const queryInput = new UntitledQueryEditorInput(undefined, untitledEditorInput, undefined, connectionManagementService.object, querymodelService.object, configurationService.object);
 		queryInput.state.connected = true;
 		const editorService: TypeMoq.Mock<IEditorService> = TypeMoq.Mock.ofType<IEditorService>(TestEditorService, TypeMoq.MockBehavior.Strict);

src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts

@@ -15,7 +15,6 @@ import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewl
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IAddedViewDescriptorRef } from 'vs/workbench/browser/parts/views/views';
 import { ConnectionViewletPanel } from 'sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel';
 import { Extensions as ViewContainerExtensions, IViewDescriptor, IViewsRegistry, IViewContainersRegistry, ViewContainerLocation, IViewDescriptorService } from 'vs/workbench/common/views';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -146,11 +145,6 @@ export class DataExplorerViewPaneContainer extends ViewPaneContainer {
 		return actions;
 	}
 
-	protected onDidAddViews(added: IAddedViewDescriptorRef[]): ViewPane[] {
-		const addedViews = super.onDidAddViews(added);
-		return addedViews;
-	}
-
 	protected createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewPane {
 		let viewletPanel = this.instantiationService.createInstance(viewDescriptor.ctorDescriptor.ctor, options) as ViewPane;
 		this._register(viewletPanel);

src/sql/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts

@@ -28,7 +28,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { TestEnvironmentService, TestLifecycleService, TestStorageService, TestTextFileService, workbenchInstantiationService, TestTextResourcePropertiesService } from 'vs/workbench/test/workbenchTestServices';
+import { TestEnvironmentService, TestLifecycleService, TestStorageService, TestTextFileService, workbenchInstantiationService, TestTextResourcePropertiesService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { Range } from 'vs/editor/common/core/range';
 import { nb } from 'azdata';
 import { Emitter } from 'vs/base/common/event';

src/sql/workbench/contrib/notebook/test/browser/notebookInput.test.ts

@@ -6,7 +6,7 @@
 import * as TypeMoq from 'typemoq';
 import * as assert from 'assert';
 import { nb } from 'azdata';
-import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
+import { workbenchInstantiationService, TestFileService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/common/models/untitledNotebookInput';
@@ -48,7 +48,7 @@ suite('Notebook Input', function (): void {
 	let untitledNotebookInput: UntitledNotebookInput;
 
 	setup(() => {
-		untitledTextInput = new UntitledTextEditorInput(untitledUri, false, '', '', '', instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined);
+		untitledTextInput = new UntitledTextEditorInput(untitledUri, false, undefined, undefined, undefined, instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined, new TestFileService(), undefined);
 		untitledNotebookInput = new UntitledNotebookInput(
 			testTitle, untitledUri, untitledTextInput,
 			undefined, instantiationService, mockNotebookService.object, mockExtensionService.object);
@@ -169,7 +169,7 @@ suite('Notebook Input', function (): void {
 		assert.ok(untitledNotebookInput.matches(untitledNotebookInput), 'Input should match itself.');
 
 		let otherTestUri = URI.from({ scheme: Schemas.untitled, path: 'OtherTestPath' });
-		let otherTextInput = new UntitledTextEditorInput(otherTestUri, false, '', '', '', instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined);
+		let otherTextInput = new UntitledTextEditorInput(otherTestUri, false, undefined, undefined, undefined, instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined, new TestFileService(), undefined);
 		let otherInput = instantiationService.createInstance(UntitledNotebookInput, 'OtherTestInput', otherTestUri, otherTextInput);
 
 		assert.strictEqual(untitledNotebookInput.matches(otherInput), false, 'Input should not match different input.');

src/sql/workbench/contrib/notebook/test/electron-browser/contentManagers.test.ts

@@ -11,7 +11,7 @@ import * as tempWrite from 'temp-write';
 import { LocalContentManager } from 'sql/workbench/services/notebook/common/localContentManager';
 import { CellTypes } from 'sql/workbench/contrib/notebook/common/models/contracts';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TestFileService } from 'vs/workbench/test/workbenchTestServices';
+import { TestFileService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { IFileService, IReadFileOptions, IFileContent, IWriteFileOptions, IFileStatWithMetadata } from 'vs/platform/files/common/files';
 import * as pfs from 'vs/base/node/pfs';
 import { VSBuffer, VSBufferReadable } from 'vs/base/common/buffer';

src/sql/workbench/contrib/notebook/test/electron-browser/notebookFindModel.test.ts

@@ -25,7 +25,7 @@ import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/t
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { ClientSession } from 'sql/workbench/contrib/notebook/browser/models/clientSession';
-import { TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestStorageService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { NotebookRange } from 'sql/workbench/contrib/notebook/find/notebookFindDecorations';
 import { NotebookEditorContentManager } from 'sql/workbench/contrib/notebook/browser/models/notebookInput';
 

src/sql/workbench/contrib/notebook/test/electron-browser/notebookModel.test.ts

@@ -22,7 +22,7 @@ import { Memento } from 'vs/workbench/common/memento';
 import { Emitter } from 'vs/base/common/event';
 import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
-import { TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestStorageService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';

src/sql/workbench/contrib/objectExplorer/test/browser/connectionTreeActions.test.ts

@@ -22,7 +22,7 @@ import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode';
 import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { ServerTreeDataSource } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeDataSource';
-import { Emitter } from 'vs/base/common/event';
+import { Emitter, Event } from 'vs/base/common/event';
 import Severity from 'vs/base/common/severity';
 import { ObjectExplorerActionsContext } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions';
 import { IConnectionResult, IConnectionParams } from 'sql/platform/connection/common/connectionManagement';
@@ -31,7 +31,7 @@ import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/t
 import { UNSAVED_GROUP_ID, mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { $ } from 'vs/base/browser/dom';
 import { OEManageConnectionAction } from 'sql/workbench/contrib/dashboard/browser/dashboardActions';
-import { IViewsService, IView, ViewContainer, IViewDescriptorCollection } from 'vs/workbench/common/views';
+import { IViewsService, IView } from 'vs/workbench/common/views';
 import { ConsoleLogService } from 'vs/platform/log/common/log';
 
 suite('SQL Connection Tree Action tests', () => {
@@ -109,18 +109,22 @@ suite('SQL Connection Tree Action tests', () => {
 		});
 
 		const viewsService = new class implements IViewsService {
-			getActiveViewWithId(id: string): IView {
+			getActiveViewWithId<T extends IView>(id: string): T | null {
 				throw new Error('Method not implemented.');
 			}
 			_serviceBrand: undefined;
-			openView(id: string, focus?: boolean): Promise<IView> {
-				return Promise.resolve({
+			openView<T extends IView>(id: string, focus?: boolean): Promise<T | null> {
+				return Promise.resolve(<T><any>{
 					id: '',
 					serversTree: undefined
 				});
 			}
-			getViewDescriptors(container: ViewContainer): IViewDescriptorCollection {
-				throw new Error('Method not implemented.');
+			onDidChangeViewVisibility: Event<{ id: string, visible: boolean }> = Event.None;
+			closeView(id: string): void {
+				return;
+			}
+			isViewVisible(id: string): boolean {
+				return true;
 			}
 		};
 

src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts

@@ -8,7 +8,7 @@ import { ServerTreeView } from 'sql/workbench/contrib/objectExplorer/browser/ser
 import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService';
 
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestStorageService } from 'vs/workbench/test/browser/workbenchTestServices';
 
 import * as TypeMoq from 'typemoq';
 import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';

src/sql/workbench/contrib/query/common/fileQueryEditorInput.ts

@@ -11,8 +11,8 @@ import { IQueryModelService } from 'sql/workbench/services/query/common/queryMod
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { EncodingMode } from 'vs/workbench/common/editor';
-import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
+import { ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
 
 type PublicPart<T> = { [K in keyof T]: T[K] };
 
@@ -31,7 +31,7 @@ export class FileQueryEditorInput extends QueryEditorInput implements PublicPart
 		super(description, text, results, connectionManagementService, queryModelService, configurationService);
 	}
 
-	public resolve(): Promise<TextFileEditorModel | BinaryEditorModel> {
+	public resolve(): Promise<ITextFileEditorModel | BinaryEditorModel> {
 		return this.text.resolve();
 	}
 

src/sql/workbench/contrib/query/test/browser/queryActions.test.ts

@@ -23,7 +23,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 
 import * as TypeMoq from 'typemoq';
 import * as assert from 'assert';
-import { TestStorageService, TestFileService } from 'vs/workbench/test/workbenchTestServices';
+import { TestStorageService, TestFileService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { UntitledQueryEditorInput } from 'sql/workbench/contrib/query/common/untitledQueryEditorInput';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
@@ -70,7 +70,7 @@ suite('SQL QueryAction Tests', () => {
 		connectionManagementService = TypeMoq.Mock.ofType<TestConnectionManagementService>(TestConnectionManagementService);
 		connectionManagementService.setup(q => q.onDisconnect).returns(() => Event.None);
 		const instantiationService = new TestInstantiationService();
-		let fileInput = new UntitledTextEditorInput(URI.parse('file://testUri'), false, '', '', '', instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined);
+		let fileInput = new UntitledTextEditorInput(URI.parse('file://testUri'), false, undefined, undefined, undefined, instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined, new TestFileService(), undefined);
 		// Setup a reusable mock QueryInput
 		testQueryInput = TypeMoq.Mock.ofType(UntitledQueryEditorInput, TypeMoq.MockBehavior.Strict, undefined, fileInput, undefined, connectionManagementService.object, queryModelService.object, configurationService.object);
 		testQueryInput.setup(x => x.uri).returns(() => testUri);
@@ -175,7 +175,7 @@ suite('SQL QueryAction Tests', () => {
 		queryModelService.setup(x => x.onRunQueryStart).returns(() => Event.None);
 		queryModelService.setup(x => x.onRunQueryComplete).returns(() => Event.None);
 		const instantiationService = new TestInstantiationService();
-		let fileInput = new UntitledTextEditorInput(URI.parse('file://testUri'), false, '', '', '', instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined);
+		let fileInput = new UntitledTextEditorInput(URI.parse('file://testUri'), false, undefined, undefined, undefined, instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined, new TestFileService(), undefined);
 
 		// ... Mock "isSelectionEmpty" in QueryEditor
 		let queryInput = TypeMoq.Mock.ofType(UntitledQueryEditorInput, TypeMoq.MockBehavior.Strict, undefined, fileInput, undefined, connectionManagementService.object, queryModelService.object, configurationService.object);
@@ -224,7 +224,7 @@ suite('SQL QueryAction Tests', () => {
 
 		// ... Mock "getSelection" in QueryEditor
 		const instantiationService = new TestInstantiationService();
-		let fileInput = new UntitledTextEditorInput(URI.parse('file://testUri'), false, '', '', '', instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined);
+		let fileInput = new UntitledTextEditorInput(URI.parse('file://testUri'), false, undefined, undefined, undefined, instantiationService, undefined, new LabelService(undefined, undefined), undefined, undefined, new TestFileService(), undefined);
 
 		let queryInput = TypeMoq.Mock.ofType(UntitledQueryEditorInput, TypeMoq.MockBehavior.Loose, undefined, fileInput, undefined, connectionManagementService.object, queryModelService.object, configurationService.object);
 		queryInput.setup(x => x.uri).returns(() => testUri);