diff --git a/extensions/css-language-features/server/src/pathCompletion.ts b/extensions/css-language-features/server/src/pathCompletion.ts index fb7bd8df9c4..61077e2be98 100644 --- a/extensions/css-language-features/server/src/pathCompletion.ts +++ b/extensions/css-language-features/server/src/pathCompletion.ts @@ -201,6 +201,7 @@ function resolveWorkspaceRoot(activeDoc: TextDocument, workspaceFolders: Workspa return path.resolve(URI.parse(workspaceFolders[i].uri).fsPath); } } + return undefined; } function shiftPosition(pos: Position, offset: number): Position { diff --git a/extensions/css-language-features/server/src/test/completion.test.ts b/extensions/css-language-features/server/src/test/completion.test.ts index aca18d6463b..8885cc01fc1 100644 --- a/extensions/css-language-features/server/src/test/completion.test.ts +++ b/extensions/css-language-features/server/src/test/completion.test.ts @@ -21,7 +21,7 @@ export interface ItemDescription { suite('Completions', () => { const cssLanguageService = getCSSLanguageService(); - let assertCompletion = function (completions: CompletionList, expected: ItemDescription, document: TextDocument, offset: number) { + let assertCompletion = function (completions: CompletionList, expected: ItemDescription, document: TextDocument, _offset: number) { let matches = completions.items.filter(completion => { return completion.label === expected.label; }); diff --git a/extensions/css-language-features/server/src/utils/runner.ts b/extensions/css-language-features/server/src/utils/runner.ts index 273194ce431..907dfe1f263 100644 --- a/extensions/css-language-features/server/src/utils/runner.ts +++ b/extensions/css-language-features/server/src/utils/runner.ts @@ -19,7 +19,7 @@ export function formatError(message: string, err: any): string { } export function runSafe(func: () => T, errorVal: T, errorMessage: string, token: CancellationToken): Thenable> { - return new Promise>((resolve, reject) => { + return new Promise>((resolve) => { setImmediate(() => { if (token.isCancellationRequested) { resolve(cancelValue()); diff --git a/extensions/css-language-features/server/tsconfig.json b/extensions/css-language-features/server/tsconfig.json index 7f8b647d04b..3203105c05c 100644 --- a/extensions/css-language-features/server/tsconfig.json +++ b/extensions/css-language-features/server/tsconfig.json @@ -1,13 +1,7 @@ { + "extends": "../../shared.tsconfig.json", "compilerOptions": { - "target": "es5", - "module": "commonjs", - "outDir": "./out", - "noUnusedLocals": true, - "lib": [ - "es5", "es2015.promise" - ], - "strict": true + "outDir": "./out" }, "include": [ "src/**/*"