volar-service-css 0.0.3 → 0.0.5

package/out/index.d.ts

@@ -1,9 +1,9 @@
 import type { Service } from '@volar/language-service';
 import * as css from 'vscode-css-languageservice';
-import { TextDocument } from 'vscode-languageserver-textdocument';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 export interface Provide {
     'css/stylesheet': (document: TextDocument) => css.Stylesheet | undefined;
     'css/languageService': (languageId: string) => css.LanguageService | undefined;
 }
-declare const _default: () => Service;
+declare const _default: () => Service<Provide>;
 export default _default;

package/out/index.js

@@ -23,9 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
 const css = __importStar(require("vscode-css-languageservice"));
-const vscode = __importStar(require("vscode-languageserver-protocol"));
-const path = __importStar(require("path"));
+const vscode_uri_1 = require("vscode-uri");
 exports.default = () => (context) => {
     // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/css-language-features/server/src/cssServer.ts#L97
     const triggerCharacters = ['/', '-', ':'];
@@ -34,9 +34,41 @@ exports.default = () => (context) => {
     }
     let inited = false;
     const stylesheets = new WeakMap();
-    const cssLs = css.getCSSLanguageService({ fileSystemProvider: context.env.fileSystemProvider });
-    const scssLs = css.getSCSSLanguageService({ fileSystemProvider: context.env.fileSystemProvider });
-    const lessLs = css.getLESSLanguageService({ fileSystemProvider: context.env.fileSystemProvider });
+    const fileSystemProvider = {
+        stat: async (uri) => await context.env.fs?.stat(uri) ?? {
+            type: css.FileType.Unknown,
+            ctime: 0,
+            mtime: 0,
+            size: 0,
+        },
+        readDirectory: async (uri) => context.env.fs?.readDirectory(uri) ?? [],
+    };
+    const documentContext = {
+        resolveReference(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 cssLs = css.getCSSLanguageService({
+        fileSystemProvider,
+        clientCapabilities: context.env.clientCapabilities,
+    });
+    const scssLs = css.getSCSSLanguageService({
+        fileSystemProvider,
+        clientCapabilities: context.env.clientCapabilities,
+    });
+    const lessLs = css.getLESSLanguageService({
+        fileSystemProvider,
+        clientCapabilities: context.env.clientCapabilities,
+    });
     const postcssLs = {
         ...scssLs,
         doValidation: (document, stylesheet, documentSettings) => {
@@ -56,9 +88,7 @@ exports.default = () => (context) => {
         async provideCompletionItems(document, position) {
             return worker(document, async (stylesheet, cssLs) => {
                 const settings = await context.env.getConfiguration?.(document.languageId);
-                const cssResult = context.env.documentContext
-                    ? await cssLs.doComplete2(document, position, stylesheet, context.env.documentContext, settings?.completion)
-                    : await cssLs.doComplete(document, position, stylesheet, settings?.completion);
+                const cssResult = await cssLs.doComplete2(document, position, stylesheet, documentContext, settings?.completion);
                 return cssResult;
             });
         },
@@ -81,7 +111,11 @@ exports.default = () => (context) => {
             return worker(document, (stylesheet, cssLs) => {
                 const location = cssLs.findDefinition(document, position, stylesheet);
                 if (location) {
-                    return [vscode.LocationLink.create(location.uri, location.range, location.range)];
+                    return [{
+                            targetUri: location.uri,
+                            targetRange: location.range,
+                            targetSelectionRange: location.range,
+                        }];
                 }
             });
         },
@@ -109,9 +143,7 @@ exports.default = () => (context) => {
         },
         async provideDocumentLinks(document) {
             return await worker(document, (stylesheet, cssLs) => {
-                if (!context.env.documentContext)
-                    return;
-                return cssLs.findDocumentLinks2(document, stylesheet, context.env.documentContext);
+                return cssLs.findDocumentLinks2(document, stylesheet, documentContext);
             });
         },
         provideDocumentSymbols(document) {
@@ -172,7 +204,7 @@ exports.default = () => (context) => {
         const newData = [];
         for (const customDataPath of customData) {
             try {
-                const jsonPath = path.resolve(customDataPath);
+                const jsonPath = path_1.posix.resolve(customDataPath);
                 newData.push(css.newCSSDataProvider(require(jsonPath)));
             }
             catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-css",
-	"version": "0.0.3",
+	"version": "0.0.5",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -14,8 +14,10 @@
 	},
 	"dependencies": {
 		"vscode-css-languageservice": "^6.2.3",
-		"vscode-languageserver-protocol": "^3.17.3",
+		"vscode-uri": "^3.0.7"
+	},
+	"devDependencies": {
 		"vscode-languageserver-textdocument": "^1.0.8"
 	},
-	"gitHead": "28896539331e31b4ef1064b6839ea0924d5d28d0"
+	"gitHead": "7b58234769e16ccb8eed0e6eb03f58ed24b7df40"
 }