From 6fb21817e4bef85dfb9a6e6f32d36d1507f33794 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Thu, 24 Nov 2016 13:26:22 +0100
Subject: [PATCH] Correct variable insertion

---
 src/CompletionProvider.php                   | 12 ++++---
 src/Protocol/Position.php                    |  3 +-
 tests/Server/TextDocument/CompletionTest.php | 35 +++++++++++++++++---
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/CompletionProvider.php b/src/CompletionProvider.php
index f443136..f0c9c3e 100644
--- a/src/CompletionProvider.php
+++ b/src/CompletionProvider.php
@@ -110,13 +110,13 @@ class CompletionProvider
     /**
      * Returns suggestions for a specific cursor position in a document
      *
-     * @param PhpDocument $document The opened document
+     * @param PhpDocument $doc The opened document
      * @param Position $pos The cursor position
      * @return CompletionItem[]
      */
-    public function provideCompletion(PhpDocument $document, Position $pos): array
+    public function provideCompletion(PhpDocument $doc, Position $pos): array
     {
-        $node = $document->getNodeAtPosition($pos);
+        $node = $doc->getNodeAtPosition($pos);
 
         if ($node instanceof Node\Expr\Error) {
             $node = $node->getAttribute('parentNode');
@@ -262,13 +262,17 @@ class CompletionProvider
                 $item->label = '$' . ($var instanceof Node\Expr\ClosureUse ? $var->var : $var->name);
                 $item->documentation = $this->definitionResolver->getDocumentationFromNode($var);
                 $item->detail = (string)$this->definitionResolver->getTypeFromNode($var);
+                $item->textEdit = new TextEdit(
+                    new Range($pos, $pos),
+                    stripStringOverlap($doc->getRange(new Range(new Position(0, 0), $pos)), $item->label)
+                );
                 $items[] = $item;
             }
         } else if ($node instanceof Node\Stmt\InlineHTML || $pos == new Position(0, 0)) {
             $item = new CompletionItem('<?php', CompletionItemKind::KEYWORD);
             $item->textEdit = new TextEdit(
                 new Range($pos, $pos),
-                stripStringOverlap($document->getRange(new Range(new Position(0, 0), $pos)), '<?php')
+                stripStringOverlap($doc->getRange(new Range(new Position(0, 0), $pos)), '<?php')
             );
             $items[] = $item;
         }
diff --git a/src/Protocol/Position.php b/src/Protocol/Position.php
index 1012fde..f47afe2 100644
--- a/src/Protocol/Position.php
+++ b/src/Protocol/Position.php
@@ -59,6 +59,7 @@ class Position
     public function toOffset(string $content): int
     {
         $lines = explode("\n", $content);
-        return array_sum(array_map('strlen', array_slice($lines, 0, $this->line))) + $this->character;
+        $slice = array_slice($lines, 0, $this->line);
+        return array_sum(array_map('strlen', $slice)) + count($slice) + $this->character;
     }
 }
diff --git a/tests/Server/TextDocument/CompletionTest.php b/tests/Server/TextDocument/CompletionTest.php
index a7afb0d..f2e8028 100644
--- a/tests/Server/TextDocument/CompletionTest.php
+++ b/tests/Server/TextDocument/CompletionTest.php
@@ -95,8 +95,26 @@ class CompletionTest extends TestCase
             new Position(8, 5)
         )->wait();
         $this->assertEquals([
-            new CompletionItem('$var', CompletionItemKind::VARIABLE, 'int'),
-            new CompletionItem('$param', CompletionItemKind::VARIABLE, 'string|null', 'A parameter')
+            new CompletionItem(
+                '$var',
+                CompletionItemKind::VARIABLE,
+                'int',
+                null,
+                null,
+                null,
+                null,
+                new TextEdit(new Range(new Position(8, 5), new Position(8, 5)), 'var')
+            ),
+            new CompletionItem(
+                '$param',
+                CompletionItemKind::VARIABLE,
+                'string|null',
+                'A parameter',
+                null,
+                null,
+                null,
+                new TextEdit(new Range(new Position(8, 5), new Position(8, 5)), 'param')
+            )
         ], $items);
     }
 
@@ -106,10 +124,19 @@ class CompletionTest extends TestCase
         $this->project->openDocument($completionUri, file_get_contents($completionUri));
         $items = $this->textDocument->completion(
             new TextDocumentIdentifier($completionUri),
-            new Position(8, 5)
+            new Position(8, 6)
         )->wait();
         $this->assertEquals([
-            new CompletionItem('$param', CompletionItemKind::VARIABLE, 'string|null', 'A parameter')
+            new CompletionItem(
+                '$param',
+                CompletionItemKind::VARIABLE,
+                'string|null',
+                'A parameter',
+                null,
+                null,
+                null,
+                new TextEdit(new Range(new Position(8, 6), new Position(8, 6)), 'aram')
+            )
         ], $items);
     }