@lvce-editor/extension-management-worker 4.27.0 → 4.28.0

package/dist/extensionManagementWorkerMain.js

@@ -2328,6 +2328,73 @@ const executeExtensionCommand = async (extensionsState, id, ...args) => {
   };
 };
 
+const hasUriScheme = value => {
+  return /^[a-z][a-z\d+.-]*:/i.test(value);
+};
+const toExtensionBaseUri = extensionPath => {
+  if (hasUriScheme(extensionPath)) {
+    return extensionPath.endsWith('/') ? extensionPath : `${extensionPath}/`;
+  }
+  if (extensionPath.startsWith('/')) {
+    return `file://${extensionPath}/`;
+  }
+  throw new Error(`Language server extension path must be an absolute path or URI`);
+};
+const resolveLanguageServerUri = (extension, languageServerUri) => {
+  if (languageServerUri.startsWith('/')) {
+    return `file://${languageServerUri}`;
+  }
+  if (hasUriScheme(languageServerUri)) {
+    return languageServerUri;
+  }
+  const extensionPath = extension.uri || extension.path || '';
+  return new URL(languageServerUri, toExtensionBaseUri(extensionPath)).href;
+};
+const getContribution = (extension, languageId) => {
+  return extension.languageServers?.find(contribution => contribution.languageId === languageId);
+};
+const getRegisteredLanguageServer = (snapshot, contribution, languageId) => {
+  const languageServer = snapshot.languageServers.find(registered => registered.id === contribution.id && registered.languageId === languageId);
+  if (!languageServer) {
+    throw new Error(`language server ${contribution.id || '<unknown>'} is contributed in extension.json but not registered`);
+  }
+  return languageServer;
+};
+const sanitizeCompletionItem = item => {
+  if (!item || typeof item !== 'object' || typeof item.label !== 'string') {
+    return undefined;
+  }
+  const snippet = item.insertText || item.textEdit?.newText || item.label;
+  return {
+    ...item,
+    flags: 0,
+    kind: typeof item.kind === 'number' ? item.kind : 0,
+    label: item.label,
+    matches: [],
+    snippet
+  };
+};
+const executeLanguageServerCompletion = async (rpc, extension, textDocument, offset) => {
+  if (typeof textDocument.text !== 'string' || typeof textDocument.uri !== 'string') {
+    return [];
+  }
+  const contribution = getContribution(extension, textDocument.languageId);
+  if (!contribution) {
+    return [];
+  }
+  const snapshot = await rpc.invoke('ExtensionApi.getLanguageServerRegistrySnapshot');
+  const languageServer = getRegisteredLanguageServer(snapshot, contribution, textDocument.languageId);
+  const uri = resolveLanguageServerUri(extension, languageServer.uri);
+  const result = await invoke$1('LanguageServer.complete', {
+    argv: languageServer.argv,
+    id: `${extension.id || extension.uri || extension.path || 'extension'}.${languageServer.id}`,
+    offset,
+    textDocument,
+    uri
+  });
+  return result.map(sanitizeCompletionItem).filter(item => item !== undefined);
+};
+
 const getOrigin = () => {
   return globalThis.location?.origin || 'http://localhost';
 };
@@ -2353,13 +2420,23 @@ const getRpc$1 = async (extension, assetDir, platform) => {
 const contributesCompletionProvider = (extension, languageId) => {
   return Array.isArray(extension.completionProviders) && extension.completionProviders.some(provider => provider.languageId === languageId);
 };
+const contributesLanguageServer = (extension, languageId) => {
+  return Array.isArray(extension.languageServers) && extension.languageServers.some(languageServer => languageServer.languageId === languageId);
+};
 const getMatchingExtensions$4 = async (extensionsState, textDocument, assetDir, platform) => {
   const extensions = await getAllExtensionsWithState(extensionsState, assetDir, platform);
-  return extensions.filter(extension => isExtensionIsolated(extension) && contributesCompletionProvider(extension, textDocument.languageId));
+  return extensions.filter(extension => isExtensionIsolated(extension) && (contributesCompletionProvider(extension, textDocument.languageId) || contributesLanguageServer(extension, textDocument.languageId)));
 };
 const executeRpcCompletionProvider = async (rpc, textDocument, args) => {
   return rpc.invoke('ExtensionApi.executeCompletionProvider', textDocument, ...args);
 };
+const executeExtensionCompletionProvider = async (rpc, extension, textDocument, args) => {
+  if (contributesLanguageServer(extension, textDocument.languageId)) {
+    const offset = typeof args[0] === 'number' ? args[0] : 0;
+    return executeLanguageServerCompletion(rpc, extension, textDocument, offset);
+  }
+  return executeRpcCompletionProvider(rpc, textDocument, args);
+};
 const executeRpcResolveCompletionItemProvider = async (rpc, textDocument, args) => {
   return rpc.invoke('ExtensionApi.executeResolveCompletionItemProvider', textDocument, ...args);
 };
@@ -2370,7 +2447,7 @@ const executeCompletionProvider = async (extensionsState, textDocument, ...args)
   } = await getRuntimeContext('', extensionsState.platform);
   const extensions = await getMatchingExtensions$4(extensionsState, textDocument, assetDir, platform);
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
-  const results = await Promise.all(rpcs.map(rpc => executeRpcCompletionProvider(rpc, textDocument, args)));
+  const results = await Promise.all(rpcs.map((rpc, index) => executeExtensionCompletionProvider(rpc, extensions[index], textDocument, args)));
   return results[0] || [];
 };
 const executeResolveCompletionItemProvider = async (extensionsState, textDocument, ...args) => {
@@ -2378,7 +2455,8 @@ const executeResolveCompletionItemProvider = async (extensionsState, textDocumen
     assetDir,
     platform
   } = await getRuntimeContext('', extensionsState.platform);
-  const extensions = await getMatchingExtensions$4(extensionsState, textDocument, assetDir, platform);
+  const matchingExtensions = await getMatchingExtensions$4(extensionsState, textDocument, assetDir, platform);
+  const extensions = matchingExtensions.filter(extension => contributesCompletionProvider(extension, textDocument.languageId));
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
   const results = await Promise.all(rpcs.map(rpc => executeRpcResolveCompletionItemProvider(rpc, textDocument, args)));
   return results[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-management-worker",
-  "version": "4.27.0",
+  "version": "4.28.0",
   "description": "Webworker for the Extension Management functionality in Lvce Editor.",
   "keywords": [
     "web-worker"