Merge branch 'main' into do-198248

Author: gjsjohnmurray

ThirdPartyNotices.txt

@@ -545,33 +545,6 @@ to the base-name name of the original file, and an extension of txt, html, or si
 
 ---------------------------------------------------------
 
-freebroccolo/atom-language-swift 0.0.0 - MIT
-https://github.com/freebroccolo/atom-language-swift
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Darin Morrison
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
----------------------------------------------------------
-
----------------------------------------------------------
-
 HTML 5.1 W3C Working Draft 08 October 2015 - W3C Document License
 http://www.w3.org/TR/2015/WD-html51-20151008/
 
@@ -901,6 +874,22 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
+jtbandes/swift-tmlanguage  - MIT
+https://github.com/jtbandes/swift-tmlanguage
+
+The MIT License (MIT)
+
+Copyright 2023 Jacob Bandes-Storch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 JuliaEditorSupport/atom-language-julia 0.22.1 - MIT
 https://github.com/JuliaEditorSupport/atom-language-julia
 

cglicenses.json

@@ -308,25 +308,6 @@
 			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
 		]
 	},
-	{ // Reason: Missing license file
-		"name": "emitter-listener",
-		"fullLicenseText": [
-			"This software is released under the BSD-2-Clause license:",
-			"Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:",
-			"",
-			"1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.",
-			"",
-			"2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer",
-			"in the documentation and/or other materials provided with the distribution.",
-			"",
-			"THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT",
-			"NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE",
-			"COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,",
-			"BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED",
-			"AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT",
-			"OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-		]
-	},
 	{ // Reason: Missing license file
 		"name": "const_format_proc_macros",
 		"fullLicenseTextUri": "https://raw.githubusercontent.com/rodrimati1992/const_format_crates/b2207af46bfbd9f1a6bd12dbffd10feeea3d9fd7/LICENSE-ZLIB.md"

extensions/git/package.json

@@ -699,7 +699,7 @@
       {
         "command": "git.timeline.openCommit",
         "title": "%command.timelineOpenCommit%",
-        "icon": "$(tasklist)",
+        "icon": "$(diff-multiple)",
         "category": "Git"
       },
       {
@@ -765,13 +765,13 @@
       {
         "command": "git.viewChanges",
         "title": "%command.viewChanges%",
-        "icon": "$(tasklist)",
+        "icon": "$(diff-multiple)",
         "category": "Git"
       },
       {
         "command": "git.viewStagedChanges",
         "title": "%command.viewStagedChanges%",
-        "icon": "$(tasklist)",
+        "icon": "$(diff-multiple)",
         "category": "Git"
       }
     ],

extensions/git/src/actionButton.ts

@@ -219,6 +219,16 @@ export class CommitActionButton extends AbstractActionButton {
 			};
 		}
 
+		// Not a branch (tag, detached)
+		if (this.state.HEAD?.type === RefType.Tag || !this.state.HEAD?.name) {
+			return {
+				command: 'git.commit',
+				title: l10n.t('{0} Commit', '$(check)'),
+				tooltip: this.state.isCommitInProgress ? l10n.t('Committing Changes...') : l10n.t('Commit Changes'),
+				arguments: [this.repository.sourceControl, '']
+			};
+		}
+
 		// Commit
 		return this.postCommitCommandCenter.getPrimaryCommand();
 	}
@@ -229,6 +239,11 @@ export class CommitActionButton extends AbstractActionButton {
 			return [];
 		}
 
