Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127 (#9385)

* Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127 * distro
2026-02-22 11:01:37 -05:00 · 2020-02-28 00:37:06 -08:00
parent 70851716f7
commit 5d13ebf0d2
143 changed files with 1711 additions and 934 deletions
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1825,37 +1825,37 @@
    },
    "viewsWelcome": [
      {
-        "view": "workbench.scm",
+        "view": "scm",
        "contents": "%view.workbench.scm.disabled%",
        "when": "!config.git.enabled"
      },
      {
-        "view": "workbench.scm",
+        "view": "scm",
        "contents": "%view.workbench.scm.missing%",
        "when": "config.git.enabled && git.missing"
      },
      {
-        "view": "workbench.scm",
+        "view": "scm",
        "contents": "%view.workbench.scm.empty%",
        "when": "config.git.enabled && !git.missing && workbenchState == empty"
      },
      {
-        "view": "workbench.scm",
+        "view": "scm",
        "contents": "%view.workbench.scm.folder%",
        "when": "config.git.enabled && !git.missing && workbenchState == folder"
      },
      {
-        "view": "workbench.scm",
+        "view": "scm",
        "contents": "%view.workbench.scm.workspace%",
        "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount != 0"
      },
      {
-        "view": "workbench.scm",
+        "view": "scm",
        "contents": "%view.workbench.scm.emptyWorkspace%",
        "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount == 0"
      },
      {
-        "view": "workbench.explorer.emptyView",
+        "view": "explorer",
        "contents": "%view.workbench.cloneRepository%"
      }
    ]
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -150,11 +150,11 @@
 	"colors.ignored": "Color for ignored resources.",
 	"colors.conflict": "Color for resources with conflicts.",
 	"colors.submodule": "Color for submodule resources.",
-	"view.workbench.scm.missing": "A valid git installation was not detected, more details can be found in the [git output](command:git.showOutput).\nPlease [install git](https://git-scm.com/), or learn more about how to use Git and source control in Azure Data Studio in [our docs](https://aka.ms/vscode-scm).\nIf you're using a different version control system, you can [search the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22) for additional extensions.",
-	"view.workbench.scm.disabled": "If you would like to use git features, please enable git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
-	"view.workbench.scm.empty": "In order to use git features, you can open a folder containing a git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
-	"view.workbench.scm.folder": "The folder currently open doesn't have a git repository.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
-	"view.workbench.scm.workspace": "The workspace currently open doesn't have any folders containing git repositories.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
-	"view.workbench.scm.emptyWorkspace": "The workspace currently open doesn't have any folders containing git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
-	"view.workbench.cloneRepository": "You can also clone a repository from a URL. To learn more about how to use Git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).\n[Clone Repository](command:git.clone)"
+	"view.workbench.scm.missing": "A valid git installation was not detected, more details can be found in the [git output](command:git.showOutput).\nPlease [install git](https://git-scm.com/), or learn more about how to use git and source control in Azure Data Studio in [our docs](https://aka.ms/vscode-scm).\nIf you're using a different version control system, you can [search the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22) for additional extensions.",
+	"view.workbench.scm.disabled": "If you would like to use git features, please enable git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
+	"view.workbench.scm.empty": "In order to use git features, you can open a folder containing a git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
+	"view.workbench.scm.folder": "The folder currently open doesn't have a git repository.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
+	"view.workbench.scm.workspace": "The workspace currently open doesn't have any folders containing git repositories.\n[Initialize Repository](command:git.init)\nTo learn more about how to use git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
+	"view.workbench.scm.emptyWorkspace": "The workspace currently open doesn't have any folders containing git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).",
+	"view.workbench.cloneRepository": "You can also clone a repository from a URL. To learn more about how to use git and source control in Azure Data Studio [read our docs](https://aka.ms/vscode-scm).\n[Clone Repository](command:git.clone)"
 }
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -1397,12 +1397,16 @@ export class CommandCenter {
 			opts.signoff = true;
 		}

