From 6f3df5f949acfb53f161156385d539e3472a324d Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 13 Sep 2021 09:45:22 +0200
Subject: [PATCH] (fix) don't do any diagnostics for node_module files (#1174)

Previously, only TS diagnostics were omitted
#1056
---
 packages/language-server/src/plugins/PluginHost.ts | 14 ++++++++++++++
 .../typescript/features/DiagnosticsProvider.ts     | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/language-server/src/plugins/PluginHost.ts b/packages/language-server/src/plugins/PluginHost.ts
index 6f15f630f..f4a25ebfa 100644
--- a/packages/language-server/src/plugins/PluginHost.ts
+++ b/packages/language-server/src/plugins/PluginHost.ts
@@ -75,6 +75,20 @@ export class PluginHost implements LSProvider, OnWatchFileChanges {
             throw new Error('Cannot call methods on an unopened document');
         }
 
+        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 [];
+        }
+
         return flatten(
             await this.execute<Diagnostic[]>(
                 'getDiagnostics',
diff --git a/packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts b/packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts
index 4f7e7dfc2..f0334143d 100644
--- a/packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts
+++ b/packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts
@@ -15,20 +15,6 @@ 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 (