From ba4c055fea8cb65492b2c2ee0ddc9f673c26ef30 Mon Sep 17 00:00:00 2001
From: Varun Patil <radialapps@gmail.com>
Date: Sat, 14 Oct 2023 12:56:31 -0700
Subject: [PATCH] psalm: use separate langserver config

Signed-off-by: Varun Patil <radialapps@gmail.com>
---
 .vscode/settings.json |  3 +++
 psalm-ls.xml          | 40 ++++++++++++++++++++++++++++++++++++++++
 psalm.xml             | 17 ++++-------------
 3 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 psalm-ls.xml

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 267fa74a..7abca2a5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -98,4 +98,7 @@
   },
   "git.alwaysSignOff": true,
   "editor.formatOnSave": true,
+  "psalm.configPaths": [
+    "psalm-ls.xml"
+  ],
 }
\ No newline at end of file
diff --git a/psalm-ls.xml b/psalm-ls.xml
new file mode 100644
index 00000000..eb9f6a8b
--- /dev/null
+++ b/psalm-ls.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<psalm
+    totallyTyped="true"
+    errorLevel="5"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    cacheDirectory=".cache/psalm"
+>
+    <!--
+        Duplication is due to differences in language server and CLI
+        The CLI needs the files in extraFiles since we specify lib as
+        the scan directory. The language server needs the files in
+        projectFiles since it doesn't seem to support extraFiles.
+    -->
+    <projectFiles>
+        <directory name="lib" />
+        <directory name="../../lib" />
+        <directory name="../../apps/files/lib/Event" />
+        <directory name="../../3rdparty/doctrine" />
+        <directory name="../../3rdparty/psr" />
+        <directory name="../../3rdparty/guzzlehttp" />
+
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <UndefinedDocblockClass>
+            <errorLevel type="suppress">
+                <referencedClass name="Doctrine\DBAL\Schema\Schema" />
+                <referencedClass name="Doctrine\DBAL\Schema\SchemaException" />
+                <referencedClass name="Doctrine\DBAL\Driver\Statement" />
+                <referencedClass name="Doctrine\DBAL\Schema\Table" />
+                <referencedClass name="Doctrine\DBAL\Platforms\AbstractPlatform" />
+            </errorLevel>
+        </UndefinedDocblockClass>
+    </issueHandlers>
+</psalm>
\ No newline at end of file
diff --git a/psalm.xml b/psalm.xml
index a2895d81..5cd61c32 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,23 +8,14 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     cacheDirectory=".cache/psalm"
 >
+    <!-- The language server works slightly differently and has a different file -->
     <projectFiles>
         <directory name="lib" />
-
-        <!--
-            Duplication is due to differences in language server and CLI
-            The CLI needs the files in extraFiles since we specify lib as
-            the scan directory. The language server needs the files in
-            projectFiles since it doesn't seem to support extraFiles.
-        -->
-        <directory name="../../lib" />
-        <directory name="../../apps/files/lib/Event" />
-        <directory name="../../3rdparty/doctrine" />
-        <directory name="../../3rdparty/psr" />
-        <directory name="../../3rdparty/guzzlehttp" />
-
         <ignoreFiles>
             <directory name="vendor" />
+            <directory name="../../lib" />
+            <directory name="../../apps/files" />
+            <directory name="../../3rdparty" />
         </ignoreFiles>
     </projectFiles>
     <extraFiles>