Skip to content

(fix) always show svelte.config.js parser error #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2020
Merged

(fix) always show svelte.config.js parser error #423

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions packages/language-server/src/plugins/svelte/features/getDiagnostics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ export async function getDiagnostics(
document: Document,
svelteDoc: SvelteDocument,
): Promise<Diagnostic[]> {
if (svelteDoc.config.loadConfigError) {
return getConfigLoadErrorDiagnostics(svelteDoc.config.loadConfigError);
}

try {
return await tryGetDiagnostics(document, svelteDoc);
} catch (error) {
return getPreprocessErrorDiagnostics(document, svelteDoc, error);
return getPreprocessErrorDiagnostics(document, error);
}
}

Expand Down Expand Up @@ -91,18 +95,10 @@ async function createParserErrorDiagnostic(error: any, document: Document) {
/**
* Try to infer a nice diagnostic error message from the transpilation error.
*/
function getPreprocessErrorDiagnostics(
document: Document,
svelteDoc: SvelteDocument,
error: any,
): Diagnostic[] {
function getPreprocessErrorDiagnostics(document: Document, error: any): Diagnostic[] {
Logger.error('Preprocessing failed');
Logger.error(error);

if (svelteDoc.config.loadConfigError) {
return getConfigLoadErrorDiagnostics(svelteDoc.config.loadConfigError);
}

if (document.styleInfo && error.__source === TranspileErrorSource.Style) {
return getStyleErrorDiagnostics(error, document);
}
Expand Down