diff --git a/extensions/html-language-features/server/src/htmlServerMain.ts b/extensions/html-language-features/server/src/htmlServerMain.ts
index ffe5c18df41..c46d6bbd0d5 100644
--- a/extensions/html-language-features/server/src/htmlServerMain.ts
+++ b/extensions/html-language-features/server/src/htmlServerMain.ts
@@ -136,7 +136,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
return { capabilities };
});
-connection.onInitialized((p) => {
+connection.onInitialized(() => {
if (workspaceFoldersSupport) {
connection.client.register(DidChangeWorkspaceFoldersNotification.type);
diff --git a/extensions/html-language-features/server/src/modes/cssMode.ts b/extensions/html-language-features/server/src/modes/cssMode.ts
index f492a9dd21c..538aa72ff7e 100644
--- a/extensions/html-language-features/server/src/modes/cssMode.ts
+++ b/extensions/html-language-features/server/src/modes/cssMode.ts
@@ -24,7 +24,7 @@ export function getCSSMode(documentRegions: LanguageModelCache, workspace: Workspace): LanguageMode {
+export function getJavaScriptMode(documentRegions: LanguageModelCache): LanguageMode {
let jsDocuments = getLanguageModelCache(10, 60, document => documentRegions.get(document).getEmbeddedDocument('javascript'));
let compilerOptions: ts.CompilerOptions = { allowNonTsExtensions: true, allowJs: true, lib: ['lib.es6.d.ts'], target: ts.ScriptTarget.Latest, moduleResolution: ts.ModuleResolutionKind.Classic };
diff --git a/extensions/html-language-features/server/src/modes/languageModes.ts b/extensions/html-language-features/server/src/modes/languageModes.ts
index e0e81828dc3..fc0b961065c 100644
--- a/extensions/html-language-features/server/src/modes/languageModes.ts
+++ b/extensions/html-language-features/server/src/modes/languageModes.ts
@@ -80,7 +80,7 @@ export function getLanguageModes(supportedLanguages: { [languageId: string]: boo
modes['css'] = getCSSMode(documentRegions, workspace);
}
if (supportedLanguages['javascript']) {
- modes['javascript'] = getJavaScriptMode(documentRegions, workspace);
+ modes['javascript'] = getJavaScriptMode(documentRegions);
}
return {
getModeAtPosition(document: TextDocument, position: Position): LanguageMode | undefined {
diff --git a/extensions/html-language-features/server/src/modes/pathCompletion.ts b/extensions/html-language-features/server/src/modes/pathCompletion.ts
index 5b943ff2392..41df679ac28 100644
--- a/extensions/html-language-features/server/src/modes/pathCompletion.ts
+++ b/extensions/html-language-features/server/src/modes/pathCompletion.ts
@@ -19,7 +19,7 @@ export function getPathCompletionParticipant(
result: CompletionItem[]
): ICompletionParticipant {
return {
- onHtmlAttributeValue: ({ tag, position, attribute, value: valueBeforeCursor, range }) => {
+ onHtmlAttributeValue: ({ tag, attribute, value: valueBeforeCursor, range }) => {
const fullValue = stripQuotes(document.getText(range));
if (shouldDoPathCompletion(tag, attribute, fullValue)) {
@@ -145,6 +145,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/html-language-features/server/src/test/completions.test.ts b/extensions/html-language-features/server/src/test/completions.test.ts
index 98a508e2054..2129433b567 100644
--- a/extensions/html-language-features/server/src/test/completions.test.ts
+++ b/extensions/html-language-features/server/src/test/completions.test.ts
@@ -21,7 +21,7 @@ export interface ItemDescription {
notAvailable?: boolean;
}
-export function assertCompletion(completions: CompletionList, expected: ItemDescription, document: TextDocument, offset: number) {
+export function assertCompletion(completions: CompletionList, expected: ItemDescription, document: TextDocument) {
let matches = completions.items.filter(completion => {
return completion.label === expected.label;
});
@@ -70,7 +70,7 @@ export function testCompletionFor(value: string, expected: { count?: number, ite
}
if (expected.items) {
for (let item of expected.items) {
- assertCompletion(list, item, document, offset);
+ assertCompletion(list, item, document);
}
}
}
@@ -296,7 +296,7 @@ suite('HTML Path Completion', () => {
]
}, indexHtmlUri, [fixtureWorkspace]);
});
-
+
test('Completion should ignore files/folders starting with dot', () => {
testCompletionFor('