Merge pull request #8960 from tm1000/feature/upgrade-lsp-v5

WIP: Performance/Feature Improvements to the Language Server

.gitignore

@@ -10,7 +10,7 @@
 /vendor-bin/*/composer.lock
 /vendor-bin/*/vendor/
 /tests/fixtures/symlinktest/*
-
+.vscode
 .idea/
 .vscode/
 .php-version

composer.json

@@ -44,6 +44,7 @@
     },
     "require-dev": {
         "ext-curl": "*",
+        "amphp/phpunit-util": "^2.0",
         "bamarni/composer-bin-plugin": "^1.4",
         "brianium/paratest": "^6.9",
         "mockery/mockery": "^1.5",

psalm-baseline.xml

@@ -16,8 +16,6 @@
     <PossiblyUndefinedIntArrayOffset>
       <code>$const_name</code>
       <code>$const_name</code>
-      <code>$matches[0]</code>
-      <code>$property_name</code>
       <code>$symbol_name</code>
       <code>$symbol_parts[1]</code>
     </PossiblyUndefinedIntArrayOffset>
@@ -227,11 +225,6 @@
       <code><![CDATA[$stmt->expr->getArgs()[0]]]></code>
     </PossiblyUndefinedArrayOffset>
   </file>
-  <file src="src/Psalm/Internal/Cli/LanguageServer.php">
-    <PossiblyInvalidArgument>
-      <code><![CDATA[$options['tcp'] ?? null]]></code>
-    </PossiblyInvalidArgument>
-  </file>
   <file src="src/Psalm/Internal/Cli/Refactor.php">
     <PossiblyUndefinedIntArrayOffset>
       <code>$identifier_name</code>
@@ -292,35 +285,6 @@
       <code><![CDATA[$stmt->props[0]]]></code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
-  <file src="src/Psalm/Internal/LanguageServer/LanguageClient.php">
-    <DocblockTypeContradiction>
-      <code><![CDATA[$type < 1]]></code>
-      <code><![CDATA[$type < 1 || $type > 4]]></code>
-      <code><![CDATA[$type > 4]]></code>
-    </DocblockTypeContradiction>
-  </file>
-  <file src="src/Psalm/Internal/LanguageServer/LanguageServer.php">
-    <PossiblyUnusedParam>
-      <code>$capabilities</code>
-      <code>$processId</code>
-      <code>$rootPath</code>
-    </PossiblyUnusedParam>
-  </file>
-  <file src="src/Psalm/Internal/LanguageServer/Message.php">
-    <PossiblyUndefinedIntArrayOffset>
-      <code>$pair[1]</code>
-    </PossiblyUndefinedIntArrayOffset>
-  </file>
-  <file src="src/Psalm/Internal/LanguageServer/ProtocolStreamReader.php">
-    <PossiblyUndefinedIntArrayOffset>
-      <code>$parts[1]</code>
-    </PossiblyUndefinedIntArrayOffset>
-  </file>
-  <file src="src/Psalm/Internal/LanguageServer/Server/TextDocument.php">
-    <PossiblyUndefinedIntArrayOffset>
-      <code>$contentChanges[0]</code>
-    </PossiblyUndefinedIntArrayOffset>
-  </file>
   <file src="src/Psalm/Internal/MethodIdentifier.php">
     <PossiblyUndefinedIntArrayOffset>
       <code>$method_id_parts[1]</code>

src/Psalm/CodeLocation.php

@@ -169,6 +169,7 @@ private function calculateRealLocation(): void
 
         $codebase = $project_analyzer->getCodebase();
 
+        /** @psalm-suppress ImpureMethodCall */
         $file_contents = $codebase->getFileContents($this->file_path);
 
         $file_length = strlen($file_contents);