volar-service-json 0.0.4 → 0.0.5

package/out/index.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const json = __importStar(require("vscode-json-languageservice"));
+const vscode_uri_1 = require("vscode-uri");
 exports.default = (settings) => (context) => {
     // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/json-language-features/server/src/jsonServer.ts#L150
     const triggerCharacters = ['"', ':'];
@@ -31,7 +32,25 @@ exports.default = (settings) => (context) => {
         return { triggerCharacters };
     }
     const jsonDocuments = new WeakMap();
-    const jsonLs = json.getLanguageService({ schemaRequestService: context.env.schemaRequestService });
+    const workspaceContext = {
+        resolveRelativePath: (ref, base) => {
+            if (ref.match(/^\w[\w\d+.-]*:/)) {
+                // starts with a schema
+                return ref;
+            }
+            if (ref[0] === '/') { // resolve absolute path against the current workspace folder
+                return base + ref;
+            }
+            const baseUri = vscode_uri_1.URI.parse(base);
+            const baseUriDir = baseUri.path.endsWith('/') ? baseUri : vscode_uri_1.Utils.dirname(baseUri);
+            return vscode_uri_1.Utils.resolvePath(baseUriDir, ref).toString(true);
+        },
+    };
+    const jsonLs = json.getLanguageService({
+        schemaRequestService: async (uri) => await context.env.fs?.readFile(uri) ?? '',
+        workspaceContext,
+        clientCapabilities: context.env.clientCapabilities,
+    });
     if (settings) {
         jsonLs.configure(settings);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-json",
-	"version": "0.0.4",
+	"version": "0.0.5",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,11 @@
 		"directory": "packages/json"
 	},
 	"dependencies": {
-		"vscode-json-languageservice": "^5.2.0"
+		"vscode-json-languageservice": "^5.2.0",
+		"vscode-uri": "^3.0.7"
 	},
 	"devDependencies": {
 		"vscode-languageserver-textdocument": "^1.0.8"
 	},
-	"gitHead": "f5d49495d6698761f4df8c9ef2747cc01fc777d6"
+	"gitHead": "7b58234769e16ccb8eed0e6eb03f58ed24b7df40"
 }