+		const smartCommitChanges = config.get<'all' | 'tracked'>('smartCommitChanges');
+
 		if (
 			(
 				// no changes
 				(noStagedChanges && noUnstagedChanges)
 				// or no staged changes and not `all`
 				|| (!opts.all && noStagedChanges)
+				// no staged changes and no tracked unstaged changes
+				|| (noStagedChanges && smartCommitChanges === 'tracked' && repository.workingTreeGroup.resourceStates.every(r => r.type === Status.UNTRACKED))
 			)
 			&& !opts.empty
 		) {
@@ -1416,7 +1420,7 @@ export class CommandCenter {
 			return false;
 		}

-		if (opts.all && config.get<'all' | 'tracked'>('smartCommitChanges') === 'tracked') {
+		if (opts.all && smartCommitChanges === 'tracked') {
 			opts.all = 'tracked';
 		}

@@ -2353,7 +2357,7 @@ export class CommandCenter {
 		else if (item.previousRef === 'HEAD' && item.ref === '~') {
 			title = localize('git.title.index', '{0} (Index)', basename);
 		} else {
-			title = localize('git.title.diffRefs', '{0} ({1}) \u27f7 {0} ({2})', basename, item.shortPreviousRef, item.shortRef);
+			title = localize('git.title.diffRefs', '{0} ({1}) ⟷ {0} ({2})', basename, item.shortPreviousRef, item.shortRef);
 		}

 		return commands.executeCommand('vscode.diff', toGitUri(uri, item.previousRef), item.ref === '' ? uri : toGitUri(uri, item.ref), title);
--- a/extensions/github-authentication/src/extension.ts
+++ b/extensions/github-authentication/src/extension.ts
@@ -16,7 +16,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	await loginService.initialize();

 	vscode.authentication.registerAuthenticationProvider({
-		id: 'GitHub',
+		id: 'github',
 		displayName: 'GitHub',
 		onDidChangeSessions: onDidChangeSessions.event,
 		getSessions: () => Promise.resolve(loginService.sessions),
--- a/extensions/github-authentication/src/github.ts
+++ b/extensions/github-authentication/src/github.ts
@@ -71,7 +71,7 @@ export class GitHubAuthenticationProvider {
 						id: session.id,
 						accountName: session.accountName,
 						scopes: session.scopes,
-						accessToken: () => Promise.resolve(session.accessToken)
+						getAccessToken: () => Promise.resolve(session.accessToken)
 					};
 				});
 			} catch (e) {
@@ -84,7 +84,7 @@ export class GitHubAuthenticationProvider {

 	private async storeSessions(): Promise<void> {
 		const sessionData: SessionData[] = await Promise.all(this._sessions.map(async session => {
-			const resolvedAccessToken = await session.accessToken();
+			const resolvedAccessToken = await session.getAccessToken();
 			return {
 				id: session.id,
 				accountName: session.accountName,
@@ -111,7 +111,7 @@ export class GitHubAuthenticationProvider {
 		const userInfo = await this._githubServer.getUserInfo(token);
 		return {
 			id: userInfo.id,
-			accessToken: () => Promise.resolve(token),
+			getAccessToken: () => Promise.resolve(token),
 			accountName: userInfo.accountName,
 			scopes: scopes
 		};
--- a/extensions/image-preview/package.json
+++ b/extensions/image-preview/package.json
@@ -17,7 +17,7 @@
    "Other"
  ],
  "activationEvents": [
-    "onWebviewEditor:imagePreview.previewEditor",
+    "onCustomEditor:imagePreview.previewEditor",
    "onCommand:imagePreview.zoomIn",
    "onCommand:imagePreview.zoomOut"
  ],
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -27,7 +27,7 @@
 		"onCommand:markdown.api.render",
    "onCommand:notebook.showPreview",
 		"onWebviewPanel:markdown.preview",
-		"onWebviewEditor:vscode.markdown.preview.editor"
+		"onCustomEditor:vscode.markdown.preview.editor"
 	],
 	"contributes": {
 		"commands": [
--- a/extensions/vscode-account/package.json
+++ b/extensions/vscode-account/package.json
@@ -39,5 +39,8 @@
 		"tslint": "^5.12.1",
 		"@types/node": "^10.12.21",
 		"@types/keytar": "^4.0.1"
+	},
+	"dependencies": {
+		"vscode-nls": "^4.1.1"
 	}
 }
--- a/extensions/vscode-account/package.nls.json
+++ b/extensions/vscode-account/package.nls.json
@@ -1,6 +1,6 @@
 {
 	"displayName": "Microsoft Account",
 	"description": "Microsoft authentication provider",
-	"signIn": "Sign in",
-	"signOut": "Sign out"
+	"signIn": "Sign In",
+	"signOut": "Sign Out"
 }
--- a/extensions/vscode-account/src/AADHelper.ts
+++ b/extensions/vscode-account/src/AADHelper.ts
@@ -184,7 +184,7 @@ export class AzureActiveDirectoryService {
 	private convertToSession(token: IToken): vscode.AuthenticationSession {
 		return {
 			id: token.sessionId,
-			accessToken: () => this.resolveAccessToken(token),
+			getAccessToken: () => this.resolveAccessToken(token),
 			accountName: token.accountName,
 			scopes: token.scope.split(' ')
 		};
@@ -192,7 +192,9 @@ export class AzureActiveDirectoryService {

 	private async resolveAccessToken(token: IToken): Promise<string> {
 		if (token.accessToken && (!token.expiresAt || token.expiresAt > Date.now())) {
-			Logger.info('Token available from cache');
+			token.expiresAt
+				? Logger.info(`Token available from cache, expires in ${token.expiresAt - Date.now()} milliseconds`)
+				: Logger.info('Token available from cache');
 			return Promise.resolve(token.accessToken);
 		}

--- a/extensions/vscode-account/src/extension.ts
+++ b/extensions/vscode-account/src/extension.ts
@@ -5,6 +5,9 @@

 import * as vscode from 'vscode';
 import { AzureActiveDirectoryService, onDidChangeSessions } from './AADHelper';
+import * as nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();

 export const DEFAULT_SCOPES = 'https://management.core.windows.net/.default offline_access';

@@ -15,7 +18,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	await loginService.initialize();

 	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider({
-		id: 'MSA',
+		id: 'microsoft',
 		displayName: 'Microsoft',
 		onDidChangeSessions: onDidChangeSessions.event,
 		getSessions: () => Promise.resolve(loginService.sessions),
@@ -45,6 +48,7 @@ export async function activate(context: vscode.ExtensionContext) {
 		if (sessions.length === 1) {
 			await loginService.logout(loginService.sessions[0].id);
 			onDidChangeSessions.fire();
+			vscode.window.showInformationMessage(localize('signedOut', "Successfully signed out."));
 			return;
 		}

@@ -58,6 +62,7 @@ export async function activate(context: vscode.ExtensionContext) {
 		if (selectedSession) {
 			await loginService.logout(selectedSession.id);
 			onDidChangeSessions.fire();
+			vscode.window.showInformationMessage(localize('signedOut', "Successfully signed out."));
 			return;
 		}
 	}));
--- a/extensions/vscode-account/yarn.lock
+++ b/extensions/vscode-account/yarn.lock
@@ -635,6 +635,11 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

+vscode-nls@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
+  integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
+
 which-pm-runs@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"