vscode-css-languageservice 4.3.0-next.0 → 4.3.0

package/CHANGELOG.md

@@ -1,30 +1,32 @@
-4.3.0 - 2020-05-25
-===================
-- module resolving in urls (`~foo/hello.html`) when using `LanguageService.findDocumentLinks2` and if `fileSystemProvider` is provided.
-- new API `LanguageService.doComplete2`. Support path completion if `fileSystemProvider.readDirectory` is provided.
 
 
+4.3.0 - 2020-06-26
+===================
+  * module resolving in urls (`~foo/hello.html`) when using `LanguageService.findDocumentLinks2` and if `fileSystemProvider` is provided.
+  * new API `LanguageService.doComplete2`. Support path completion if `fileSystemProvider.readDirectory` is provided.
+  * `DocumentContext.resolveReference` can also return undefined (if the ref is invalid)
+
 4.2.0 - 2020-05-14
 ===================
-* new API `LanguageServiceOptions.useDefaultDataProvider` to control whether the default data provider is used. Defaults to true
-* new API `LanguageService.setDataProviders` to update the data providers.
+  * new API `LanguageServiceOptions.useDefaultDataProvider` to control whether the default data provider is used. Defaults to true
+  * new API `LanguageService.setDataProviders` to update the data providers.
 
 4.1.0 - 2020-02-23
 ===================
-* markdown descriptions in completions and hover
-  * new API `LanguageServiceOptions.clientCapabilities` with `ClientCapabilities` for completion documentationFormat and hover content
-  * extended format of CustomData (version 1.1) with MarkupContent contents and reference links
-* dynamically resolved links for scss include statements
-  * new API `LanguageService.findDocumentLinks2`: Also returns dynamically resolved links if `fileSystemProvider` is provided
-  * new API `LanguageServiceOptions.fileSystemProvider` with `FileSystemProvider` to query the file system (currently used to resolve the location of included files)
-* new API `CompletionSettings.completePropertyWithSemicolon`
-* new API `ICompletionParticipant.onCssMixinReference`
-* Switch to `TextDocument` from `vscode-languageserver-textdocument` (reexported from the main module)
+  * markdown descriptions in completions and hover
+    * new API `LanguageServiceOptions.clientCapabilities` with `ClientCapabilities` for completion documentationFormat and hover content
+    * extended format of CustomData (version 1.1) with MarkupContent contents and reference links
+  * dynamically resolved links for scss include statements
+    * new API `LanguageService.findDocumentLinks2`: Also returns dynamically resolved links if `fileSystemProvider` is provided
+    * new API `LanguageServiceOptions.fileSystemProvider` with `FileSystemProvider` to query the file system (currently used to resolve the location of included files)
+  * new API `CompletionSettings.completePropertyWithSemicolon`
+  * new API `ICompletionParticipant.onCssMixinReference`
+  * Switch to `TextDocument` from `vscode-languageserver-textdocument` (reexported from the main module)
 
 4.0.0 / 2019-06-12
 ===================
- * `LanguageServiceOptions.customDataProviders` allows you to use custom datasets for properties, at-properties, pseudo-classes and pseudo-elements.
- * New API `LanguageService.getSelectionRanges`
+  * `LanguageServiceOptions.customDataProviders` allows you to use custom datasets for properties, at-properties, pseudo-classes and pseudo-elements.
+  * New API `LanguageService.getSelectionRanges`
 
 3.0.12 / 2018-10-29
 ===================

package/docs/customData.md

@@ -3,6 +3,11 @@
 In VS Code, there are two ways of loading custom CSS datasets:
 
 1. With setting `css.customData`
+```json
+    "css.customData": [
+        "./foo.css-data.json"
+    ]
+```
 2. With an extension that contributes `contributes.css.customData`
 
 Both setting point to a list of JSON files. This document describes the shape of the JSON files.
