Skip to content

(fix) don't diagnose node_module files #1104

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 3 commits into from
Jul 17, 2021
Merged

(fix) don't diagnose node_module files #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f43c51
(fix) don't diagnose node_module files
Jul 17, 2021
6136a65
Merge branch 'master' into node_modules-diagnostics
Jul 17, 2021
bc69172
test, lint
Jul 17, 2021
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
14 changes: 14 additions & 0 deletions packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@ export class DiagnosticsProviderImpl implements DiagnosticsProvider {
document: Document,
cancellationToken?: CancellationToken
): Promise<Diagnostic[]> {
if (
(document.getFilePath()?.includes('/node_modules/') ||
document.getFilePath()?.includes('\\node_modules\\')) &&
// Sapper convention: Put stuff inside node_modules below src
!(
document.getFilePath()?.includes('/src/node_modules/') ||
document.getFilePath()?.includes('\\src\\node_modules\\')
)
) {
// Don't return diagnostics for files inside node_modules. These are considered read-only (cannot be changed)
// and in case of svelte-check they would pollute/skew the output
return [];
}

const { lang, tsDoc } = await this.getLSAndTSDoc(document);

if (
Expand Down
3 changes: 2 additions & 1 deletion packages/language-server/src/plugins/typescript/module-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ export function createSvelteModuleLoader(

const resolvedSvelteModule: ts.ResolvedModuleFull = {
extension: getExtensionFromScriptKind(snapshot && snapshot.scriptKind),
resolvedFileName
resolvedFileName,
isExternalLibraryImport: svelteResolvedModule.isExternalLibraryImport
};
return resolvedSvelteModule;
}
Expand Down
6 changes: 4 additions & 2 deletions packages/language-server/test/plugins/typescript/module-loader.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ describe('createSvelteModuleLoader', () => {
assert.deepStrictEqual(result, [
<ts.ResolvedModuleFull>{
extension: ts.Extension.Jsx,
resolvedFileName: 'filename.svelte'
resolvedFileName: 'filename.svelte',
isExternalLibraryImport: undefined
}
]);
assert.deepStrictEqual(lastCall(resolveStub).args, [
Expand All @@ -141,7 +142,8 @@ describe('createSvelteModuleLoader', () => {
assert.deepStrictEqual(result, [
<ts.ResolvedModuleFull>{
extension: ts.Extension.Jsx,
resolvedFileName: 'filename.svelte'
resolvedFileName: 'filename.svelte',
isExternalLibraryImport: undefined
}
]);
assert.deepStrictEqual(lastCall(resolveStub).args, [
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte-check/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Usage:
| `--output <human\|human-verbose\|machine>` |
| `--watch` | Will not exit after one pass but keep watching files for changes and rerun diagnostics |
| `--tsconfig <path>` | Pass a path to a tsconfig or jsconfig file. The path can be relative to the workspace path or absolute. Doing this means that only files matched by the files/include/exclude pattern of the config file are diagnosed. It also means that errors from TypeScript and JavaScript files are reported. |
| `--ignore <path1,path2>` | Files/folders to ignore - relative to workspace root, comma-separated, inside quotes. Example: `--ignore "dist,build"`. When used in conjunction with `--tsconfig`, this will only have effect on the files watched, not on the files that are diagnosed, which is then determined by the `tsconfig.json` |
| `--ignore <path1,path2>` | Files/folders to ignore - relative to workspace root, comma-separated, inside quotes. Example: `--ignore "dist,build"`. When used in conjunction with `--tsconfig`, this will only have effect on the files watched, not on the files that are diagnosed, which is then determined by the `tsconfig.json` |
| `--fail-on-warnings` | Will also exit with error code when there are warnings |
| `--fail-on-hints` | Will also exit with error code when there are hints |
| `--compiler-warnings <code1:error\|ignore,code2:error\|ignore>` | A list of Svelte compiler warning codes. Each entry defines whether that warning should be ignored or treated as an error. Warnings are comma-separated, between warning code and error level is a colon; all inside quotes. Example: `--compiler-warnings "css-unused-selector:ignore,unused-export-let:error"` |
Expand Down