@webgal/language-server 0.0.2-alpha.1 → 0.0.2-alpha.3

package/build/browser.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 require('./providerState-B7hGbqQj.cjs');
 const require_utils = require('./utils.cjs');
-const require_onInitialize = require('./onInitialize-uaxhCEGr.cjs');
+const require_onInitialize = require('./onInitialize-7r14ko5I.cjs');
 let _volar_language_server_browser = require("@volar/language-server/browser");
 
 //#region src/browser.ts

package/build/browser.mjs

@@ -1,6 +1,6 @@
 import "./providerState-CLCXHs37.mjs";
 import { bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createWebgalVirtualCode, updateWebgalVirtualCode } from "./utils.mjs";
-import { i as registerConnectionHandlers, n as applyServerCapabilities, r as createWebgalService, t as applyClientCapabilities } from "./onInitialize-DIUUrHI3.mjs";
+import { i as registerConnectionHandlers, n as applyServerCapabilities, r as createWebgalService, t as applyClientCapabilities } from "./onInitialize-DLHBz6ds.mjs";
 import { createConnection, createConnection as createConnection$1, createServer, createSimpleProject } from "@volar/language-server/browser";
 
 //#region src/browser.ts

package/build/index.cjs

@@ -1,6 +1,6 @@
 require('./providerState-B7hGbqQj.cjs');
 const require_utils = require('./utils.cjs');
-const require_onInitialize = require('./onInitialize-uaxhCEGr.cjs');
+const require_onInitialize = require('./onInitialize-7r14ko5I.cjs');
 let _volar_language_server_node = require("@volar/language-server/node");
 let vscode_languageserver_node = require("vscode-languageserver/node");
 
