[css] path completion in web

extensions/css-language-features/server/src/requests.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from 'vscode-uri';
-import { endsWith, startsWith } from './utils/strings';
 import { RequestType, Connection } from 'vscode-languageserver';
 import { RuntimeEnvironment } from './cssServer';
 
@@ -114,14 +113,48 @@ export function basename(uri: string) {
 	return uri.substr(lastIndexOfSlash + 1);
 }
 
+const Slash = '/'.charCodeAt(0);
+const Dot = '.'.charCodeAt(0);
+
+export function isAbsolutePath(path: string) {
+	return path.charCodeAt(0) === Slash;
+}
+
+export function resolvePath(uriString: string, path: string): string {
+	if (isAbsolutePath(path)) {
+		const uri = URI.parse(uriString);
+		const parts = path.split('/');
+		return uri.with({ path: normalizePath(parts) }).toString();
+	}
+	return joinPath(uriString, path);
+}
+
+export function normalizePath(parts: string[]): string {
+	const newParts: string[] = [];
+	for (const part of parts) {
+		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('');
+	}
+	let res = newParts.join('/');
+	if (parts[0].length === 0) {
+		res = '/' + res;
+	}
+	return res;
+}
+
 export function joinPath(uriString: string, ...paths: string[]): string {
 	const uri = URI.parse(uriString);
-	let uriPath = uri.path;
+	const parts = uri.path.split('/');
 	for (let path of paths) {
-		if (!endsWith(uriPath, '/') && !startsWith(path, '/')) {
-			uriPath += '/';
-		}
-		uriPath += path;
+		parts.push(...path.split('/'));
 	}
-	return uri.with({ path: uriPath }).toString();
+	return uri.with({ path: normalizePath(parts) }).toString();
 }

extensions/css-language-features/server/src/test/requests.test.ts

@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import 'mocha';
+import * as assert from 'assert';
+import { joinPath, normalizePath, resolvePath } from '../requests';
+
+
+suite('requests', () => {
+	test('join', async function () {
+		assert.equal(joinPath('foo://a/foo/bar', 'x'), 'foo://a/foo/bar/x');
+		assert.equal(joinPath('foo://a/foo/bar/', 'x'), 'foo://a/foo/bar/x');
+		assert.equal(joinPath('foo://a/foo/bar/', '/x'), 'foo://a/foo/bar/x');
+		assert.equal(joinPath('foo://a/foo/bar/', 'x/'), 'foo://a/foo/bar/x/');
+		assert.equal(joinPath('foo://a/foo/bar/', 'x', 'y'), 'foo://a/foo/bar/x/y');
+		assert.equal(joinPath('foo://a/foo/bar/', 'x/', '/y'), 'foo://a/foo/bar/x/y');
+		assert.equal(joinPath('foo://a/foo/bar/', '.', '/y'), 'foo://a/foo/bar/y');
+		assert.equal(joinPath('foo://a/foo/bar/', 'x/y/z', '..'), 'foo://a/foo/bar/x/y');
+	});
+
+	test('resolve', async function () {
+		assert.equal(resolvePath('foo://a/foo/bar', 'x'), 'foo://a/foo/bar/x');
+		assert.equal(resolvePath('foo://a/foo/bar/', 'x'), 'foo://a/foo/bar/x');
+		assert.equal(resolvePath('foo://a/foo/bar/', '/x'), 'foo://a/x');
+		assert.equal(resolvePath('foo://a/foo/bar/', 'x/'), 'foo://a/foo/bar/x/');
+	});
+
+	test('normalize', async function () {
+		function assertNormalize(path: string, expected: string) {
+			assert.equal(normalizePath(path.split('/')), expected, path);
+		}
+		assertNormalize('a', 'a');
+		assertNormalize('/a', '/a');
+		assertNormalize('a/', 'a/');
+		assertNormalize('a/b', 'a/b');
+		assertNormalize('/a/foo/bar/x', '/a/foo/bar/x');
+		assertNormalize('/a/foo/bar//x', '/a/foo/bar/x');
+		assertNormalize('/a/foo/bar///x', '/a/foo/bar/x');
+		assertNormalize('/a/foo/bar/x/', '/a/foo/bar/x/');
+		assertNormalize('a/foo/bar/x/', 'a/foo/bar/x/');
+		assertNormalize('a/foo/bar/x//', 'a/foo/bar/x/');
+		assertNormalize('//a/foo/bar/x//', '/a/foo/bar/x/');
+		assertNormalize('a/.', 'a');
+		assertNormalize('a/./b', 'a/b');
+		assertNormalize('a/././b', 'a/b');
+		assertNormalize('a/n/../b', 'a/b');
+		assertNormalize('a/n/../', 'a/');
+		assertNormalize('a/n/../', 'a/');
+		assertNormalize('/a/n/../..', '/');
+		assertNormalize('..', '');
+		assertNormalize('/..', '/');
+	});
+});

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

@@ -5,8 +5,8 @@
 
 import { DocumentContext } from 'vscode-css-languageservice';
 import { endsWith, startsWith } from '../utils/strings';
-import * as url from 'url';
 import { WorkspaceFolder } from 'vscode-languageserver';
+import { resolvePath } from '../requests';
 
 export function getDocumentContext(documentUri: string, workspaceFolders: WorkspaceFolder[]): DocumentContext {
 	function getRootFolder(): string | undefined {
@@ -30,7 +30,8 @@ export function getDocumentContext(documentUri: string, workspaceFolders: Worksp
 					return folderUri + ref.substr(1);
 				}
 			}
-			return url.resolve(base, ref);
+			base = base.substr(0, base.lastIndexOf('/') + 1);
+			return resolvePath(base, ref);
 		},
 	};
 }