Migrate Vue language server to 3.x

Signed-off-by: Dawid Pakuła <[email protected]>

Author: zulus

org.eclipse.wildwebdeveloper/package.json

@@ -4,15 +4,15 @@
     "astro-vscode" : "2.15.4",
     "firefox-debugadapter": "2.15.0",
     "typescript": "5.9.2",
-    "typescript-language-server": "4.3.4",
+    "typescript-language-server": "4.4.0",
     "typescript-lit-html-plugin": "0.9.0",
     "typescript-plugin-css-modules": "5.2.0",
     "yaml-language-server": "1.18.0",
     "vscode-css-languageservice": "6.3.7",
     "vscode-html-languageservice": "5.5.1",
     "vscode-json-languageservice": "5.6.1",
-    "@vue/language-server" : "2.2.10",
-    "@vue/typescript-plugin" : "2.2.10",
+    "@vue/language-server" : "3.0.6",
+    "@vue/typescript-plugin" : "3.0.6",
     "fsevents" : "2.3.3",
     "vscode-css-languageserver": "file:target/vscode-css-languageserver-1.0.0.tgz",
     "vscode-html-languageserver": "file:target/vscode-html-languageserver-1.0.0.tgz",

org.eclipse.wildwebdeveloper/plugin.xml

@@ -377,6 +377,7 @@
       <server
             class="org.eclipse.wildwebdeveloper.jsts.JSTSLanguageServer"
             clientImpl="org.eclipse.wildwebdeveloper.jsts.JSTSLanguageClientImpl"
+            serverInterface="org.eclipse.wildwebdeveloper.jsts.JSTSLanguageServerAPI"
             id="org.eclipse.wildwebdeveloper.jsts"
             label="JavaScript-TypeScript Language Server">
       </server>
@@ -568,7 +569,6 @@
             clientImpl="org.eclipse.wildwebdeveloper.vue.VueClientImpl"
             serverInterface="org.eclipse.wildwebdeveloper.vue.VueLanguageServerAPI"
             id="org.eclipse.wildwebdeveloper.vue"
-            singleton="true"
             label="VUE Language Server"/>
       <contentTypeMapping contentType="org.eclipse.wildwebdeveloper.vue" languageId="vue" id="org.eclipse.wildwebdeveloper.vue"/>
     </extension>

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/jsts/JSTSLanguageServerAPI.java

@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) Dawid Pakuła and others.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Dawid Pakuła <[email protected]> - initial implementation
+ *******************************************************************************/
+package org.eclipse.wildwebdeveloper.jsts;
+
+import org.eclipse.lsp4j.services.LanguageServer;
+
+public interface JSTSLanguageServerAPI extends LanguageServer {
+
+	public final static String TS_REQUEST_COMMAND = "typescript.tsserverRequest";
+}

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/jsts/request/ExecuteInfo.java

@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Dawid Pakuła and others.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Dawid Pakuła <[email protected]> - initial implementation
+ *******************************************************************************/
+package org.eclipse.wildwebdeveloper.jsts.request;
+
+public class ExecuteInfo {
+
+	private int executionTarget = 0;
+
+	private boolean expectsResult = true;
+
+	private boolean isAsync = false;
+
+	private boolean lowPriority = true;
+
+	public int getExecutionTarget() {
+		return executionTarget;
+	}
+
+	public void setExecutionTarget(int executionTarget) {
+		this.executionTarget = executionTarget;
+	}
+
+	public boolean isExpectsResult() {
+		return expectsResult;
+	}
+
+	public void setExpectsResult(boolean expectsResult) {
+		this.expectsResult = expectsResult;
+	}
+
+	public boolean isAsync() {
+		return isAsync;
+	}
+
+	public void setAsync(boolean isAsync) {
+		this.isAsync = isAsync;
+	}
+
+	public boolean isLowPriority() {
+		return lowPriority;
+	}
+
+	public void setLowPriority(boolean lowPriority) {
+		this.lowPriority = lowPriority;
+	}
+}

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/VueClientImpl.java

@@ -14,27 +14,35 @@
 
 import java.util.Map;
 
-import org.eclipse.lsp4e.LanguageClientImpl;
+import org.eclipse.lsp4e.client.DefaultLanguageClient;
 import org.eclipse.lsp4j.MessageParams;
 import org.eclipse.lsp4j.MessageType;
 