+		// Not a branch (tag, detached)
+		if (this.state.HEAD?.type === RefType.Tag || !this.state.HEAD?.name) {
+			return [];
+		}
+
 		// Commit
 		const commandGroups: Command[][] = [];
 		for (const commands of this.postCommitCommandCenter.getSecondaryCommands()) {

extensions/git/src/historyProvider.ts

@@ -58,28 +58,30 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 	}
 
 	private async onDidRunGitStatus(): Promise<void> {
-		if (!this.repository.HEAD?.name || !this.repository.HEAD?.commit) { return; }
-
 		// Check if HEAD has changed
-		const HEAD = this.repository.HEAD;
-
-		if (this._HEAD?.name === HEAD.name &&
-			this._HEAD?.commit === HEAD.commit &&
-			this._HEAD?.upstream?.name === HEAD.upstream?.name &&
-			this._HEAD?.upstream?.remote === HEAD.upstream?.remote &&
-			this._HEAD?.upstream?.commit === HEAD.upstream?.commit) {
+		if (this._HEAD?.name === this.repository.HEAD?.name &&
+			this._HEAD?.commit === this.repository.HEAD?.commit &&
+			this._HEAD?.upstream?.name === this.repository.HEAD?.upstream?.name &&
+			this._HEAD?.upstream?.remote === this.repository.HEAD?.upstream?.remote &&
+			this._HEAD?.upstream?.commit === this.repository.HEAD?.upstream?.commit) {
 			return;
 		}
 
 		this._HEAD = this.repository.HEAD;
 
+		// Check if HEAD supports incoming/outgoing (not a tag, not detached)
+		if (!this._HEAD?.name || !this._HEAD?.commit || this._HEAD.type === RefType.Tag) {
+			this.currentHistoryItemGroup = undefined;
+			return;
+		}
+
 		this.currentHistoryItemGroup = {
-			id: `refs/heads/${this.repository.HEAD.name}`,
-			label: this.repository.HEAD.name,
-			upstream: this.repository.HEAD.upstream ?
+			id: `refs/heads/${this._HEAD.name}`,
+			label: this._HEAD.name,
+			upstream: this._HEAD.upstream ?
 				{
-					id: `refs/remotes/${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
-					label: `${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
+					id: `refs/remotes/${this._HEAD.upstream.remote}/${this._HEAD.upstream.name}`,
+					label: `${this._HEAD.upstream.remote}/${this._HEAD.upstream.name}`,
 				} : undefined
 		};
 	}
@@ -115,7 +117,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 				description: commit.authorName,
 				icon: new ThemeIcon('git-commit'),
 				timestamp: commit.authorDate?.getTime(),
-				statistics: commit.shortStat
+				statistics: commit.shortStat ?? { files: 0, insertions: 0, deletions: 0 },
 			};
 		}));
 

extensions/microsoft-authentication/src/AADHelper.ts

