VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)

* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9

* delete unused folders

* distro

* Bump build node version

* update chokidar

* FIx hygiene errors

* distro

* Fix extension lint issues

* Remove strict-vscode

* Add copyright header exemptions

* Bump vscode-extension-telemetry to fix webpacking issue with zone.js

* distro

* Fix failing tests (revert marked.js back to current one until we decide to update)

* Skip searchmodel test

* Fix mac build

* temp debug script loading

* Try disabling coverage

* log error too

* Revert "log error too"

This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f.

* Revert "temp debug script loading"

This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c.

* Add comments explaining coverage disabling

* Fix ansi_up loading issue

* Merge latest from ads

* Use newer option

* Fix compile

* add debug logging warn

* Always log stack

* log more

* undo debug

* Update to use correct base path (+cleanup)

* distro

* fix compile errors

* Remove strict-vscode

* Fix sql editors not showing

* Show db dropdown input & fix styling

* Fix more info in gallery

* Fix gallery asset requests

* Delete unused workflow

* Fix tapable resolutions for smoke test compile error

* Fix smoke compile

* Disable crash reporting

* Disable interactive

Co-authored-by: ADS Merger <karlb@microsoft.com>

extensions/github-authentication/src/common/keychain.ts

@@ -7,8 +7,8 @@
 // how we load it
 import type * as keytarType from 'keytar';
 import * as vscode from 'vscode';
-import Logger from './logger';
 import * as nls from 'vscode-nls';
+import { Log } from './logger';
 
 const localize = nls.loadMessageBundle();
 
@@ -29,13 +29,18 @@ export type Keytar = {
 };
 
 export class Keychain {
-	constructor(private context: vscode.ExtensionContext, private serviceId: string) { }
+	constructor(
+		private readonly context: vscode.ExtensionContext,
+		private readonly serviceId: string,
+		private readonly Logger: Log
+	) { }
+
 	async setToken(token: string): Promise<void> {
 		try {
 			return await this.context.secrets.store(this.serviceId, token);
 		} catch (e) {
 			// Ignore
-			Logger.error(`Setting token failed: ${e}`);
+			this.Logger.error(`Setting token failed: ${e}`);
 			const troubleshooting = localize('troubleshooting', "Troubleshooting Guide");
 			const result = await vscode.window.showErrorMessage(localize('keychainWriteError', "Writing login information to the keychain failed with error '{0}'.", e.message), troubleshooting);
 			if (result === troubleshooting) {
@@ -46,10 +51,14 @@ export class Keychain {
 
 	async getToken(): Promise<string | null | undefined> {
 		try {
-			return await this.context.secrets.get(this.serviceId);
+			const secret = await this.context.secrets.get(this.serviceId);
+			if (secret && secret !== '[]') {
+				this.Logger.trace('Token acquired from secret storage.');
+			}
+			return secret;
 		} catch (e) {
 			// Ignore
-			Logger.error(`Getting token failed: ${e}`);
+			this.Logger.error(`Getting token failed: ${e}`);
 			return Promise.resolve(undefined);
 		}
 	}
@@ -59,7 +68,7 @@ export class Keychain {
 			return await this.context.secrets.delete(this.serviceId);
 		} catch (e) {
 			// Ignore
-			Logger.error(`Deleting token failed: ${e}`);
+			this.Logger.error(`Deleting token failed: ${e}`);
 			return Promise.resolve(undefined);
 		}
 	}
@@ -73,6 +82,7 @@ export class Keychain {
 
 			const oldValue = await keytar.getPassword(`${vscode.env.uriScheme}-github.login`, 'account');
 			if (oldValue) {
+				this.Logger.trace('Attempting to migrate from keytar to secret store...');
 				await this.setToken(oldValue);
 				await keytar.deletePassword(`${vscode.env.uriScheme}-github.login`, 'account');
 			}

extensions/github-authentication/src/common/logger.ts

@@ -4,14 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { AuthProviderType } from '../github';
 
 type LogLevel = 'Trace' | 'Info' | 'Error';
 
-class Log {
+export class Log {
 	private output: vscode.OutputChannel;
 
-	constructor() {
-		this.output = vscode.window.createOutputChannel('GitHub Authentication');
+	constructor(private readonly type: AuthProviderType) {
+		const friendlyName = this.type === AuthProviderType.github ? 'GitHub' : 'GitHub Enterprise';
+		this.output = vscode.window.createOutputChannel(`${friendlyName} Authentication`);
 	}
 
 	private data2String(data: any): string {
@@ -24,6 +26,10 @@ class Log {
 		return data.toString();
 	}
 
+	public trace(message: string, data?: any): void {
+		this.logLevel('Trace', message, data);
+	}
+
 	public info(message: string, data?: any): void {
 		this.logLevel('Info', message, data);
 	}
@@ -50,6 +56,3 @@ class Log {
 function padLeft(s: string, n: number, pad = ' ') {
 	return pad.repeat(Math.max(0, n - s.length)) + s;
 }
-
-const Logger = new Log();
-export default Logger;

extensions/github-authentication/src/common/utils.ts

@@ -98,3 +98,21 @@ export function arrayEquals<T>(one: ReadonlyArray<T> | undefined, other: Readonl
 
 	return true;
 }
+
+
+export class StopWatch {
+
+	private _startTime: number = Date.now();
+	private _stopTime: number = -1;
+
+	public stop(): void {
+		this._stopTime = Date.now();
+	}
+
+	public elapsed(): number {
+		if (this._stopTime !== -1) {
+			return this._stopTime - this._startTime;
+		}
+		return Date.now() - this._startTime;
+	}
+}