Skip to content

Commit

Permalink
Port the rest of the server layer away from multi-file approach
Browse files Browse the repository at this point in the history
  • Loading branch information
Matsuuu committed Nov 7, 2023
1 parent 5617f7d commit 0898fea
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 44 deletions.
30 changes: 13 additions & 17 deletions lib/server/src/diagnostics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,26 @@ export async function runDiagnostics(uri: string, textDoc: TextDocument) {

function handleDiagnostics(uri: string, textDoc: TextDocument) {
const fileName = url.fileURLToPath(uri);

Check warning on line 17 in lib/server/src/diagnostics.ts

View workflow job for this annotation

GitHub Actions / Qodana for JS

Unused local symbol

Unused constant fileName
const languageService = getLanguageService(fileName, textDoc.getText());
const usableData = textDocumentToUsableData(textDoc);
const queryData = generateLanguageServiceQueryDataForDiagnostics(usableData, textDoc.uri);

if (!queryData.isValid) {
return;
}

const request = createCustomElementsLanguageServiceRequestFromQueryData(queryData);

const importDiagnostics = getImportDiagnostics(request);
const nonClosedTagDiagnostics = getMissingCloseTagDiagnostics(0, request);

// TODO: Filter diagnostics calls by filetype. No need for imports for md etc.? Or is there?
const diagnostics = [...importDiagnostics, ...nonClosedTagDiagnostics];

try {
let diagnostics = languageService?.getSemanticDiagnostics(fileName);
if (diagnostics === undefined) {
if (queryData.isValid) {
const request = createCustomElementsLanguageServiceRequestFromQueryData(queryData);

const importDiagnostics = getImportDiagnostics(request);
const nonClosedTagDiagnostics = getMissingCloseTagDiagnostics(0, request);

// TODO: Filter diagnostics calls by filetype. No need for imports for md etc.? Or is there?
diagnostics = [...importDiagnostics, ...nonClosedTagDiagnostics];
}
}
const sendableDiagnostics: Array<Diagnostic> = diagnostics
?.map((diag: ts.Diagnostic) => tsDiagnosticToDiagnostic(diag, textDoc))
.filter((diag: unknown): diag is Diagnostic => diag !== undefined) ?? [];

connection.sendDiagnostics({ uri: textDoc.uri, diagnostics: sendableDiagnostics });
} catch (ex) {

}

} catch (ex) { }
}
1 change: 0 additions & 1 deletion lib/server/src/handlers/completions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import ts from "typescript";
import { CompletionList, CompletionParams, CompletionItem } from "vscode-languageserver";
import { textDocumentDataToUsableData } from "../transformers";
import { documents } from "../text-documents";
import { getLanguageService } from "../language-services/language-services";
import { wait } from "../wait";
import { elementKindToCompletionKind, getCompletionEntries } from "custom-elements-languageserver-core";
import { createCustomElementsLanguageServiceRequest, createCustomElementsLanguageServiceRequestFromQueryData } from "../language-services/request";

Check warning on line 7 in lib/server/src/handlers/completions.ts

View workflow job for this annotation

GitHub Actions / Qodana for JS

Unused import

Unused import specifier createCustomElementsLanguageServiceRequestFromQueryData
Expand Down
26 changes: 0 additions & 26 deletions lib/server/src/handlers/handler.ts

This file was deleted.

0 comments on commit 0898fea

Please sign in to comment.