@@ -536,7 +536,7 @@ export class AzureActiveDirectoryService {
 			scope: scopeData.scopeStr,
 			sessionId,
 			account: {
-				label: claims.email ?? claims.preferred_username ?? claims.unique_name ?? '[email protected]',
+				label: claims.preferred_username ?? claims.email ?? claims.unique_name ?? '[email protected]',
 				id,
 				type: claims.tid === MSA_TID || claims.tid === MSA_PASSTHRU_TID ? MicrosoftAccountType.MSA : MicrosoftAccountType.AAD
 			}

extensions/typescript-language-features/src/languageFeatures/refactor.ts

@@ -21,6 +21,8 @@ import { nulToken } from '../utils/cancellation';
 import FormattingOptionsManager from './fileConfigurationManager';
 import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration';
 import { EditorChatFollowUp, EditorChatFollowUp_Args, CompositeCommand } from './util/copilot';
+import * as PConst from '../tsServer/protocol/protocol.const';
+import { CachedResponse } from '../tsServer/cachedResponse';
 
 function toWorkspaceEdit(client: ITypeScriptServiceClient, edits: readonly Proto.FileCodeEdits[]): vscode.WorkspaceEdit {
 	const workspaceEdit = new vscode.WorkspaceEdit();
@@ -455,8 +457,44 @@ type TsCodeAction = InlinedCodeAction | MoveToFileCodeAction | SelectCodeAction;
 
 class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeAction> {
 
+	private static readonly _declarationKinds = new Set([
+		PConst.Kind.module,
+		PConst.Kind.class,
+		PConst.Kind.interface,
+		PConst.Kind.function,
+		PConst.Kind.enum,
+		PConst.Kind.type,
+		PConst.Kind.const,
+		PConst.Kind.variable,
+		PConst.Kind.let,
+	]);
+
+	private static isOnSignatureName(node: Proto.NavigationTree, range: vscode.Range): boolean {
+		if (this._declarationKinds.has(node.kind)) {
+			// Show when on the name span
+			if (node.nameSpan) {
+				const convertedSpan = typeConverters.Range.fromTextSpan(node.nameSpan);
+				if (range.intersection(convertedSpan)) {
+					return true;
+				}
+			}
+
+			// Show when on the same line as an exported symbols without a name (handles default exports)
+			if (!node.nameSpan && /\bexport\b/.test(node.kindModifiers) && node.spans.length) {
+				const convertedSpan = typeConverters.Range.fromTextSpan(node.spans[0]);
+				if (range.intersection(new vscode.Range(convertedSpan.start.line, 0, convertedSpan.start.line, Number.MAX_SAFE_INTEGER))) {
+					return true;
+				}
+			}
+		}
+
+		// Show if on the signature of any children
+		return node.childItems?.some(child => this.isOnSignatureName(child, range)) ?? false;
+	}
+
 	constructor(
 		private readonly client: ITypeScriptServiceClient,
+		private readonly cachedNavTree: CachedResponse<Proto.NavTreeResponse>,
 		private readonly formattingOptionsManager: FormattingOptionsManager,
 		commandManager: CommandManager,
 		telemetryReporter: TelemetryReporter
@@ -516,20 +554,38 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 			return undefined;
 		}
 
-		const actions = Array.from(this.convertApplicableRefactors(document, response.body, rangeOrSelection)).filter(action => {
+		const applicableRefactors = this.convertApplicableRefactors(document, response.body, rangeOrSelection);
+		const actions = coalesce(await Promise.all(Array.from(applicableRefactors, async action => {
 			if (this.client.apiVersion.lt(API.v430)) {
 				// Don't show 'infer return type' refactoring unless it has been explicitly requested
 				// https://github.com/microsoft/TypeScript/issues/42993
 				if (!context.only && action.kind?.value === 'refactor.rewrite.function.returnType') {
-					return false;
+					return undefined;
+				}
+			}
+
+			// Don't include move actions on auto light bulb unless you are on a declaration name
+			if (this.client.apiVersion.lt(API.v540) && context.triggerKind === vscode.CodeActionTriggerKind.Automatic) {
+				if (action.kind?.value === Move_NewFile.kind.value || action.kind?.value === Move_File.kind.value) {
+					const file = this.client.toOpenTsFilePath(document);
+					if (!file) {
+						return undefined;
+					}
+
+					const navTree = await this.cachedNavTree.execute(document, () => this.client.execute('navtree', { file }, token));
+					if (navTree.type !== 'response' || !navTree.body || !TypeScriptRefactorProvider.isOnSignatureName(navTree.body, rangeOrSelection)) {
+						return undefined;
+					}
 				}
 			}
-			return true;
-		});
+
+			return action;
+		})));
 
 		if (!context.only) {
 			return actions;
 		}
+
 		return this.pruneInvalidActions(this.appendInvalidActions(actions), context.only, /* numberOfInvalid = */ 5);
 	}
 
@@ -719,6 +775,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 export function register(
 	selector: DocumentSelector,
 	client: ITypeScriptServiceClient,
+	cachedNavTree: CachedResponse<Proto.NavTreeResponse>,
 	formattingOptionsManager: FormattingOptionsManager,
 	commandManager: CommandManager,
 	telemetryReporter: TelemetryReporter,
@@ -727,7 +784,7 @@ export function register(
 		requireSomeCapability(client, ClientCapability.Semantic),
 	], () => {
 		return vscode.languages.registerCodeActionsProvider(selector.semantic,
-			new TypeScriptRefactorProvider(client, formattingOptionsManager, commandManager, telemetryReporter),
+			new TypeScriptRefactorProvider(client, cachedNavTree, formattingOptionsManager, commandManager, telemetryReporter),
 			TypeScriptRefactorProvider.metadata);
 	});
 }

extensions/typescript-language-features/src/languageProvider.ts

@@ -57,17 +57,17 @@ export default class LanguageProvider extends Disposable {
 	private async registerProviders(): Promise<void> {
 		const selector = this.documentSelector;
 
-		const cachedResponse = new CachedResponse();
+		const cachedNavTreeResponse = new CachedResponse();
 
 		await Promise.all([
 			import('./languageFeatures/callHierarchy').then(provider => this._register(provider.register(selector, this.client))),
-			import('./languageFeatures/codeLens/implementationsCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedResponse))),
-			import('./languageFeatures/codeLens/referencesCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedResponse))),
+			import('./languageFeatures/codeLens/implementationsCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedNavTreeResponse))),
+			import('./languageFeatures/codeLens/referencesCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedNavTreeResponse))),
 			import('./languageFeatures/completions').then(provider => this._register(provider.register(selector, this.description, this.client, this.typingsStatus, this.fileConfigurationManager, this.commandManager, this.telemetryReporter, this.onCompletionAccepted))),
 			import('./languageFeatures/definitions').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/directiveCommentCompletions').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/documentHighlight').then(provider => this._register(provider.register(selector, this.client))),
-			import('./languageFeatures/documentSymbol').then(provider => this._register(provider.register(selector, this.client, cachedResponse))),
+			import('./languageFeatures/documentSymbol').then(provider => this._register(provider.register(selector, this.client, cachedNavTreeResponse))),
 			import('./languageFeatures/fileReferences').then(provider => this._register(provider.register(this.client, this.commandManager))),
 			import('./languageFeatures/fixAll').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.client.diagnosticsManager))),
 			import('./languageFeatures/folding').then(provider => this._register(provider.register(selector, this.client))),
@@ -80,7 +80,7 @@ export default class LanguageProvider extends Disposable {
 			import('./languageFeatures/mappedCodeEditProvider').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/organizeImports').then(provider => this._register(provider.register(selector, this.client, this.commandManager, this.fileConfigurationManager, this.telemetryReporter))),
 			import('./languageFeatures/quickFix').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.client.diagnosticsManager, this.telemetryReporter))),
-			import('./languageFeatures/refactor').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.telemetryReporter))),
+			import('./languageFeatures/refactor').then(provider => this._register(provider.register(selector, this.client, cachedNavTreeResponse, this.fileConfigurationManager, this.commandManager, this.telemetryReporter))),
 			import('./languageFeatures/references').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/rename').then(provider => this._register(provider.register(selector, this.description, this.client, this.fileConfigurationManager))),
 			import('./languageFeatures/semanticTokens').then(provider => this._register(provider.register(selector, this.client))),

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.85.0",
-  "distro": "9c941fd7c7cf0d320ce7963afbd351a741fa468d",
+  "distro": "244fe949c0c4aa2f05056992f4d0eee11cb12ab6",
   "author": {
     "name": "Microsoft Corporation"
   },

product.json

@@ -50,8 +50,8 @@
 		},
 		{
 			"name": "ms-vscode.js-debug",
-			"version": "1.84.0",
-			"sha256": "a57691eb4440e549edba7472c0313e94f24d46ebe1ede18784b552fc5d11e596",
+			"version": "1.85.0",
+			"sha256": "85a97d373a6f92359f5db7bfc5a2fa6c5763b22c6ad07c962dfe32c84a079f3b",
 			"repo": "https://github.com/microsoft/vscode-js-debug",
 			"metadata": {
 				"id": "25629058-ddac-4e17-abba-74678e126c5d",
@@ -66,8 +66,8 @@
 		},
 		{
 			"name": "ms-vscode.vscode-js-profile-table",
-			"version": "1.0.7",
-			"sha256": "76924898456e45c1071a0ac4d31990bb740b689177665df915f3d39c7b767ba7",
+			"version": "1.0.8",
+			"sha256": "ca30069e21fbf576b49638ff8ff7c316b028c2faca924c23526737c65b8762bf",
 			"repo": "https://github.com/microsoft/vscode-js-profile-visualizer",
 			"metadata": {
 				"id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb",