Merge branch 'main' into fix#232381_changeGoToSymbolKeyBinding

build/azure-pipelines/common/sign.ts

@@ -138,6 +138,17 @@ export function main([esrpCliPath, type, folderPath, pattern]: string[]) {
 	const tmp = new Temp();
 	process.on('exit', () => tmp.dispose());
 
+	const key = crypto.randomBytes(32);
+	const iv = crypto.randomBytes(16);
+	const cipher = crypto.createCipheriv('aes-256-cbc', key, iv);
+	const encryptedToken = cipher.update(process.env['SYSTEM_ACCESSTOKEN']!.trim(), 'utf8', 'hex') + cipher.final('hex');
+
+	const encryptionDetailsPath = tmp.tmpNameSync();
+	fs.writeFileSync(encryptionDetailsPath, JSON.stringify({ key: key.toString('hex'), iv: iv.toString('hex') }));
+
+	const encryptedTokenPath = tmp.tmpNameSync();
+	fs.writeFileSync(encryptedTokenPath, encryptedToken);
+
 	const patternPath = tmp.tmpNameSync();
 	fs.writeFileSync(patternPath, pattern);
 
@@ -157,7 +168,8 @@ export function main([esrpCliPath, type, folderPath, pattern]: string[]) {
 		managedIdentityTenantId: process.env['VSCODE_ESRP_TENANT_ID'],
 		serviceConnectionId: process.env['VSCODE_ESRP_SERVICE_CONNECTION_ID'],
 		tempDirectory: os.tmpdir(),
-		systemAccessToken: process.env['SYSTEM_ACCESSTOKEN']
+		systemAccessToken: encryptedTokenPath,
+		encryptionKey: encryptionDetailsPath
 	};
 
 	const args = [

extensions/emmet/src/test/completion.test.ts

@@ -22,14 +22,14 @@ suite('Tests for completion in CSS embedded in HTML', () => {
 	});
 
 	// https://github.com/microsoft/vscode/issues/79766
-	test('#79766, correct region determination', async () => {
+	test('microsoft/vscode#79766, correct region determination', async () => {
 		await testCompletionProvider('html', `<div style="color: #000">di|</div>`, [
 			{ label: 'div', documentation: `<div>|</div>` }
 		]);
 	});
 
 	// https://github.com/microsoft/vscode/issues/86941
-	test('#86941, widows should be completed after width', async () => {
+	test('microsoft/vscode#86941, widows should be completed after width', async () => {
 		await testCompletionProvider('css', `.foo { wi| }`, [
 			{ label: 'width: ;', documentation: `width: |;` }
 		]);
@@ -56,21 +56,28 @@ suite('Tests for completion in CSS embedded in HTML', () => {
 	});
 
 	// https://github.com/microsoft/vscode/issues/117020
-	test('#117020, ! at end of abbreviation should have completion', async () => {
+	test('microsoft/vscode#117020, ! at end of abbreviation should have completion', async () => {
 		await testCompletionProvider('css', `.foo { bdbn!| }`, [
 			{ label: 'border-bottom: none !important;', documentation: `border-bottom: none !important;` }
 		]);
 	});
 
 	// https://github.com/microsoft/vscode/issues/138461
-	test('#138461, JSX array noise', async () => {
+	test('microsoft/vscode#138461, JSX array noise', async () => {
 		await testCompletionProvider('jsx', 'a[i]', undefined);
 		await testCompletionProvider('jsx', 'Component[a b]', undefined);
 		await testCompletionProvider('jsx', '[a, b]', undefined);
 		await testCompletionProvider('jsx', '[a=b]', [
 			{ label: '<div a="b"></div>', documentation: '<div a="b">|</div>' }
 		]);
 	});
+
+	// https://github.com/microsoft/vscode-emmet-helper/pull/90
+	test('microsoft/vscode-emmet-helper#90', async () => {
+		await testCompletionProvider('html', 'dialog', [
+			{ label: '<dialog></dialog>', documentation: '<dialog>|</dialog>' }
+		]);
+	});
 });
 
 interface TestCompletionItem {

extensions/git/package.json

@@ -3197,6 +3197,15 @@
           "tags": [
             "experimental"
           ]
+        },
+        "git.blame.statusBarItem.enabled": {
+          "type": "boolean",
+          "default": false,
+          "markdownDescription": "%config.blameStatusBarItem.enabled%",
+          "scope": "resource",
+          "tags": [
+            "experimental"
+          ]
         }
       }
     },

extensions/git/package.nls.json

@@ -276,7 +276,8 @@
 	"config.publishBeforeContinueOn.never": "Never publish unpublished Git state when using Continue Working On from a Git repository",
 	"config.publishBeforeContinueOn.prompt": "Prompt to publish unpublished Git state when using Continue Working On from a Git repository",
 	"config.similarityThreshold": "Controls the threshold of the similarity index (the amount of additions/deletions compared to the file's size) for changes in a pair of added/deleted files to be considered a rename. **Note:** Requires Git version `2.18.0` or later.",
-	"config.blameEditorDecoration.enabled": "Controls whether to show git blame information in the editor using editor decorations",
+	"config.blameEditorDecoration.enabled": "Controls whether to show git blame information in the editor using editor decorations.",
+	"config.blameStatusBarItem.enabled": "Controls whether to show git blame information in the status bar.",
 	"submenu.explorer": "Git",
 	"submenu.commit": "Commit",
 	"submenu.commit.amend": "Amend",

extensions/git/src/api/api1.ts

@@ -12,7 +12,7 @@ import { toGitUri } from '../uri';
 import { GitExtensionImpl } from './extension';
 import { GitBaseApi } from '../git-base';
 import { PickRemoteSourceOptions } from './git-base';
-import { Operation, OperationResult } from '../operation';
+import { OperationKind, OperationResult } from '../operation';
 
 class ApiInputBox implements InputBox {
 	set value(value: string) { this._inputBox.value = value; }
@@ -67,7 +67,11 @@ export class ApiRepository implements Repository {
 	readonly state: RepositoryState = new ApiRepositoryState(this.repository);
 	readonly ui: RepositoryUIState = new ApiRepositoryUIState(this.repository.sourceControl);
 
-	readonly onDidCommit: Event<void> = mapEvent<OperationResult, void>(filterEvent(this.repository.onDidRunOperation, e => e.operation === Operation.Commit), () => null);
+	readonly onDidCommit: Event<void> = mapEvent<OperationResult, void>(
+		filterEvent(this.repository.onDidRunOperation, e => e.operation.kind === OperationKind.Commit), () => null);
+
+	readonly onDidCheckout: Event<void> = mapEvent<OperationResult, void>(
+		filterEvent(this.repository.onDidRunOperation, e => e.operation.kind === OperationKind.Checkout || e.operation.kind === OperationKind.CheckoutTracking), () => null);
 
 	constructor(readonly repository: BaseRepository) { }