Merge pull request #10230 from ging-dev/lsp

feat(LSP): Improve the autocomplete for nested array shape
vimeo · Sep 28, 2023 · 2d3a625 · 2d3a625
2 parents f570886 + 45807e2
commit 2d3a625
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php
@@ -480,6 +480,17 @@ public static function getArrayAccessTypeGivenOffset(
 
         $key_values = [];
 
+        if ($codebase->store_node_types
+            && !$context->collect_initializations
+            && !$context->collect_mutations
+        ) {
+            $codebase->analyzer->addNodeType(
+                $statements_analyzer->getFilePath(),
+                $stmt->var,
+                $array_type->getId(),
+            );
+        }
+
         if ($stmt->dim instanceof PhpParser\Node\Scalar\String_) {
             $value_type = Type::getAtomicStringFromLiteral($stmt->dim->value);
             if ($value_type instanceof TLiteralString) {

diff --git a/tests/LanguageServer/CompletionTest.php b/tests/LanguageServer/CompletionTest.php
@@ -1380,6 +1380,39 @@ public function testCompletionOnArrayKey(): void
         $this->assertCount(2, $completion_items);
     }
 
+    public function testCompletionOnNestedArrayKey(): void
+    {
+        $codebase = $this->codebase;
+        $config = $codebase->config;
+        $config->throw_exception = false;
+
+        $this->addFile(
+            'somefile.php',
+            '<?php
+                $my_array = ["foo" => ["bar" => 1]];
+                $my_array["foo"][]
+                ',
+        );
+
+        $codebase->file_provider->openFile('somefile.php');
+        $codebase->scanFiles();
+        $this->analyzeFile('somefile.php', new Context());
+
+        $completion_data = $codebase->getCompletionDataAtPosition('somefile.php', new Position(2, 33));
+        $this->assertSame(
+            [
+                'array{bar: 1}',
+                '[',
+                92,
+            ],
+            $completion_data,
+        );
+
+        $completion_items = $codebase->getCompletionItemsForArrayKeys($completion_data[0]);
+
+        $this->assertCount(1, $completion_items);
+    }
+
     public function testTypeContextForFunctionArgument(): void
     {