From 342dfcd7b6346541fd33332fa04a06990bfd0311 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Sun, 30 Aug 2020 18:15:42 +0200 Subject: [PATCH 1/3] (fix) take .prettierignore into account https://github.com/sveltejs/prettier-plugin-svelte/issues/131 There may be more to this than just using .prettierignore. Fix later if it comes up: https://github.com/prettier/prettier-vscode/blob/74a879f4c4cf5e6db31ee421ed2a88168ac013c8/src/IgnorerResolver.ts --- .../language-server/src/plugins/svelte/SveltePlugin.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/language-server/src/plugins/svelte/SveltePlugin.ts b/packages/language-server/src/plugins/svelte/SveltePlugin.ts index c277827e6..0349b41cd 100644 --- a/packages/language-server/src/plugins/svelte/SveltePlugin.ts +++ b/packages/language-server/src/plugins/svelte/SveltePlugin.ts @@ -24,6 +24,7 @@ import { getCompletions } from './features/getCompletions'; import { getDiagnostics } from './features/getDiagnostics'; import { getHoverInfo } from './features/getHoverInfo'; import { SvelteCompileResult, SvelteDocument } from './SvelteDocument'; +import { Logger } from '../../logger'; export class SveltePlugin implements @@ -67,6 +68,13 @@ export class SveltePlugin // Try resolving the config through prettier and fall back to possible editor config const config = (await prettier.resolveConfig(filePath, { editorconfig: true })) || this.prettierConfig; + // Take .prettierignore into account + const fileInfo = await prettier.getFileInfo(filePath, {ignorePath: this.prettierConfig?.ignorePath}) + if (fileInfo.ignored) { + Logger.log('File is ignored, formatting skipped'); + return []; + } + const formattedCode = prettier.format(document.getText(), { ...config, plugins: getSveltePlugin(), From 7bd245e087c53e2386bcda03b350c9bc870e4fac Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Sun, 30 Aug 2020 18:19:56 +0200 Subject: [PATCH 2/3] lint --- packages/language-server/src/plugins/svelte/SveltePlugin.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/language-server/src/plugins/svelte/SveltePlugin.ts b/packages/language-server/src/plugins/svelte/SveltePlugin.ts index 0349b41cd..3caf8567e 100644 --- a/packages/language-server/src/plugins/svelte/SveltePlugin.ts +++ b/packages/language-server/src/plugins/svelte/SveltePlugin.ts @@ -69,7 +69,9 @@ export class SveltePlugin const config = (await prettier.resolveConfig(filePath, { editorconfig: true })) || this.prettierConfig; // Take .prettierignore into account - const fileInfo = await prettier.getFileInfo(filePath, {ignorePath: this.prettierConfig?.ignorePath}) + const fileInfo = await prettier.getFileInfo(filePath, { + ignorePath: this.prettierConfig?.ignorePath, + }); if (fileInfo.ignored) { Logger.log('File is ignored, formatting skipped'); return []; From 555e8bc90059844d93f6489a3d94098ea4930be7 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Mon, 31 Aug 2020 09:29:32 +0200 Subject: [PATCH 3/3] fall back to `.prettierignore` --- packages/language-server/src/plugins/svelte/SveltePlugin.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/language-server/src/plugins/svelte/SveltePlugin.ts b/packages/language-server/src/plugins/svelte/SveltePlugin.ts index 3caf8567e..2128e56ac 100644 --- a/packages/language-server/src/plugins/svelte/SveltePlugin.ts +++ b/packages/language-server/src/plugins/svelte/SveltePlugin.ts @@ -70,7 +70,7 @@ export class SveltePlugin (await prettier.resolveConfig(filePath, { editorconfig: true })) || this.prettierConfig; // Take .prettierignore into account const fileInfo = await prettier.getFileInfo(filePath, { - ignorePath: this.prettierConfig?.ignorePath, + ignorePath: this.prettierConfig?.ignorePath ?? '.prettierignore', }); if (fileInfo.ignored) { Logger.log('File is ignored, formatting skipped');