diff --git a/.changeset/curvy-boats-taste.md b/.changeset/curvy-boats-taste.md new file mode 100644 index 000000000..8f7f75c23 --- /dev/null +++ b/.changeset/curvy-boats-taste.md @@ -0,0 +1,6 @@ +--- +'svelte-language-server': patch +'svelte-check': patch +--- + +fix: prevent config loading message in svelte-check --incremental diff --git a/packages/language-server/src/lib/documents/Document.ts b/packages/language-server/src/lib/documents/Document.ts index dde5a0e2f..0d5a743c9 100644 --- a/packages/language-server/src/lib/documents/Document.ts +++ b/packages/language-server/src/lib/documents/Document.ts @@ -38,10 +38,14 @@ export class Document extends WritableDocument { constructor( public url: string, - public content: string + public content: string, + loadConfig = false ) { super(); - this.configPromise = configLoader.awaitConfig(this.getFilePath() || ''); + this.configPromise = loadConfig + ? configLoader.awaitConfig(this.getFilePath() || '') + : Promise.resolve(undefined); + this.updateDocInfo(); } diff --git a/packages/language-server/src/server.ts b/packages/language-server/src/server.ts index 0dd74b2f6..634e014ac 100644 --- a/packages/language-server/src/server.ts +++ b/packages/language-server/src/server.ts @@ -97,7 +97,7 @@ export function startServer(options?: LSOptions) { } const docManager = new DocumentManager( - (textDocument) => new Document(textDocument.uri, textDocument.text) + (textDocument) => new Document(textDocument.uri, textDocument.text, /*loadConfig*/ true) ); const configManager = new LSConfigManager(); const pluginHost = new PluginHost(docManager); diff --git a/packages/language-server/src/svelte-check.ts b/packages/language-server/src/svelte-check.ts index 491d13141..38789feb9 100644 --- a/packages/language-server/src/svelte-check.ts +++ b/packages/language-server/src/svelte-check.ts @@ -37,6 +37,7 @@ export function mapSvelteCheckDiagnostics( }; } ): Diagnostic[] { + Logger.setLogErrorsOnly(true); const document = new Document(pathToUrl(sourcePath), sourceText); const snapshot = DocumentSnapshot.fromDocument(document, { parse: document.compiler?.parse, @@ -74,7 +75,7 @@ export interface SvelteCheckOptions { */ export class SvelteCheck { private docManager = new DocumentManager( - (textDocument) => new Document(textDocument.uri, textDocument.text) + (textDocument) => new Document(textDocument.uri, textDocument.text, /*loadConfig*/ true) ); private configManager = new LSConfigManager(); private pluginHost = new PluginHost(this.docManager); diff --git a/packages/language-server/test/plugins/svelte/SveltePlugin.test.ts b/packages/language-server/test/plugins/svelte/SveltePlugin.test.ts index 8ded2d132..7da1e9eb9 100644 --- a/packages/language-server/test/plugins/svelte/SveltePlugin.test.ts +++ b/packages/language-server/test/plugins/svelte/SveltePlugin.test.ts @@ -22,7 +22,7 @@ describe('Svelte Plugin', () => { prettierConfig?: any, { trusted = true, documentUri = 'file:///hello.svelte' } = {} ) { - const document = new Document(documentUri, content); + const document = new Document(documentUri, content, /*loadConfig*/ true); const docManager = new DocumentManager(() => document); const pluginManager = new LSConfigManager(); pluginManager.updateIsTrusted(trusted); diff --git a/packages/language-server/test/plugins/svelte/features/getCodeAction.test.ts b/packages/language-server/test/plugins/svelte/features/getCodeAction.test.ts index 617ad0b4f..3c00864fa 100644 --- a/packages/language-server/test/plugins/svelte/features/getCodeAction.test.ts +++ b/packages/language-server/test/plugins/svelte/features/getCodeAction.test.ts @@ -39,7 +39,8 @@ describe('SveltePlugin#getCodeAction', () => { const filePath = path.join(testDir, filename); const document = new Document( pathToUrl(filePath), - filename ? fs.readFileSync(filePath)?.toString() : '' + filename ? fs.readFileSync(filePath)?.toString() : '', + /*loadConfig*/ true ); const svelteDoc = new SvelteDocument(document); const codeAction = await getCodeActions( diff --git a/packages/language-server/test/plugins/svelte/features/getDiagnostics.test.ts b/packages/language-server/test/plugins/svelte/features/getDiagnostics.test.ts index d2668b03c..af015c361 100644 --- a/packages/language-server/test/plugins/svelte/features/getDiagnostics.test.ts +++ b/packages/language-server/test/plugins/svelte/features/getDiagnostics.test.ts @@ -46,7 +46,11 @@ describe('SveltePlugin#getDiagnostics', () => { function setupFromFile(filename: string) { const testDir = path.join(__dirname, '..'); const filePath = path.join(testDir, 'testfiles', filename); - const document = new Document(pathToUrl(filePath), fs.readFileSync(filePath, 'utf-8')); + const document = new Document( + pathToUrl(filePath), + fs.readFileSync(filePath, 'utf-8'), + /*loadConfig*/ true + ); const pluginManager = new LSConfigManager(); const plugin = new SveltePlugin(pluginManager); return { plugin, document }; diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/index.test.ts b/packages/language-server/test/plugins/typescript/features/diagnostics/index.test.ts index 6d8ae0bcd..a14f0e5e4 100644 --- a/packages/language-server/test/plugins/typescript/features/diagnostics/index.test.ts +++ b/packages/language-server/test/plugins/typescript/features/diagnostics/index.test.ts @@ -17,7 +17,7 @@ import { getPackageInfo } from '../../../../../src/importPackage'; function setup(workspaceDir: string, filePath: string) { const docManager = new DocumentManager( - (textDocument) => new Document(textDocument.uri, textDocument.text) + (textDocument) => new Document(textDocument.uri, textDocument.text, /*loadConfig*/ true) ); const configManager = new LSConfigManager(); const lsAndTsDocResolver = new LSAndTSDocResolver(