@@ -37,6 +42,7 @@ All top-level properties share two basic properties, `name` and `description`. F
 
 ```jsonc
 {
+  "version": 1.1,
   "properties": [
     { "name": "foo", "description": "Foo property" }
   ],

package/lib/esm/cssLanguageTypes.d.ts

@@ -44,7 +44,7 @@ export interface ICompletionParticipant {
     onCssMixinReference?: (context: MixinReferenceCompletionContext) => void;
 }
 export interface DocumentContext {
-    resolveReference(ref: string, base?: string): string;
+    resolveReference(ref: string, baseUrl: string): string | undefined;
 }
 /**
  * Describes what LSP capabilities the client supports

package/lib/esm/languageFacts/entry.js

@@ -42,6 +42,9 @@ export function getEntryDescription(entry, doesSupportMarkdown) {
     }
     return result;
 }
+export function textToMarkedString(text) {
+    return text.replace(/[\\`*_{}[\]()#+\-.!<>]/g, '\\$&'); // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
+}
 function getEntryStringDescription(entry) {
     if (!entry.description || entry.description === '') {
         return '';
@@ -77,18 +80,14 @@ function getEntryMarkdownDescription(entry) {
     if (entry.status) {
         result += getEntryStatus(entry.status);
     }
-    if (typeof entry.description === 'string') {
-        result += entry.description;
-    }
-    else {
-        result = entry.description.value;
-    }
+    var description = typeof entry.description === 'string' ? entry.description : entry.description.value;
+    result += textToMarkedString(description);
     var browserLabel = getBrowserLabel(entry.browsers);
     if (browserLabel) {
-        result += '\n\n(' + browserLabel + ')';
+        result += '\n\n(' + textToMarkedString(browserLabel) + ')';
     }
-    if ('syntax' in entry) {
-        result += "\n\nSyntax: " + entry.syntax;
+    if ('syntax' in entry && entry.syntax) {
+        result += "\n\nSyntax: " + textToMarkedString(entry.syntax);
     }
     if (entry.references && entry.references.length > 0) {
         result += '\n\n';

package/lib/esm/parser/scssParser.js

@@ -85,11 +85,17 @@ var SCSSParser = /** @class */ (function (_super) {
         if (!node.setValue(this._parseExpr())) {
             return this.finish(node, ParseError.VariableValueExpected, [], panic);
         }
-        while (this.accept(TokenType.Exclamation)) {
-            if (!this.peekRegExp(TokenType.Ident, /^(default|global)$/)) {
-                return this.finish(node, ParseError.UnknownKeyword);
+        while (this.peek(TokenType.Exclamation)) {
+            if (node.addChild(this._tryParsePrio())) {
+                // !important
+            }
+            else {
+                this.consumeToken();
+                if (!this.peekRegExp(TokenType.Ident, /^(default|global)$/)) {
+                    return this.finish(node, ParseError.UnknownKeyword);
+                }
+                this.consumeToken();
             }
-            this.consumeToken();
         }
         if (this.peek(TokenType.SemiColon)) {
             node.semicolonPosition = this.token.offset; // not part of the declaration, but useful information for code assist
@@ -170,7 +176,7 @@ var SCSSParser = /** @class */ (function (_super) {
         return this._parseModuleMember() ||
             this._parseVariable() ||
             this._parseSelectorCombinator() ||
-            this._tryParsePrio() ||
+            //this._tryParsePrio() ||
             _super.prototype._parseTermExpression.call(this);
     };
     SCSSParser.prototype._parseInterpolation = function () {
@@ -628,6 +634,9 @@ var SCSSParser = /** @class */ (function (_super) {
             node.addChild(this._parsePrio()); // #9859
             return this.finish(node);
         }
+        else if (node.setValue(this._tryParsePrio())) {
+            return this.finish(node);
+        }
         return null;
     };
     SCSSParser.prototype._parseURLArgument = function () {

package/lib/esm/services/cssNavigation.js

@@ -118,33 +118,44 @@ var CSSNavigation = /** @class */ (function () {
         for (var i = 0; i < links.length; i++) {
             var target = links[i].target;
             if (target && !(/^\w+:\/\//g.test(target))) {
-                links[i].target = documentContext.resolveReference(target, document.uri);
+                var resolved = documentContext.resolveReference(target, document.uri);
+                if (resolved) {
+                    links[i].target = resolved;
+                }
             }
         }
         return links;
     };
     CSSNavigation.prototype.findDocumentLinks2 = function (document, stylesheet, documentContext) {
         return __awaiter(this, void 0, void 0, function () {
-            var links, i, target, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var links, resolvedLinks, _i, links_1, link, target, resolvedTarget;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         links = this.findUnresolvedLinks(document, stylesheet);
-                        i = 0;
-                        _b.label = 1;
+                        resolvedLinks = [];
+                        _i = 0, links_1 = links;
+                        _a.label = 1;
                     case 1:
-                        if (!(i < links.length)) return [3 /*break*/, 4];
-                        target = links[i].target;
+                        if (!(_i < links_1.length)) return [3 /*break*/, 5];
+                        link = links_1[_i];
+                        target = link.target;
                         if (!(target && !(/^\w+:\/\//g.test(target)))) return [3 /*break*/, 3];
-                        _a = links[i];
                         return [4 /*yield*/, this.resolveRelativeReference(target, document.uri, documentContext)];
                     case 2:
-                        _a.target = _b.sent();
-                        _b.label = 3;
+                        resolvedTarget = _a.sent();
+                        if (resolvedTarget !== undefined) {
+                            link.target = resolvedTarget;
+                            resolvedLinks.push(link);
+                        }
+                        return [3 /*break*/, 4];
                     case 3:
-                        i++;
+                        resolvedLinks.push(link);
+                        _a.label = 4;
+                    case 4:
+                        _i++;
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, links];
+                    case 5: return [2 /*return*/, resolvedLinks];
                 }
             });
         });

package/lib/esm/services/pathCompletion.js

@@ -60,9 +60,6 @@ var PathCompletionParticipant = /** @class */ (function () {
                 switch (_f.label) {
                     case 0:
                         result = { items: [], isIncomplete: false };
-                        if (!(startsWith(document.uri, 'file:'))) {
-                            return [2 /*return*/, result];
-                        }
                         _i = 0, _a = this.literalCompletions;
                         _f.label = 1;
                     case 1:
@@ -139,6 +136,7 @@ var PathCompletionParticipant = /** @class */ (function () {
                         replaceRange = pathToReplaceRange(valueBeforeCursor, fullValue, fullValueRange);
                         valueBeforeLastSlash = valueBeforeCursor.substring(0, valueBeforeCursor.lastIndexOf('/') + 1);
                         parentDir = documentContext.resolveReference(valueBeforeLastSlash || '.', currentDocUri);
+                        if (!parentDir) return [3 /*break*/, 4];
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 3, , 4]);
@@ -156,8 +154,8 @@ var PathCompletionParticipant = /** @class */ (function () {
                         return [2 /*return*/, result];
                     case 3:
                         e_1 = _b.sent();
-                        return [2 /*return*/, []];
-                    case 4: return [2 /*return*/];
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/, []];
                 }
             });
         });

package/lib/esm/services/scssNavigation.js

@@ -16,17 +16,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -66,6 +55,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { CSSNavigation } from './cssNavigation';
 import * as nodes from '../parser/cssNodes';
 import { URI } from 'vscode-uri';
+import { startsWith } from '../utils/strings';
+import { extname } from '../utils/resources';
 var SCSSNavigation = /** @class */ (function (_super) {
     __extends(SCSSNavigation, _super);
     function SCSSNavigation(fileSystemProvider) {
@@ -76,7 +67,7 @@ var SCSSNavigation = /** @class */ (function (_super) {
             node.type === nodes.NodeType.Use ||
             node.type === nodes.NodeType.Forward);
     };
-    SCSSNavigation.prototype.findDocumentLinks2 = function (document, stylesheet, documentContext) {
+    SCSSNavigation.prototype.resolveRelativeReference = function (ref, documentUri, documentContext) {
         return __awaiter(this, void 0, void 0, function () {
             function toPathVariations(uri) {
                 // No valid path
@@ -118,63 +109,41 @@ var SCSSNavigation = /** @class */ (function (_super) {
                 var cssPath = documentUriWithBasename(normalizedBasename.slice(0, -5) + '.css');
                 return [normalizedPath, underScorePath, indexPath, indexUnderscoreUri, cssPath];
             }
-            var links, fsProvider, validLinks, i, target, parsedUri, pathVariations, j;
+            var target, parsedUri, pathVariations, j, e_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        links = this.findDocumentLinks(document, stylesheet, documentContext);
-                        fsProvider = this.fileSystemProvider;
-                        validLinks = [];
-                        if (!fsProvider) return [3 /*break*/, 9];
-                        i = 0;
-                        _a.label = 1;
-                    case 1:
-                        if (!(i < links.length)) return [3 /*break*/, 8];
-                        target = links[i].target;
-                        if (!target) {
-                            return [3 /*break*/, 7];
-                        }
-                        parsedUri = null;
-                        try {
-                            parsedUri = URI.parse(target);
+                        if (startsWith(ref, 'sass:')) {
+                            return [2 /*return*/, undefined]; // sass library
                         }
-                        catch (e) {
-                            if (e instanceof URIError) {
-                                return [3 /*break*/, 7];
-                            }
-                            throw e;
-                        }
-                        pathVariations = toPathVariations(parsedUri);
-                        if (!!pathVariations) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.fileExists(target)];
+                        return [4 /*yield*/, _super.prototype.resolveRelativeReference.call(this, ref, documentUri, documentContext)];
+                    case 1:
+                        target = _a.sent();
+                        if (!(this.fileSystemProvider && target && extname(target).length === 0)) return [3 /*break*/, 8];
+                        _a.label = 2;
                     case 2:
-                        if (_a.sent()) {
-                            validLinks.push(links[i]);
-                        }
-                        return [3 /*break*/, 7];
-                    case 3:
+                        _a.trys.push([2, 7, , 8]);
+                        parsedUri = URI.parse(target);
+                        pathVariations = toPathVariations(parsedUri);
+                        if (!pathVariations) return [3 /*break*/, 6];
                         j = 0;
-                        _a.label = 4;
-                    case 4:
-                        if (!(j < pathVariations.length)) return [3 /*break*/, 7];
+                        _a.label = 3;
+                    case 3:
+                        if (!(j < pathVariations.length)) return [3 /*break*/, 6];
                         return [4 /*yield*/, this.fileExists(pathVariations[j])];
-                    case 5:
+                    case 4:
                         if (_a.sent()) {
-                            validLinks.push(__assign(__assign({}, links[i]), { target: pathVariations[j] }));
-                            return [3 /*break*/, 7];
+                            return [2 /*return*/, pathVariations[j]];
                         }
-                        _a.label = 6;
-                    case 6:
+                        _a.label = 5;
+                    case 5:
                         j++;
-                        return [3 /*break*/, 4];
+                        return [3 /*break*/, 3];
+                    case 6: return [2 /*return*/, undefined];
                     case 7:
-                        i++;
-                        return [3 /*break*/, 1];
-                    case 8: return [3 /*break*/, 10];
-                    case 9:
-                        validLinks.push.apply(validLinks, links);
-                        _a.label = 10;
-                    case 10: return [2 /*return*/, validLinks];
+                        e_1 = _a.sent();
+                        return [3 /*break*/, 8];
+                    case 8: return [2 /*return*/, target];
                 }
             });
         });

package/lib/esm/utils/resources.js

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { URI } from "vscode-uri";
-import { endsWith, startsWith } from "./strings";
 var Slash = '/'.charCodeAt(0);
+var Dot = '.'.charCodeAt(0);
 export function isAbsolutePath(path) {
     return path.charCodeAt(0) === Slash;
 }
@@ -16,26 +16,64 @@ export function basename(uri) {
     var lastIndexOfSlash = uri.lastIndexOf('/');
     return uri.substr(lastIndexOfSlash + 1);
 }
+export function extname(uri) {
+    for (var i = uri.length - 1; i >= 0; i--) {
+        var ch = uri.charCodeAt(i);
+        if (ch === Dot) {
+            if (i > 0 && uri.charCodeAt(i - 1) !== Slash) {
+                return uri.substr(i);
+            }
+            else {
+                break;
+            }
+        }
+        else if (ch === Slash) {
+            break;
+        }
+    }
+    return '';
+}
+export function resolvePath(uriString, path) {
+    if (isAbsolutePath(path)) {
+        var uri = URI.parse(uriString);
+        var parts = path.split('/');
+        return uri.with({ path: normalizePath(parts) }).toString();
+    }
+    return joinPath(uriString, path);
+}
+export function normalizePath(parts) {
+    var newParts = [];
+    for (var _i = 0, parts_1 = parts; _i < parts_1.length; _i++) {
+        var part = parts_1[_i];
+        if (part.length === 0 || part.length === 1 && part.charCodeAt(0) === Dot) {
+            // ignore
+        }
+        else if (part.length === 2 && part.charCodeAt(0) === Dot && part.charCodeAt(1) === Dot) {
+            newParts.pop();
+        }
+        else {
+            newParts.push(part);
+        }
+    }
+    if (parts.length > 1 && parts[parts.length - 1].length === 0) {
+        newParts.push('');
+    }
+    var res = newParts.join('/');
+    if (parts[0].length === 0) {
+        res = '/' + res;
+    }
+    return res;
+}
 export function joinPath(uriString) {
     var paths = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         paths[_i - 1] = arguments[_i];
     }
     var uri = URI.parse(uriString);
-    var uriPath = uri.path;
+    var parts = uri.path.split('/');
     for (var _a = 0, paths_1 = paths; _a < paths_1.length; _a++) {
         var path = paths_1[_a];
-        if (!endsWith(uriPath, '/') && !startsWith(path, '/')) {
-            uriPath += '/';
-        }
-        uriPath += path;
+        parts.push.apply(parts, path.split('/'));
     }
-    return uri.with({ path: uriPath }).toString();
-}
-export function resolvePath(uriString, path) {
-    if (isAbsolutePath(path)) {
-        var uri = URI.parse(uriString);
-        return uri.with({ path: path }).toString();
-    }
-    return joinPath(uriString, path);
+    return uri.with({ path: normalizePath(parts) }).toString();
 }

package/lib/umd/cssLanguageTypes.d.ts

@@ -44,7 +44,7 @@ export interface ICompletionParticipant {
     onCssMixinReference?: (context: MixinReferenceCompletionContext) => void;
 }
 export interface DocumentContext {
-    resolveReference(ref: string, base?: string): string;
+    resolveReference(ref: string, baseUrl: string): string | undefined;
 }
 /**
  * Describes what LSP capabilities the client supports

package/lib/umd/languageFacts/entry.js

@@ -53,6 +53,10 @@
         return result;
     }
     exports.getEntryDescription = getEntryDescription;
+    function textToMarkedString(text) {
+        return text.replace(/[\\`*_{}[\]()#+\-.!<>]/g, '\\$&'); // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
+    }
+    exports.textToMarkedString = textToMarkedString;
     function getEntryStringDescription(entry) {
         if (!entry.description || entry.description === '') {
             return '';
@@ -88,18 +92,14 @@
         if (entry.status) {
             result += getEntryStatus(entry.status);
         }
-        if (typeof entry.description === 'string') {
-            result += entry.description;
-        }
-        else {
-            result = entry.description.value;
-        }
+        var description = typeof entry.description === 'string' ? entry.description : entry.description.value;
+        result += textToMarkedString(description);
         var browserLabel = getBrowserLabel(entry.browsers);
         if (browserLabel) {
-            result += '\n\n(' + browserLabel + ')';
+            result += '\n\n(' + textToMarkedString(browserLabel) + ')';
         }
-        if ('syntax' in entry) {
-            result += "\n\nSyntax: " + entry.syntax;
+        if ('syntax' in entry && entry.syntax) {
+            result += "\n\nSyntax: " + textToMarkedString(entry.syntax);
         }
         if (entry.references && entry.references.length > 0) {
             result += '\n\n';

package/lib/umd/parser/scssParser.js

@@ -95,11 +95,17 @@ var __extends = (this && this.__extends) || (function () {
             if (!node.setValue(this._parseExpr())) {
                 return this.finish(node, cssErrors_1.ParseError.VariableValueExpected, [], panic);
             }
-            while (this.accept(cssScanner_1.TokenType.Exclamation)) {
-                if (!this.peekRegExp(cssScanner_1.TokenType.Ident, /^(default|global)$/)) {
-                    return this.finish(node, cssErrors_1.ParseError.UnknownKeyword);
+            while (this.peek(cssScanner_1.TokenType.Exclamation)) {
+                if (node.addChild(this._tryParsePrio())) {
+                    // !important
+                }
+                else {
+                    this.consumeToken();
+                    if (!this.peekRegExp(cssScanner_1.TokenType.Ident, /^(default|global)$/)) {
+                        return this.finish(node, cssErrors_1.ParseError.UnknownKeyword);
+                    }
+                    this.consumeToken();
                 }
-                this.consumeToken();
             }
             if (this.peek(cssScanner_1.TokenType.SemiColon)) {
                 node.semicolonPosition = this.token.offset; // not part of the declaration, but useful information for code assist
@@ -180,7 +186,7 @@ var __extends = (this && this.__extends) || (function () {
             return this._parseModuleMember() ||
                 this._parseVariable() ||
                 this._parseSelectorCombinator() ||
-                this._tryParsePrio() ||
+                //this._tryParsePrio() ||
                 _super.prototype._parseTermExpression.call(this);
         };
         SCSSParser.prototype._parseInterpolation = function () {
@@ -638,6 +644,9 @@ var __extends = (this && this.__extends) || (function () {
                 node.addChild(this._parsePrio()); // #9859
                 return this.finish(node);
             }
+            else if (node.setValue(this._tryParsePrio())) {
+                return this.finish(node);
+            }
             return null;
         };
         SCSSParser.prototype._parseURLArgument = function () {

package/lib/umd/services/cssNavigation.js

@@ -128,33 +128,44 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             for (var i = 0; i < links.length; i++) {
                 var target = links[i].target;
                 if (target && !(/^\w+:\/\//g.test(target))) {
-                    links[i].target = documentContext.resolveReference(target, document.uri);
+                    var resolved = documentContext.resolveReference(target, document.uri);
+                    if (resolved) {
+                        links[i].target = resolved;
+                    }
                 }
             }
             return links;
         };
         CSSNavigation.prototype.findDocumentLinks2 = function (document, stylesheet, documentContext) {
             return __awaiter(this, void 0, void 0, function () {
-                var links, i, target, _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var links, resolvedLinks, _i, links_1, link, target, resolvedTarget;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
                             links = this.findUnresolvedLinks(document, stylesheet);
-                            i = 0;
-                            _b.label = 1;
+                            resolvedLinks = [];
+                            _i = 0, links_1 = links;
+                            _a.label = 1;
                         case 1:
-                            if (!(i < links.length)) return [3 /*break*/, 4];
-                            target = links[i].target;
+                            if (!(_i < links_1.length)) return [3 /*break*/, 5];
+                            link = links_1[_i];
+                            target = link.target;
                             if (!(target && !(/^\w+:\/\//g.test(target)))) return [3 /*break*/, 3];
-                            _a = links[i];
                             return [4 /*yield*/, this.resolveRelativeReference(target, document.uri, documentContext)];
                         case 2:
-                            _a.target = _b.sent();
-                            _b.label = 3;
+                            resolvedTarget = _a.sent();
+                            if (resolvedTarget !== undefined) {
+                                link.target = resolvedTarget;
+                                resolvedLinks.push(link);
+                            }
+                            return [3 /*break*/, 4];
                         case 3:
-                            i++;
+                            resolvedLinks.push(link);
+                            _a.label = 4;
+                        case 4:
+                            _i++;
                             return [3 /*break*/, 1];
-                        case 4: return [2 /*return*/, links];
+                        case 5: return [2 /*return*/, resolvedLinks];
                     }
                 });
             });

package/lib/umd/services/pathCompletion.js

@@ -71,9 +71,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                     switch (_f.label) {
                         case 0:
                             result = { items: [], isIncomplete: false };
-                            if (!(strings_1.startsWith(document.uri, 'file:'))) {
-                                return [2 /*return*/, result];
-                            }
                             _i = 0, _a = this.literalCompletions;
                             _f.label = 1;
                         case 1:
@@ -150,6 +147,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                             replaceRange = pathToReplaceRange(valueBeforeCursor, fullValue, fullValueRange);
                             valueBeforeLastSlash = valueBeforeCursor.substring(0, valueBeforeCursor.lastIndexOf('/') + 1);
                             parentDir = documentContext.resolveReference(valueBeforeLastSlash || '.', currentDocUri);
+                            if (!parentDir) return [3 /*break*/, 4];
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 3, , 4]);
@@ -167,8 +165,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                             return [2 /*return*/, result];
                         case 3:
                             e_1 = _b.sent();
-                            return [2 /*return*/, []];
-                        case 4: return [2 /*return*/];
+                            return [3 /*break*/, 4];
+                        case 4: return [2 /*return*/, []];
                     }
                 });
             });

package/lib/umd/services/scssNavigation.js

@@ -11,17 +11,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -64,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./cssNavigation", "../parser/cssNodes", "vscode-uri"], factory);
+        define(["require", "exports", "./cssNavigation", "../parser/cssNodes", "vscode-uri", "../utils/strings", "../utils/resources"], factory);
     }
 })(function (require, exports) {
     /*---------------------------------------------------------------------------------------------
@@ -76,6 +65,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     var cssNavigation_1 = require("./cssNavigation");
     var nodes = require("../parser/cssNodes");
     var vscode_uri_1 = require("vscode-uri");
+    var strings_1 = require("../utils/strings");
+    var resources_1 = require("../utils/resources");
     var SCSSNavigation = /** @class */ (function (_super) {
         __extends(SCSSNavigation, _super);
         function SCSSNavigation(fileSystemProvider) {
@@ -86,7 +77,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                 node.type === nodes.NodeType.Use ||
                 node.type === nodes.NodeType.Forward);
         };
-        SCSSNavigation.prototype.findDocumentLinks2 = function (document, stylesheet, documentContext) {
+        SCSSNavigation.prototype.resolveRelativeReference = function (ref, documentUri, documentContext) {
             return __awaiter(this, void 0, void 0, function () {
                 function toPathVariations(uri) {
                     // No valid path
@@ -128,63 +119,41 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                     var cssPath = documentUriWithBasename(normalizedBasename.slice(0, -5) + '.css');
                     return [normalizedPath, underScorePath, indexPath, indexUnderscoreUri, cssPath];
                 }
-                var links, fsProvider, validLinks, i, target, parsedUri, pathVariations, j;
+                var target, parsedUri, pathVariations, j, e_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            links = this.findDocumentLinks(document, stylesheet, documentContext);
-                            fsProvider = this.fileSystemProvider;
-                            validLinks = [];
-                            if (!fsProvider) return [3 /*break*/, 9];
-                            i = 0;
-                            _a.label = 1;
-                        case 1:
-                            if (!(i < links.length)) return [3 /*break*/, 8];
-                            target = links[i].target;
-                            if (!target) {
-                                return [3 /*break*/, 7];
-                            }
-                            parsedUri = null;
-                            try {
-                                parsedUri = vscode_uri_1.URI.parse(target);
+                            if (strings_1.startsWith(ref, 'sass:')) {
+                                return [2 /*return*/, undefined]; // sass library
                             }
-                            catch (e) {
-                                if (e instanceof URIError) {
-                                    return [3 /*break*/, 7];
-                                }
-                                throw e;
-                            }
-                            pathVariations = toPathVariations(parsedUri);
-                            if (!!pathVariations) return [3 /*break*/, 3];
-                            return [4 /*yield*/, this.fileExists(target)];
+                            return [4 /*yield*/, _super.prototype.resolveRelativeReference.call(this, ref, documentUri, documentContext)];
+                        case 1:
+                            target = _a.sent();
+                            if (!(this.fileSystemProvider && target && resources_1.extname(target).length === 0)) return [3 /*break*/, 8];
+                            _a.label = 2;
                         case 2:
-                            if (_a.sent()) {
-                                validLinks.push(links[i]);
-                            }
-                            return [3 /*break*/, 7];
-                        case 3:
+                            _a.trys.push([2, 7, , 8]);
+                            parsedUri = vscode_uri_1.URI.parse(target);
+                            pathVariations = toPathVariations(parsedUri);
+                            if (!pathVariations) return [3 /*break*/, 6];
                             j = 0;
-                            _a.label = 4;
-                        case 4:
-                            if (!(j < pathVariations.length)) return [3 /*break*/, 7];
+                            _a.label = 3;
+                        case 3:
+                            if (!(j < pathVariations.length)) return [3 /*break*/, 6];
                             return [4 /*yield*/, this.fileExists(pathVariations[j])];
-                        case 5:
+                        case 4:
                             if (_a.sent()) {
-                                validLinks.push(__assign(__assign({}, links[i]), { target: pathVariations[j] }));
-                                return [3 /*break*/, 7];
+                                return [2 /*return*/, pathVariations[j]];
                             }
-                            _a.label = 6;
-                        case 6:
+                            _a.label = 5;
+                        case 5:
                             j++;
-                            return [3 /*break*/, 4];
+                            return [3 /*break*/, 3];
+                        case 6: return [2 /*return*/, undefined];
                         case 7:
-                            i++;
-                            return [3 /*break*/, 1];
-                        case 8: return [3 /*break*/, 10];
-                        case 9:
-                            validLinks.push.apply(validLinks, links);
-                            _a.label = 10;
-                        case 10: return [2 /*return*/, validLinks];
+                            e_1 = _a.sent();
+                            return [3 /*break*/, 8];
+                        case 8: return [2 /*return*/, target];
                     }
                 });
             });

package/lib/umd/utils/resources.js

@@ -8,14 +8,14 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "vscode-uri", "./strings"], factory);
+        define(["require", "exports", "vscode-uri"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var vscode_uri_1 = require("vscode-uri");
-    var strings_1 = require("./strings");
     var Slash = '/'.charCodeAt(0);
+    var Dot = '.'.charCodeAt(0);
     function isAbsolutePath(path) {
         return path.charCodeAt(0) === Slash;
     }
@@ -30,29 +30,69 @@
         return uri.substr(lastIndexOfSlash + 1);
     }
     exports.basename = basename;
+    function extname(uri) {
+        for (var i = uri.length - 1; i >= 0; i--) {
+            var ch = uri.charCodeAt(i);
+            if (ch === Dot) {
+                if (i > 0 && uri.charCodeAt(i - 1) !== Slash) {
+                    return uri.substr(i);
+                }
+                else {
+                    break;
+                }
+            }
+            else if (ch === Slash) {
+                break;
+            }
+        }
+        return '';
+    }
+    exports.extname = extname;
+    function resolvePath(uriString, path) {
+        if (isAbsolutePath(path)) {
+            var uri = vscode_uri_1.URI.parse(uriString);
+            var parts = path.split('/');
+            return uri.with({ path: normalizePath(parts) }).toString();
+        }
+        return joinPath(uriString, path);
+    }
+    exports.resolvePath = resolvePath;
+    function normalizePath(parts) {
+        var newParts = [];
+        for (var _i = 0, parts_1 = parts; _i < parts_1.length; _i++) {
+            var part = parts_1[_i];
+            if (part.length === 0 || part.length === 1 && part.charCodeAt(0) === Dot) {
+                // ignore
+            }
+            else if (part.length === 2 && part.charCodeAt(0) === Dot && part.charCodeAt(1) === Dot) {
+                newParts.pop();
+            }
+            else {
+                newParts.push(part);
+            }
+        }
+        if (parts.length > 1 && parts[parts.length - 1].length === 0) {
+            newParts.push('');
+        }
+        var res = newParts.join('/');
+        if (parts[0].length === 0) {
+            res = '/' + res;
+        }
+        return res;
+    }
+    exports.normalizePath = normalizePath;
     function joinPath(uriString) {
         var paths = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             paths[_i - 1] = arguments[_i];
         }
         var uri = vscode_uri_1.URI.parse(uriString);
-        var uriPath = uri.path;
+        var parts = uri.path.split('/');
         for (var _a = 0, paths_1 = paths; _a < paths_1.length; _a++) {
             var path = paths_1[_a];
-            if (!strings_1.endsWith(uriPath, '/') && !strings_1.startsWith(path, '/')) {
-                uriPath += '/';
-            }
-            uriPath += path;
+            parts.push.apply(parts, path.split('/'));
         }
-        return uri.with({ path: uriPath }).toString();
+        return uri.with({ path: normalizePath(parts) }).toString();
     }
     exports.joinPath = joinPath;
-    function resolvePath(uriString, path) {
-        if (isAbsolutePath(path)) {
-            var uri = vscode_uri_1.URI.parse(uriString);
-            return uri.with({ path: path }).toString();
-        }
-        return joinPath(uriString, path);
-    }
-    exports.resolvePath = resolvePath;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-css-languageservice",
-  "version": "4.3.0-next.0",
+  "version": "4.3.0",
   "description": "Language service for CSS, LESS and SCSS",
   "main": "./lib/umd/cssLanguageService.js",
   "typings": "./lib/umd/cssLanguageService",
@@ -29,9 +29,9 @@
   },
   "dependencies": {
     "vscode-languageserver-textdocument": "^1.0.1",
-    "vscode-languageserver-types": "^3.15.1",
+    "vscode-languageserver-types": "3.16.0-next.2",
     "vscode-nls": "^4.1.2",
-    "vscode-uri": "^2.1.1"
+    "vscode-uri": "^2.1.2"
   },
   "scripts": {
     "prepublishOnly": "npm run clean && npm run compile-esm && npm run test && npm run remove-sourcemap-refs",