From 618a091f90e69dc905bfa08be9d323e79c9ad989 Mon Sep 17 00:00:00 2001 From: nknguyenhc <87511888+nknguyenhc@users.noreply.github.com> Date: Fri, 28 Mar 2025 23:00:30 +0800 Subject: [PATCH] Remove sending of extension URI --- .../html-language-features/client/src/htmlClient.ts | 12 +++--------- .../html-language-features/server/src/htmlServer.ts | 4 +--- .../server/src/modes/javascriptMode.ts | 7 ++----- .../server/src/modes/languageModes.ts | 11 +++-------- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/extensions/html-language-features/client/src/htmlClient.ts b/extensions/html-language-features/client/src/htmlClient.ts index 229cec67305..7b69c795f90 100644 --- a/extensions/html-language-features/client/src/htmlClient.ts +++ b/extensions/html-language-features/client/src/htmlClient.ts @@ -95,12 +95,7 @@ export async function startClient(context: ExtensionContext, newLanguageClient: const languageParticipants = getLanguageParticipants(); context.subscriptions.push(languageParticipants); - const extensionUri = { - scheme: context.extensionUri.scheme, - path: context.extensionUri.path, - }; - - let client: Disposable | undefined = await startClientWithParticipants(languageParticipants, newLanguageClient, outputChannel, runtime, extensionUri); + let client: Disposable | undefined = await startClientWithParticipants(languageParticipants, newLanguageClient, outputChannel, runtime); const promptForLinkedEditingKey = 'html.promptForLinkedEditing'; if (extensions.getExtension('formulahendry.auto-rename-tag') !== undefined && (context.globalState.get(promptForLinkedEditingKey) !== false)) { @@ -133,7 +128,7 @@ export async function startClient(context: ExtensionContext, newLanguageClient: const oldClient = client; client = undefined; await oldClient.dispose(); - client = await startClientWithParticipants(languageParticipants, newLanguageClient, outputChannel, runtime, extensionUri); + client = await startClientWithParticipants(languageParticipants, newLanguageClient, outputChannel, runtime); } }, 2000); }); @@ -147,7 +142,7 @@ export async function startClient(context: ExtensionContext, newLanguageClient: }; } -async function startClientWithParticipants(languageParticipants: LanguageParticipants, newLanguageClient: LanguageClientConstructor, outputChannel: OutputChannel, runtime: Runtime, extensionUri: { scheme: string; path: string }): Promise { +async function startClientWithParticipants(languageParticipants: LanguageParticipants, newLanguageClient: LanguageClientConstructor, outputChannel: OutputChannel, runtime: Runtime): Promise { const toDispose: Disposable[] = []; @@ -163,7 +158,6 @@ async function startClientWithParticipants(languageParticipants: LanguagePartici configurationSection: ['html', 'css', 'javascript', 'js/ts'], // the settings to synchronize }, initializationOptions: { - extensionUri: extensionUri, embeddedLanguages, handledSchemas: ['file'], provideFormatter: false, // tell the server to not provide formatting capability and ignore the `html.format.enable` setting. diff --git a/extensions/html-language-features/server/src/htmlServer.ts b/extensions/html-language-features/server/src/htmlServer.ts index 2831bedacb8..edf6e493d74 100644 --- a/extensions/html-language-features/server/src/htmlServer.ts +++ b/extensions/html-language-features/server/src/htmlServer.ts @@ -153,9 +153,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) get folders() { return workspaceFolders; } }; - const extensionUri = initializationOptions?.extensionUri; - - languageModes = getLanguageModes(initializationOptions?.embeddedLanguages || { css: true, javascript: true }, workspace, params.capabilities, fileSystemProvider, extensionUri); + languageModes = getLanguageModes(initializationOptions?.embeddedLanguages || { css: true, javascript: true }, workspace, params.capabilities, fileSystemProvider); const dataPaths: string[] = initializationOptions?.dataPaths || []; fetchHTMLDataProviders(dataPaths, customDataRequestService).then(dataProviders => { diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts index 4c68e898add..f8afddd2c65 100644 --- a/extensions/html-language-features/server/src/modes/javascriptMode.ts +++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts @@ -8,7 +8,7 @@ import { SymbolInformation, SymbolKind, CompletionItem, Location, SignatureHelp, SignatureInformation, ParameterInformation, Definition, TextEdit, TextDocument, Diagnostic, DiagnosticSeverity, Range, CompletionItemKind, Hover, DocumentHighlight, DocumentHighlightKind, CompletionList, Position, FormattingOptions, FoldingRange, FoldingRangeKind, SelectionRange, - LanguageMode, Settings, SemanticTokenData, Workspace, DocumentContext, CompletionItemData, isCompletionItemData, Uri, FILE_PROTOCOL + LanguageMode, Settings, SemanticTokenData, Workspace, DocumentContext, CompletionItemData, isCompletionItemData, FILE_PROTOCOL } from './languageModes'; import { getWordAtText, isWhitespaceOnly, repeat } from '../utils/strings'; import { HTMLDocumentRegions } from './embeddedSupport'; @@ -104,7 +104,7 @@ const ignoredErrors = [ 2792, /* Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_the_paths_option */ ]; -export function getJavaScriptMode(documentRegions: LanguageModelCache, languageId: 'javascript' | 'typescript', workspace: Workspace, extensionUri?: Uri): LanguageMode { +export function getJavaScriptMode(documentRegions: LanguageModelCache, languageId: 'javascript' | 'typescript', workspace: Workspace): LanguageMode { const jsDocuments = getLanguageModelCache(10, 60, document => documentRegions.get(document).getEmbeddedDocument(languageId)); const host = getLanguageServiceHost(languageId === 'javascript' ? ts.ScriptKind.JS : ts.ScriptKind.TS); @@ -315,9 +315,6 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache {