Merge branch 'main' into joh/swc

Author: jrieken

.mailmap

@@ -1,6 +1,4 @@
-Eric Amodio <[email protected]> Eric Amodio <[email protected]>
-Eric Amodio <[email protected]> Eric Amodio <[email protected]>
 Daniel Imms <[email protected]> Daniel Imms <[email protected]>
-Tanha Kabir <[email protected]> Tanha Kabir <[email protected]>
 Raymond Zhao <[email protected]>
 Tyler Leonhardt <[email protected]> Tyler Leonhardt <[email protected]>
+João Moreno <[email protected]> João Moreno <[email protected]>

.vscode/notebooks/api.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"August 2022\""
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"September 2022\""
   },
   {
     "kind": 1,

extensions/git/src/commands.ts

@@ -457,7 +457,7 @@ export class CommandCenter {
 		);
 	}
 
-	async cloneRepository(url?: string, parentPath?: string, options: { recursive?: boolean } = {}): Promise<void> {
+	async cloneRepository(url?: string, parentPath?: string, options: { recursive?: boolean; ref?: string } = {}): Promise<void> {
 		if (!url || typeof url !== 'string') {
 			url = await pickRemoteSource({
 				providerLabel: provider => localize('clonefrom', "Clone from {0}", provider.name),
@@ -519,6 +519,11 @@ export class CommandCenter {
 				(progress, token) => this.git.clone(url!, { parentPath: parentPath!, progress, recursive: options.recursive }, token)
 			);
 
+			if (options.ref !== undefined) {
+				const repository = this.model.getRepository(Uri.file(repositoryPath));
+				await repository?.checkout(options.ref);
+			}
+
 			const config = workspace.getConfiguration('git');
 			const openAfterClone = config.get<'always' | 'alwaysNewWindow' | 'whenNoFolderOpen' | 'prompt'>('openAfterClone');
 
@@ -596,8 +601,8 @@ export class CommandCenter {
 	}
 
 	@command('git.clone')
-	async clone(url?: string, parentPath?: string): Promise<void> {
-		await this.cloneRepository(url, parentPath);
+	async clone(url?: string, parentPath?: string, options?: { ref?: string }): Promise<void> {
+		await this.cloneRepository(url, parentPath, options);
 	}
 
 	@command('git.cloneRecursive')

extensions/git/src/protocolHandler.ts

@@ -25,6 +25,7 @@ export class GitProtocolHandler implements UriHandler {
 
 	private clone(uri: Uri): void {
 		const data = querystring.parse(uri.query);
+		const ref = data.ref;
 
 		if (!data.url) {
 			console.warn('Failed to open URI:', uri);
@@ -36,6 +37,11 @@ export class GitProtocolHandler implements UriHandler {
 			return;
 		}
 
+		if (ref !== undefined && typeof ref !== 'string') {
+			console.warn('Failed to open URI:', uri);
+			return;
+		}
+
 		let cloneUri: Uri;
 		try {
 			let rawUri = Array.isArray(data.url) ? data.url[0] : data.url;
@@ -56,7 +62,7 @@ export class GitProtocolHandler implements UriHandler {
 			return;
 		}
 
-		commands.executeCommand('git.clone', cloneUri.toString(true));
+		commands.executeCommand('git.clone', cloneUri.toString(true), undefined, { ref: ref });
 	}
 
 	dispose(): void {

extensions/ipynb/package.json

@@ -9,7 +9,6 @@
 		"vscode": "^1.57.0"
 	},
 	"enabledApiProposals": [
-    "notebookWorkspaceEdit",
     "documentPaste"
 	],
 	"activationEvents": [

extensions/ipynb/tsconfig.json

@@ -9,7 +9,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.notebookWorkspaceEdit.d.ts",
 		"../../src/vscode-dts/vscode.proposed.documentPaste.d.ts"
 	]
 }

extensions/markdown-language-features/server/README.md

@@ -23,12 +23,20 @@ This server uses the [Markdown Language Service](https://github.com/microsoft/vs
 
 - [Find all references](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_references) to headers and links across all Markdown files in the workspace.
 
+- [Go to definition](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_definition) from links to headers or link definitions.
+
 - [Rename](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_rename) of headers and links across all Markdown files in the workspace.
 
-- [Go to definition](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_definition) from links to headers or link definitions.
+- Find all references to a file. Uses a custom `markdown/getReferencesToFileInWorkspace` message.
 
-- (experimental) [Pull diagnostics (validation)](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_pullDiagnostics) for links.
+- [Code Actions](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_codeAction)
 
+	- Organize link definitions source action.
+	- Extract link to definition refactoring.
+
+- (experimental) Updating links when a file is moved / renamed. Uses a custom `markdown/getEditForFileRenames` message.
+
+- (experimental) [Pull diagnostics (validation)](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_pullDiagnostics) for links.
 
 
 ## Client requirements

extensions/markdown-language-features/server/package.json

@@ -13,7 +13,8 @@
     "vscode-languageserver": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.5",
     "vscode-languageserver-types": "^3.17.1",
-    "vscode-markdown-languageservice": "^0.0.1",
+    "vscode-markdown-languageservice": "^0.1.0-alpha.1",
+    "vscode-nls": "^5.0.1",
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {

extensions/markdown-language-features/server/src/server.ts

@@ -7,6 +7,7 @@ import { CancellationToken, Connection, InitializeParams, InitializeResult, Note
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as lsp from 'vscode-languageserver-types';
 import * as md from 'vscode-markdown-languageservice';
+import * as nls from 'vscode-nls';
 import { URI } from 'vscode-uri';
 import { getLsConfiguration, LsConfiguration } from './config';
 import { ConfigurationManager } from './configuration';
@@ -16,8 +17,11 @@ import * as protocol from './protocol';
 import { IDisposable } from './util/dispose';
 import { VsCodeClientWorkspace } from './workspace';
 
+const localize = nls.loadMessageBundle();
+
 interface MdServerInitializationOptions extends LsConfiguration { }
 
+const organizeLinkDefKind = 'source.organizeLinkDefinitions';
 export async function startServer(connection: Connection) {
 	const documents = new TextDocuments(TextDocument);
 	const notebooks = new NotebookDocuments(documents);
@@ -61,6 +65,7 @@ export async function startServer(connection: Connection) {
 					interFileDependencies: true,
 					workspaceDiagnostics: false,
 				},
+				codeActionProvider: { resolveProvider: true },
 				completionProvider: { triggerCharacters: ['.', '/', '#'] },
 				definitionProvider: true,
 				documentLinkProvider: { resolveProvider: true },
@@ -97,7 +102,7 @@ export async function startServer(connection: Connection) {
 		if (!document) {
 			return [];
 		}
-		return mdLs!.getDocumentSymbols(document, token);
+		return mdLs!.getDocumentSymbols(document, { includeLinkDefinitions: true }, token);
 	});
 
 	connection.onFoldingRanges(async (params, token): Promise<lsp.FoldingRange[]> => {
@@ -152,6 +157,48 @@ export async function startServer(connection: Connection) {
 		return mdLs!.getRenameEdit(document, params.position, params.newName, token);
 	});
 
+	interface OrganizeLinkActionData {
+		readonly uri: string;
+	}
+
+	connection.onCodeAction(async (params, token) => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return undefined;
+		}
+
+		if (params.context.only?.some(kind => kind === 'source' || kind.startsWith('source.'))) {
+			const action: lsp.CodeAction = {
+				title: localize('organizeLinkDefAction.title', "Organize link definitions"),
+				kind: organizeLinkDefKind,
+				data: <OrganizeLinkActionData>{ uri: document.uri }
+			};
+			return [action];
+		}
+
+		return mdLs!.getCodeActions(document, params.range, params.context, token);
+	});
+
+	connection.onCodeActionResolve(async (codeAction, token) => {
+		if (codeAction.kind === organizeLinkDefKind) {
+			const data = codeAction.data as OrganizeLinkActionData;
+			const document = documents.get(data.uri);
+			if (!document) {
+				return codeAction;
+			}
+
+			const edits = (await mdLs?.organizeLinkDefinitions(document, { removeUnused: true }, token)) || [];
+			codeAction.edit = {
+				changes: {
+					[data.uri]: edits
+				}
+			};
+			return codeAction;
+		}
+
+		return codeAction;
+	});
+
 	connection.onRequest(protocol.getReferencesToFileInWorkspace, (async (params: { uri: string }, token: CancellationToken) => {
 		return mdLs!.getFileReferences(URI.parse(params.uri), token);
 	}));

extensions/markdown-language-features/server/src/util/dispose.ts

@@ -3,14 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export class MultiDisposeError extends Error {
-	constructor(
-		public readonly errors: any[]
-	) {
-		super(`Encountered errors while disposing of store. Errors: [${errors.join(', ')}]`);
-	}
-}
-
 export function disposeAll(disposables: Iterable<IDisposable>) {
 	const errors: any[] = [];
 
@@ -25,7 +17,7 @@ export function disposeAll(disposables: Iterable<IDisposable>) {
 	if (errors.length === 1) {
 		throw errors[0];
 	} else if (errors.length > 1) {
-		throw new MultiDisposeError(errors);
+		throw new AggregateError(errors, 'Encountered errors while disposing of store');
 	}
 }
 
@@ -60,21 +52,3 @@ export abstract class Disposable {
 	}
 }
 
-export class DisposableStore extends Disposable {
-	private readonly items = new Set<IDisposable>();
-
-	public override dispose() {
-		super.dispose();
-		disposeAll(this.items);
-		this.items.clear();
-	}
-
-	public add<T extends IDisposable>(item: T): T {
-		if (this.isDisposed) {
-			console.warn('Adding to disposed store. Item will be leaked');
-		}
-
-		this.items.add(item);
-		return item;
-	}
-}