volar-service-css 0.0.52 → 0.0.53

package/index.d.ts

@@ -1,10 +1,12 @@
 import type { Disposable, DocumentSelector, FormattingOptions, ProviderResult, LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import * as css from 'vscode-css-languageservice';
 import { TextDocument } from 'vscode-languageserver-textdocument';
+import { URI } from 'vscode-uri';
 export interface Provide {
     'css/stylesheet': (document: TextDocument, ls: css.LanguageService) => css.Stylesheet;
     'css/languageService': (document: TextDocument) => css.LanguageService | undefined;
 }
+export declare function resolveReference(ref: string, baseUri: URI, workspaceFolders: URI[]): string;
 export declare function create({ cssDocumentSelector, scssDocumentSelector, lessDocumentSelector, useDefaultDataProvider, getDocumentContext, isFormattingEnabled, getFormattingOptions, getLanguageSettings, getCustomData, onDidChangeCustomData, }?: {
     cssDocumentSelector?: DocumentSelector;
     scssDocumentSelector?: DocumentSelector;

package/index.js

@@ -1,9 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveReference = resolveReference;
 exports.create = create;
 const css = require("vscode-css-languageservice");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const vscode_uri_1 = require("vscode-uri");
+function resolveReference(ref, baseUri, workspaceFolders) {
+    if (ref.match(/^\w[\w\d+.-]*:/)) {
+        // starts with a schema
+        return ref;
+    }
+    if (ref[0] === '/') { // resolve absolute path against the current workspace folder
+        const folderUri = getRootFolder();
+        if (folderUri) {
+            return folderUri + ref.substr(1);
+        }
+    }
+    const baseUriDir = baseUri.path.endsWith('/') ? baseUri : vscode_uri_1.Utils.dirname(baseUri);
+    return vscode_uri_1.Utils.resolvePath(baseUriDir, ref).toString(true);
+    function getRootFolder() {
+        for (const folder of workspaceFolders) {
+            let folderURI = folder.toString();
+            if (!folderURI.endsWith('/')) {
+                folderURI = folderURI + '/';
+            }
+            if (baseUri.toString().startsWith(folderURI)) {
+                return folderURI;
+            }
+        }
+    }
+}
 function create({ cssDocumentSelector = ['css'], scssDocumentSelector = ['scss'], lessDocumentSelector = ['less'], useDefaultDataProvider = true, getDocumentContext = context => {
     return {
         resolveReference(ref, base) {
@@ -12,19 +38,7 @@ function create({ cssDocumentSelector = ['css'], scssDocumentSelector = ['scss']
             if (decoded) {
                 baseUri = decoded[0];
             }
-            if (ref.match(/^\w[\w\d+.-]*:/)) {
-                // starts with a schema
-                return ref;
-            }
-            if (ref[0] === '/' && context.env.workspaceFolders.length) { // resolve absolute path against the current workspace folder
-                let folderUri = context.env.workspaceFolders[0].toString();
-                if (!folderUri.endsWith('/')) {
-                    folderUri += '/';
-                }
-                return folderUri + ref.substring(1);
-            }
-            const baseUriDir = baseUri.path.endsWith('/') ? baseUri : vscode_uri_1.Utils.dirname(baseUri);
-            return vscode_uri_1.Utils.resolvePath(baseUriDir, ref).toString(true);
+            return resolveReference(ref, baseUri, context.env.workspaceFolders);
         },
     };
 }, isFormattingEnabled = async (document, context) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-css",
-	"version": "0.0.52",
+	"version": "0.0.53",
 	"description": "Integrate vscode-css-languageservice into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/css",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -39,5 +39,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "0038413c252e98b7d6b4e57eabdcb337d272d771"
+	"gitHead": "8c61d6a8acc354e68c726727f72be7d318c583da"
 }