Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[css] .asar file breaks CSS path completion. Fixes #46638

Browse Source
This commit is contained in:
Martin Aeschlimann
2018-03-28 21:39:44 +02:00
parent 9e0374f29f
commit d9d762d1ce
4 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/css-language-features/server/src/pathCompletion.ts
View File

@@ -10,7 +10,7 @@ import URI from 'vscode-uri';
import { TextDocument, CompletionList, CompletionItemKind, CompletionItem, TextEdit, Range, Position } from 'vscode-languageserver-types';
import { WorkspaceFolder } from 'vscode-languageserver';
import { ICompletionParticipant } from 'vscode-css-languageservice';
import { ICompletionParticipant, URILiteralCompletionContext } from 'vscode-css-languageservice';
import { startsWith } from './utils/strings';
@@ -20,7 +20,7 @@ export function getPathCompletionParticipant(
result: CompletionList
): ICompletionParticipant {
return {
onURILiteralValue: (context: { uriValue: string, position: Position, range: Range; }) => {
onURILiteralValue: (context: URILiteralCompletionContext) => {
if (!workspaceFolders || workspaceFolders.length === 0) {
return;
}
@@ -91,7 +91,11 @@ export function providePathSuggestions(value: string, range: Range, activeDocFsP
}
const isDir = (p: string) => {
return fs.statSync(p).isDirectory();
try {
return fs.statSync(p).isDirectory();
} catch (e) {
return false;
}
};
function resolveWorkspaceRoot(activeDoc: TextDocument, workspaceFolders: WorkspaceFolder[]): string | undefined {

14
extensions/css-language-features/server/src/test/completion.test.ts
View File

@@ -77,5 +77,19 @@ suite('Completions', () => {
{ label: 'src/', resultText: `html { background-image: url('../src/')` }
]
}, testUri);
assertCompletions(`html { background-image: url('../src/a|')`, {
items: [
{ label: 'feature.js', resultText: `html { background-image: url('../src/feature.js')` },
{ label: 'data/', resultText: `html { background-image: url('../src/data/')` },
{ label: 'test.js', resultText: `html { background-image: url('../src/test.js')` }
]
}, testUri);
assertCompletions(`html { background-image: url('../src/data/f|.asar')`, {
items: [
{ label: 'foo.asar', resultText: `html { background-image: url('../src/data/foo.asar')` }
]
}, testUri);
});
});

4
extensions/css-language-features/server/test/pathCompletionFixtures/src/data/foo.asar Normal file
View File

@@ -0,0 +1,4 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/