maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[css] enable tests (fixes #74937)

Browse source
This commit is contained in:
Martin Aeschlimann 2019-06-06 09:49:55 +02:00
parent b77b0defc4
commit 3ce5cb0e02
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
extensions/css-language-features/server/src/test/links.test.ts
View file

@ -67,13 +67,13 @@ suite('Links', () => {
);
});
// test('url links', function () {
test('node module resolving', function () {
// let testUri = getTestResource('about.css');
// let folders = [{ name: 'x', uri: getTestResource('') }];
let testUri = getTestResource('about.css');
let folders = [{ name: 'x', uri: getTestResource('') }];
// assertLinks('html { background-image: url("~foo/hello.html|")',
// [{ offset: 29, value: '"~foo/hello.html"', target: getTestResource('node_modules/foo/hello.html') }], testUri, folders
// );
// });
assertLinks('html { background-image: url("~foo/hello.html|")',
[{ offset: 29, value: '"~foo/hello.html"', target: getTestResource('node_modules/foo/hello.html') }], testUri, folders
);
});
});

16
extensions/css-language-features/server/src/utils/documentContext.ts
View file

@ -57,13 +57,17 @@ export function getDocumentContext(documentUri: string, workspaceFolders: Worksp
// and [sass-loader's](https://github.com/webpack-contrib/sass-loader#imports)
// convention, if an import path starts with ~ then use node module resolution
// *unless* it starts with "~/" as this refers to the user's home directory.
if (ref[0] === '~' && ref[1] !== '/' && startsWith(base, 'file://')) {
const moduleName = getModuleNameFromPath(ref.substring(1));
const modulePath = resolvePathToModule(moduleName, base);
if (modulePath) {
const pathWithinModule = ref.substring(moduleName.length + 2);
return url.resolve(modulePath, pathWithinModule);
if (ref[0] === '~' && ref[1] !== '/') {
ref = ref.substring(1);
if (startsWith(base, 'file://')) {
const moduleName = getModuleNameFromPath(ref);
const modulePath = resolvePathToModule(moduleName, base);
if (modulePath) {
const pathWithinModule = ref.substring(moduleName.length + 1);
return url.resolve(modulePath, pathWithinModule);
}
}
}
return url.resolve(base, ref);
},