Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/html-language-features/server/src/utils/arrays.ts

@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export function pushAll<T>(to: T[], from: T[]) {
+	if (from) {
+		for (const e of from) {
+			to.push(e);
+		}
+	}
+}
+
+export function contains<T>(arr: T[], val: T) {
+	return arr.indexOf(val) !== -1;
+}
+
+/**
+ * Like `Array#sort` but always stable. Usually runs a little slower `than Array#sort`
+ * so only use this when actually needing stable sort.
+ */
+export function mergeSort<T>(data: T[], compare: (a: T, b: T) => number): T[] {
+	_divideAndMerge(data, compare);
+	return data;
+}
+
+function _divideAndMerge<T>(data: T[], compare: (a: T, b: T) => number): void {
+	if (data.length <= 1) {
+		// sorted
+		return;
+	}
+	const p = (data.length / 2) | 0;
+	const left = data.slice(0, p);
+	const right = data.slice(p);
+
+	_divideAndMerge(left, compare);
+	_divideAndMerge(right, compare);
+
+	let leftIdx = 0;
+	let rightIdx = 0;
+	let i = 0;
+	while (leftIdx < left.length && rightIdx < right.length) {
+		let ret = compare(left[leftIdx], right[rightIdx]);
+		if (ret <= 0) {
+			// smaller_equal -> take left to preserve order
+			data[i++] = left[leftIdx++];
+		} else {
+			// greater -> take right
+			data[i++] = right[rightIdx++];
+		}
+	}
+	while (leftIdx < left.length) {
+		data[i++] = left[leftIdx++];
+	}
+	while (rightIdx < right.length) {
+		data[i++] = right[rightIdx++];
+	}
+}
+
+export function binarySearch<T>(array: T[], key: T, comparator: (op1: T, op2: T) => number): number {
+	let low = 0,
+		high = array.length - 1;
+
+	while (low <= high) {
+		let mid = ((low + high) / 2) | 0;
+		let comp = comparator(array[mid], key);
+		if (comp < 0) {
+			low = mid + 1;
+		} else if (comp > 0) {
+			high = mid - 1;
+		} else {
+			return mid;
+		}
+	}
+	return -(low + 1);
+}

lib/vscode/extensions/html-language-features/server/src/utils/documentContext.ts

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { DocumentContext } from 'vscode-css-languageservice';
+import { endsWith, startsWith } from '../utils/strings';
+import { WorkspaceFolder } from 'vscode-languageserver';
+import { resolvePath } from '../requests';
+
+export function getDocumentContext(documentUri: string, workspaceFolders: WorkspaceFolder[]): DocumentContext {
+	function getRootFolder(): string | undefined {
+		for (let folder of workspaceFolders) {
+			let folderURI = folder.uri;
+			if (!endsWith(folderURI, '/')) {
+				folderURI = folderURI + '/';
+			}
+			if (startsWith(documentUri, folderURI)) {
+				return folderURI;
+			}
+		}
+		return undefined;
+	}
+
+	return {
+		resolveReference: (ref: string, base = documentUri) => {
+			if (ref[0] === '/') { // resolve absolute path against the current workspace folder
+				let folderUri = getRootFolder();
+				if (folderUri) {
+					return folderUri + ref.substr(1);
+				}
+			}
+			base = base.substr(0, base.lastIndexOf('/') + 1);
+			return resolvePath(base, ref);
+		},
+	};
+}
+

lib/vscode/extensions/html-language-features/server/src/utils/positions.ts

@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Position, Range } from '../modes/languageModes';
+
+export function beforeOrSame(p1: Position, p2: Position) {
+	return p1.line < p2.line || p1.line === p2.line && p1.character <= p2.character;
+}
+export function insideRangeButNotSame(r1: Range, r2: Range) {
+	return beforeOrSame(r1.start, r2.start) && beforeOrSame(r2.end, r1.end) && !equalRange(r1, r2);
+}
+export function equalRange(r1: Range, r2: Range) {
+	return r1.start.line === r2.start.line && r1.start.character === r2.start.character && r1.end.line === r2.end.line && r1.end.character === r2.end.character;
+}

lib/vscode/extensions/html-language-features/server/src/utils/runner.ts

@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ResponseError, ErrorCodes, CancellationToken } from 'vscode-languageserver';
+
+export function formatError(message: string, err: any): string {
+	if (err instanceof Error) {
+		let error = <Error>err;
+		return `${message}: ${error.message}\n${error.stack}`;
+	} else if (typeof err === 'string') {
+		return `${message}: ${err}`;
+	} else if (err) {
+		return `${message}: ${err.toString()}`;
+	}
+	return message;
+}
+
+export function runSafe<T>(func: () => Thenable<T>, errorVal: T, errorMessage: string, token: CancellationToken): Thenable<T | ResponseError<any>> {
+	return new Promise<T | ResponseError<any>>((resolve) => {
+		setImmediate(() => {
+			if (token.isCancellationRequested) {
+				resolve(cancelValue());
+			}
+			return func().then(result => {
+				if (token.isCancellationRequested) {
+					resolve(cancelValue());
+					return;
+				} else {
+					resolve(result);
+				}
+			}, e => {
+				console.error(formatError(errorMessage, e));
+				resolve(errorVal);
+			});
+		});
+	});
+}
+
+
+
+function cancelValue<E>() {
+	return new ResponseError<E>(ErrorCodes.RequestCancelled, 'Request cancelled');
+}

lib/vscode/extensions/html-language-features/server/src/utils/strings.ts

@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export function getWordAtText(text: string, offset: number, wordDefinition: RegExp): { start: number, length: number } {
+	let lineStart = offset;
+	while (lineStart > 0 && !isNewlineCharacter(text.charCodeAt(lineStart - 1))) {
+		lineStart--;
+	}
+	let offsetInLine = offset - lineStart;
+	let lineText = text.substr(lineStart);
+
+	// make a copy of the regex as to not keep the state
+	let flags = wordDefinition.ignoreCase ? 'gi' : 'g';
+	wordDefinition = new RegExp(wordDefinition.source, flags);
+
+	let match = wordDefinition.exec(lineText);
+	while (match && match.index + match[0].length < offsetInLine) {
+		match = wordDefinition.exec(lineText);
+	}
+	if (match && match.index <= offsetInLine) {
+		return { start: match.index + lineStart, length: match[0].length };
+	}
+
+	return { start: offset, length: 0 };
+}
+
+export function startsWith(haystack: string, needle: string): boolean {
+	if (haystack.length < needle.length) {
+		return false;
+	}
+
+	for (let i = 0; i < needle.length; i++) {
+		if (haystack[i] !== needle[i]) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+export function endsWith(haystack: string, needle: string): boolean {
+	let diff = haystack.length - needle.length;
+	if (diff > 0) {
+		return haystack.indexOf(needle, diff) === diff;
+	} else if (diff === 0) {
+		return haystack === needle;
+	} else {
+		return false;
+	}
+}
+
+export function repeat(value: string, count: number) {
+	let s = '';
+	while (count > 0) {
+		if ((count & 1) === 1) {
+			s += value;
+		}
+		value += value;
+		count = count >>> 1;
+	}
+	return s;
+}
+
+export function isWhitespaceOnly(str: string) {
+	return /^\s*$/.test(str);
+}
+
+export function isEOL(content: string, offset: number) {
+	return isNewlineCharacter(content.charCodeAt(offset));
+}
+
+const CR = '\r'.charCodeAt(0);
+const NL = '\n'.charCodeAt(0);
+export function isNewlineCharacter(charCode: number) {
+	return charCode === CR || charCode === NL;
+}