-public class VueClientImpl extends LanguageClientImpl implements VueLanguageServerExtention {
+public class VueClientImpl extends DefaultLanguageClient implements VueLanguageServerExtention {
 
 	@Override
 	public void projectLoadingFinish(Object object) {
 		// TODO should this set some state because only now stuff will work like hover..
 		// or maybe even after projectLanguageService "enabled" call
 		logMessage(new MessageParams(MessageType.Info, "Vue project loading finished"));
 	}
-	
+
 	@Override
 	public void projectLoadingStart(Object object) {
 		logMessage(new MessageParams(MessageType.Info, "Vue project loading started"));
 	}
-	
+
+	@Override
+	public void projectLanguageService(Map<String, Object> data) {
+		logMessage(new MessageParams(MessageType.Info,
+				"Language Service is "
+						+ (((Boolean) data.get("languageServiceEnabled")).booleanValue() ? "" : "not yet ")
+						+ "enabled for project " + data.get("projectName")));
+	}
+
 	@Override
-	public void projectLanguageService(Map<String,Object> data) {
-		logMessage(new MessageParams(MessageType.Info, "Language Service is " + (((Boolean)data.get("languageServiceEnabled")).booleanValue()?"":"not yet ") + "enabled for project " + data.get("projectName")));
+	public void tsserverRequest(Object[] params) {
+		logMessage(new MessageParams(MessageType.Info, "Forward TS message " + params[0]));
 	}
-	
+
 }

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/VueLanguageServer.java

@@ -18,19 +18,30 @@
 import java.net.URL;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.ILog;
+import org.eclipse.lsp4e.LSPEclipseUtils;
+import org.eclipse.lsp4e.LanguageServers;
 import org.eclipse.lsp4e.server.ProcessStreamConnectionProvider;
+import org.eclipse.lsp4j.ExecuteCommandParams;
+import org.eclipse.lsp4j.jsonrpc.messages.Message;
+import org.eclipse.lsp4j.jsonrpc.messages.NotificationMessage;
+import org.eclipse.lsp4j.services.LanguageServer;
 import org.eclipse.wildwebdeveloper.embedder.node.NodeJSManager;
+import org.eclipse.wildwebdeveloper.jsts.JSTSLanguageServerAPI;
+import org.eclipse.wildwebdeveloper.jsts.request.ExecuteInfo;
 
 public class VueLanguageServer extends ProcessStreamConnectionProvider {
 	private static String tsserverPath = null;
 	private static String vuePath = null;
+	private static String TS_REQUEST = "tsserver/request"; 
 
 	public VueLanguageServer() {
 
@@ -53,7 +64,7 @@ private void resolvePaths() throws IOException {
 		URL url = FileLocator
 				.toFileURL(getClass().getResource("/node_modules/@vue/language-server/bin/vue-language-server.js"));
 		vuePath = new File(url.getPath()).getAbsolutePath();
-		
+
 		url = FileLocator.toFileURL(getClass().getResource("/node_modules/typescript/lib"));
 		tsserverPath = new File(url.getPath()).getAbsolutePath();
 	}
@@ -69,21 +80,21 @@ protected ProcessBuilder createProcessBuilder() {
 	public Object getInitializationOptions(URI rootUri) {
 		Map<String, Object> options = new HashMap<>();
 		setWorkingDirectory(Paths.get(rootUri).toString());
-		
+
 		options.put("typescript", Collections.singletonMap("tsdk", tsserverPath));
 		options.put("diagnosticModel", 0);
 		options.put("additionalExtensions", new String[] {});
-		
+
 		Map<String, Object> legend = new HashMap<>();
-		legend.put("tokenTypes", new String[] {"component"} );
-		legend.put("tokenModifiers", new String[] {} );
+		legend.put("tokenTypes", new String[] { "component" });
+		legend.put("tokenModifiers", new String[] {});
 		options.put("semanticTokensLegend", legend);
-		
+
 		Map<String, Object> vue = new HashMap<>();
 		vue.put("hybridMode", false);
-		
+
 		options.put("vue", vue);
-		
+
 		return options;
 	}
 
@@ -92,5 +103,40 @@ public String toString() {
 		return "VUE Language Server: " + super.toString();
 	}
 
-	
+	@Override
+	public void handleMessage(Message message, LanguageServer languageServer, URI rootURI) {
+		// System.out.println(message);
+		if (message instanceof NotificationMessage) {
+			NotificationMessage msg = (NotificationMessage) message;
+			if (msg.getMethod().equals(TS_REQUEST)) {
+				forwardTS((Object[]) msg.getParams(), (VueLanguageServerAPI) languageServer, rootURI);
+			}
+		}
+		super.handleMessage(message, languageServer, rootURI);
+	}
+
+	@SuppressWarnings("restriction")
+	private void forwardTS(Object[] params, VueLanguageServerAPI languageServer, URI rootURI) {
+		double requestId = (double) params[0];
+		String commandId = (String) params[1];
+		Object args = params.length > 2 ? params[2] : null;
+
+		LanguageServers.forProject(LSPEclipseUtils.findResourceFor(rootURI).getProject())
+				.collectAll((w, ls) -> CompletableFuture.completedFuture(ls)).thenAccept((lss) -> {
+					lss.stream().filter(JSTSLanguageServerAPI.class::isInstance).map(JSTSLanguageServerAPI.class::cast)
+							.findAny().ifPresent(jsts -> {
+								jsts.getWorkspaceService()
+										.executeCommand(new ExecuteCommandParams(JSTSLanguageServerAPI.TS_REQUEST_COMMAND,
+												Arrays.asList(new Object[] { commandId, args, new ExecuteInfo() })))
+										.whenComplete((result, e) -> {
+											Object body = null;
+											if (result instanceof Map) {
+												body = ((Map<?, ?>)result).get("body");
+											}
+											languageServer.tsserverResponse(new Object[] {requestId, body});
+										});
+							});
+				});
+	}
+
 }

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/VueLanguageServerAPI.java

@@ -15,6 +15,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.services.LanguageServer;
 import org.eclipse.wildwebdeveloper.vue.autoinsert.AutoInsertParams;
@@ -38,5 +39,9 @@ public interface VueLanguageServerAPI extends LanguageServer {
 	@JsonRequest("volar/client/autoInsert")
 	CompletableFuture<Either<String, AutoInsertResponse>> autoInsert(AutoInsertParams params);
 
+	@JsonNotification("tsserver/response")
+	void tsserverResponse(Object any);
+	
+	
 
 }

org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/VueLanguageServerExtention.java

@@ -26,4 +26,8 @@ public interface VueLanguageServerExtention {
 
 	@JsonNotification(value = "vue/projectLanguageService")
 	public void projectLanguageService(Map<String,Object> data);
+	
+	
+	@JsonNotification(value = "tsserver/request")
+	public void tsserverRequest(Object[] params);
 }