@@ -22,8 +22,8 @@ async function startWebSocketServer(options) {
 	});
 }
 function getWsOptions(argv) {
-	let port = Number(process.env.WEBGAL_LSP_WS_PORT ?? 3001);
-	let path = process.env.WEBGAL_LSP_WS_PATH ?? "/webgal-lsp";
+	let port = 5882;
+	let path = "/webgal-lsp";
 	for (const arg of argv) {
 		if (arg.startsWith("--ws=")) {
 			const value = Number(arg.slice(5));

package/build/index.mjs

@@ -1,6 +1,6 @@
 import "./providerState-CLCXHs37.mjs";
 import { bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createWebgalVirtualCode, updateWebgalVirtualCode } from "./utils.mjs";
-import { i as registerConnectionHandlers, n as applyServerCapabilities, r as createWebgalService, t as applyClientCapabilities } from "./onInitialize-DIUUrHI3.mjs";
+import { i as registerConnectionHandlers, n as applyServerCapabilities, r as createWebgalService, t as applyClientCapabilities } from "./onInitialize-DLHBz6ds.mjs";
 import { createConnection, createServer, createSimpleProject } from "@volar/language-server/node";
 import { createConnection as createConnection$1 } from "vscode-languageserver/node";
 
@@ -22,8 +22,8 @@ async function startWebSocketServer(options) {
 	});
 }
 function getWsOptions(argv) {
-	let port = Number(process.env.WEBGAL_LSP_WS_PORT ?? 3001);
-	let path = process.env.WEBGAL_LSP_WS_PATH ?? "/webgal-lsp";
+	let port = 5882;
+	let path = "/webgal-lsp";
 	for (const arg of argv) {
 		if (arg.startsWith("--ws=")) {
 			const value = Number(arg.slice(5));

package/build/{onInitialize-uaxhCEGr.cjs → onInitialize-7r14ko5I.cjs}

@@ -1,5 +1,6 @@
 const require_utils = require('./utils.cjs');
 let _volar_language_server = require("@volar/language-server");
+let vscode_uri = require("vscode-uri");
 
 //#region src/events/onDid.ts
 var onDid_default = function(documents, connection) {
@@ -11,6 +12,9 @@ var onDid_default = function(documents, connection) {
 		else require_utils.setGlobalSettings(change.settings.XRWebGalLanguageServer || require_utils.defaultSettings);
 		connection.languages.diagnostics.refresh();
 	});
+	connection.onNotification("webgal/vfsChanged", () => {
+		connection.sendRequest("workspace/documentLink/refresh");
+	});
 };
 
 //#endregion
@@ -1294,6 +1298,11 @@ function provideDefinition(document, position, definitionMap) {
 //#endregion
 //#region src/events/onDocumentLinks.ts
 async function provideDocumentLinks(document, connection, candidates) {
+	const toFileTarget = (path) => {
+		if (!path) return;
+		if (path.startsWith("file://")) return vscode_uri.URI.parse(path).toString();
+		return vscode_uri.URI.file(path).toString();
+	};
 	const pathArray = document.uri.split("/");
 	const currentDirectory = await connection.sendRequest("client/currentDirectory");
 	const documentLinks = [];
@@ -1305,12 +1314,21 @@ async function provideDocumentLinks(document, connection, candidates) {
 		let targetPath;
 		if (isConfig) targetPath = await connection.sendRequest("client/FJoin", currentDirectory + "/");
 		else targetPath = await connection.sendRequest("client/FJoin", currentDirectory + "/" + dirResources);
-		let basePath = await connection.sendRequest("client/FJoin", targetPath + "/" + matchText);
-		if (!await connection.sendRequest("client/FStat", basePath)) basePath = await connection.sendRequest("client/findFile", [currentDirectory, matchText]);
+		const defaultPath = await connection.sendRequest("client/FJoin", targetPath + "/" + matchText);
+		let stat = await connection.sendRequest("client/FStat", defaultPath);
+		let resolvedPath = defaultPath;
+		if (!stat) {
+			const foundPath = await connection.sendRequest("client/findFile", [currentDirectory, matchText]);
+			if (foundPath) {
+				resolvedPath = foundPath;
+				stat = await connection.sendRequest("client/FStat", resolvedPath);
+			}
+		}
+		const tooltip = stat && resolvedPath ? resolvedPath : "unknown file";
 		documentLinks.push({
-			target: "file:///" + basePath,
+			target: toFileTarget(resolvedPath),
 			range: _volar_language_server.Range.create(_volar_language_server.Position.create(candidate.line, candidate.start), _volar_language_server.Position.create(candidate.line, candidate.end)),
-			tooltip: basePath
+			tooltip
 		});
 	}
 	return [...documentLinks];

package/build/{onInitialize-DIUUrHI3.mjs → onInitialize-DLHBz6ds.mjs}

@@ -1,5 +1,6 @@
 import { StateConfig, defaultSettings, documentSettings, findTokenRange, getPatternAtPosition, getStageCompletionContext, getWebgalDefinitionMap, getWebgalDocumentLinkCandidates, getWebgalFoldingRanges, getWebgalLineCommandTypes, getWebgalSourceUriString, getWebgalVirtualCodeLines, getWebgalVirtualCodeText, getWordAtPosition, setGlobalSettings, validateTextDocument } from "./utils.mjs";
 import { CompletionItemKind, DidChangeConfigurationNotification, InsertTextFormat, LocationLink, MarkupKind, Position, Range, TextDocumentSyncKind } from "@volar/language-server";
+import { URI } from "vscode-uri";
 
 //#region src/events/onDid.ts
 var onDid_default = function(documents, connection) {
@@ -11,6 +12,9 @@ var onDid_default = function(documents, connection) {
 		else setGlobalSettings(change.settings.XRWebGalLanguageServer || defaultSettings);
 		connection.languages.diagnostics.refresh();
 	});
+	connection.onNotification("webgal/vfsChanged", () => {
+		connection.sendRequest("workspace/documentLink/refresh");
+	});
 };
 
 //#endregion
@@ -1294,6 +1298,11 @@ function provideDefinition(document, position, definitionMap) {
 //#endregion
 //#region src/events/onDocumentLinks.ts
 async function provideDocumentLinks(document, connection, candidates) {
+	const toFileTarget = (path) => {
+		if (!path) return;
+		if (path.startsWith("file://")) return URI.parse(path).toString();
+		return URI.file(path).toString();
+	};
 	const pathArray = document.uri.split("/");
 	const currentDirectory = await connection.sendRequest("client/currentDirectory");
 	const documentLinks = [];
@@ -1305,12 +1314,21 @@ async function provideDocumentLinks(document, connection, candidates) {
 		let targetPath;
 		if (isConfig) targetPath = await connection.sendRequest("client/FJoin", currentDirectory + "/");
 		else targetPath = await connection.sendRequest("client/FJoin", currentDirectory + "/" + dirResources);
-		let basePath = await connection.sendRequest("client/FJoin", targetPath + "/" + matchText);
-		if (!await connection.sendRequest("client/FStat", basePath)) basePath = await connection.sendRequest("client/findFile", [currentDirectory, matchText]);
+		const defaultPath = await connection.sendRequest("client/FJoin", targetPath + "/" + matchText);
+		let stat = await connection.sendRequest("client/FStat", defaultPath);
+		let resolvedPath = defaultPath;
+		if (!stat) {
+			const foundPath = await connection.sendRequest("client/findFile", [currentDirectory, matchText]);
+			if (foundPath) {
+				resolvedPath = foundPath;
+				stat = await connection.sendRequest("client/FStat", resolvedPath);
+			}
+		}
+		const tooltip = stat && resolvedPath ? resolvedPath : "unknown file";
 		documentLinks.push({
-			target: "file:///" + basePath,
+			target: toFileTarget(resolvedPath),
 			range: Range.create(Position.create(candidate.line, candidate.start), Position.create(candidate.line, candidate.end)),
-			tooltip: basePath
+			tooltip
 		});
 	}
 	return [...documentLinks];

package/build/utils.cjs

@@ -173,6 +173,8 @@ const analyzeWebgalFoldingRanges = (text) => {
 	return foldingRanges;
 };
 const createWebgalVirtualCode = (scriptId, languageId, snapshot) => {
+	const originalId = scriptId.toString();
+	const normalizedId = originalId.toLowerCase();
 	const length = snapshot.getLength();
 	const text = getSnapshotText(snapshot);
 	const lines = text.split(/\r?\n/);
@@ -181,7 +183,7 @@ const createWebgalVirtualCode = (scriptId, languageId, snapshot) => {
 	const linkCandidates = analyzeWebgalDocumentLinks(lines);
 	const foldingRanges = analyzeWebgalFoldingRanges(text);
 	return {
-		id: scriptId.toString(),
+		id: normalizedId,
 		languageId,
 		snapshot,
 		mappings: [{
@@ -190,6 +192,7 @@ const createWebgalVirtualCode = (scriptId, languageId, snapshot) => {
 			lengths: [length],
 			data: fullCodeInformation
 		}],
+		webgalOriginalId: originalId,
 		webgalDefinitionMap: map,
 		webgalDocumentLinkCandidates: linkCandidates,
 		webgalFoldingRanges: foldingRanges,

package/build/utils.d.cts

@@ -27,6 +27,7 @@ type WebgalVirtualCode = VirtualCode & {
   webgalFoldingRanges?: FoldingRange[];
   webgalLines?: string[];
   webgalLineCommandTypes?: string[];
+  webgalOriginalId?: string;
 };
 type WebgalDocumentLinkCandidate = {
   line: number;

package/build/utils.d.mts

@@ -27,6 +27,7 @@ type WebgalVirtualCode = VirtualCode & {
   webgalFoldingRanges?: FoldingRange[];
   webgalLines?: string[];
   webgalLineCommandTypes?: string[];
+  webgalOriginalId?: string;
 };
 type WebgalDocumentLinkCandidate = {
   line: number;

package/build/utils.mjs

@@ -172,6 +172,8 @@ const analyzeWebgalFoldingRanges = (text) => {
 	return foldingRanges;
 };
 const createWebgalVirtualCode = (scriptId, languageId, snapshot) => {
+	const originalId = scriptId.toString();
+	const normalizedId = originalId.toLowerCase();
 	const length = snapshot.getLength();
 	const text = getSnapshotText(snapshot);
 	const lines = text.split(/\r?\n/);
@@ -180,7 +182,7 @@ const createWebgalVirtualCode = (scriptId, languageId, snapshot) => {
 	const linkCandidates = analyzeWebgalDocumentLinks(lines);
 	const foldingRanges = analyzeWebgalFoldingRanges(text);
 	return {
-		id: scriptId.toString(),
+		id: normalizedId,
 		languageId,
 		snapshot,
 		mappings: [{
@@ -189,6 +191,7 @@ const createWebgalVirtualCode = (scriptId, languageId, snapshot) => {
 			lengths: [length],
 			data: fullCodeInformation
 		}],
+		webgalOriginalId: originalId,
 		webgalDefinitionMap: map,
 		webgalDocumentLinkCandidates: linkCandidates,
 		webgalFoldingRanges: foldingRanges,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webgal/language-server",
-	"version": "0.0.2-alpha.1",
+	"version": "0.0.2-alpha.3",
 	"main": "build/index.cjs",
 	"module": "build/index.mjs",
 	"types": "build/index.d.mts",
@@ -43,7 +43,7 @@
 		"build": "tsdown",
 		"gen": "tsx scripts/gen.ts",
 		"dev": "pnpm build && node bin/webgal-language-server.js --stdio",
-		"dev:ws": "pnpm build && node bin/webgal-language-server.js --ws=3001",
+		"dev:ws": "pnpm build && node bin/webgal-language-server.js --ws",
 		"format": " prettier --write \"src/**/*.ts\"",
 		"lint": "eslint src --ext ts --fix",
 		"typecheck": "tsc --noEmit",
@@ -55,7 +55,7 @@
 		"@volar/language-service": "~2.4.0",
 		"@volar/typescript": "~2.4.0",
 		"@webgal/language-core": "0.0.2-alpha.1",
-		"@webgal/language-service": "0.0.2-alpha.1",
+		"@webgal/language-service": "0.0.2-alpha.4",
 		"tsc-alias": "^1.8.16",
 		"vscode-languageserver": "^9.0.1",
 		"vscode-languageserver-textdocument": "^1.0.11",
@@ -68,5 +68,5 @@
 		"tsdown": "^0.20.3",
 		"tsx": "^4.21.0"
 	},
-	"gitHead": "9f3a9d6bf3914857b2f87f4ea83821b1d544b2bd"
+	"gitHead": "8ae85838b6fd53666ccdedaa6a1afcf5d51451ce"
 }