Expose code location raw line number

vimeo · Aug 6, 2019 · 0051636 · 0051636
1 parent fc8d2bd
commit 0051636
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/Psalm/CodeLocation.php b/src/Psalm/CodeLocation.php
@@ -27,7 +27,7 @@ class CodeLocation
     public $file_name;
 
     /** @var int */
-    protected $line_number;
+    public $raw_line_number;
 
     /** @var int */
     private $end_line_number = -1;
@@ -123,7 +123,7 @@ public function __construct(
         $doc_comment = $stmt->getDocComment();
         $this->preview_start = $doc_comment ? $doc_comment->getFilePos() : $this->file_start;
         $this->docblock_start_line_number = $doc_comment ? $doc_comment->getLine() : null;
-        $this->line_number = $stmt->getLine();
+        $this->raw_line_number = $stmt->getLine();
     }
 
     /**
@@ -324,7 +324,7 @@ private function calculateRealLocation()
      */
     public function getLineNumber()
     {
-        return $this->docblock_line_number ?: $this->line_number;
+        return $this->docblock_line_number ?: $this->raw_line_number;
     }
 
     /**
@@ -409,4 +409,9 @@ public function getShortSummary() : string
     {
         return $this->file_name . ':' . $this->getLineNumber() . ':' . $this->getColumn();
     }
+
+    public function getQuickSummary() : string
+    {
+        return $this->file_name . ':' . $this->raw_line_number;
+    }
 }
diff --git a/src/Psalm/CodeLocation/DocblockTypeLocation.php b/src/Psalm/CodeLocation/DocblockTypeLocation.php
@@ -25,6 +25,6 @@ public function __construct(
         $this->single_line = false;
 
         $this->preview_start = $this->file_start;
-        $this->line_number = $line_number;
+        $this->raw_line_number = $line_number;
     }
 }
diff --git a/src/Psalm/CodeLocation/ParseErrorLocation.php b/src/Psalm/CodeLocation/ParseErrorLocation.php
@@ -27,7 +27,7 @@ public function __construct(
         $this->single_line = false;
 
         $this->preview_start = $this->file_start;
-        $this->line_number = substr_count(
+        $this->raw_line_number = substr_count(
             substr($file_contents, 0, $this->file_start),
             "\n"
         ) + 1;

diff --git a/src/Psalm/CodeLocation/Raw.php b/src/Psalm/CodeLocation/Raw.php
@@ -26,7 +26,7 @@ public function __construct(
         $this->single_line = false;
 
         $this->preview_start = $this->file_start;
-        $this->line_number = substr_count(
+        $this->raw_line_number = substr_count(
             substr($file_contents, 0, $this->file_start),
             "\n"
         ) + 1;