Merge pull request microsoft#259623 from mjbvz/gothic-turkey

Move token to be last argument

Author: mjbvz

src/vs/workbench/contrib/extensions/browser/extensionEditor.ts

@@ -750,7 +750,7 @@ export class ExtensionEditor extends EditorPane {
 			return '';
 		}
 
-		const content = await renderMarkdownDocument(contents, this.extensionService, this.languageService, { shouldSanitize: extension.type !== ExtensionType.System, token });
+		const content = await renderMarkdownDocument(contents, this.extensionService, this.languageService, { shouldSanitize: extension.type !== ExtensionType.System }, token);
 		if (token?.isCancellationRequested) {
 			return '';
 		}

src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts

@@ -192,7 +192,6 @@ interface IRenderMarkdownDocumentOptions {
 	readonly shouldSanitize?: boolean;
 	readonly allowUnknownProtocols?: boolean;
 	readonly markedExtensions?: marked.MarkedExtension[];
-	readonly token?: CancellationToken;
 }
 
 /**
@@ -204,7 +203,8 @@ export async function renderMarkdownDocument(
 	text: string,
 	extensionService: IExtensionService,
 	languageService: ILanguageService,
-	options?: IRenderMarkdownDocumentOptions
+	options?: IRenderMarkdownDocumentOptions,
+	token?: CancellationToken,
 ): Promise<string> {
 	const m = new marked.Marked(
 		MarkedHighlight.markedHighlight({
@@ -215,7 +215,7 @@ export async function renderMarkdownDocument(
 				}
 
 				await extensionService.whenInstalledExtensionsRegistered();
-				if (options?.token?.isCancellationRequested) {
+				if (token?.isCancellationRequested) {
 					return '';
 				}
 

src/vs/workbench/contrib/mcp/browser/mcpServerEditor.ts

@@ -529,7 +529,7 @@ export class McpServerEditor extends EditorPane {
 			return '';
 		}
 
-		const content = await renderMarkdownDocument(contents, this.extensionService, this.languageService, { shouldSanitize: true, token });
+		const content = await renderMarkdownDocument(contents, this.extensionService, this.languageService, { shouldSanitize: true }, token);
 		if (token?.isCancellationRequested) {
 			return '';
 		}