UTF8-safe snippets

vimeo · Mar 1, 2021 · 04bd3d9 · 04bd3d9
1 parent 1ab0a5d
commit 04bd3d9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Psalm/CodeLocation.php b/src/Psalm/CodeLocation.php
@@ -14,8 +14,8 @@
 use function strlen;
 use function strpos;
 use function strrpos;
-use function substr;
 use function substr_count;
+use function mb_strcut;
 use function trim;
 
 class CodeLocation
@@ -183,7 +183,7 @@ private function calculateRealLocation(): void
         ) {
             $preview_lines = explode(
                 "\n",
-                substr(
+                mb_strcut(
                     $file_contents,
                     $this->preview_start,
                     $this->selection_start - $this->preview_start - 1
@@ -206,7 +206,7 @@ private function calculateRealLocation(): void
 
             $indentation = (int)strpos($key_line, '@');
 
-            $key_line = trim(preg_replace('@\**/\s*@', '', substr($key_line, $indentation)));
+            $key_line = trim(preg_replace('@\**/\s*@', '', mb_strcut($key_line, $indentation)));
 
             $this->selection_start = $preview_offset + $indentation + $this->preview_start;
             $this->selection_end = $this->selection_start + strlen($key_line);
@@ -258,7 +258,7 @@ private function calculateRealLocation(): void
                     throw new \UnexpectedValueException('Unrecognised regex type ' . $this->regex_type);
             }
 
-            $preview_snippet = substr(
+            $preview_snippet = mb_strcut(
                 $file_contents,
                 $this->selection_start,
                 $this->selection_end - $this->selection_start
@@ -298,8 +298,8 @@ private function calculateRealLocation(): void
             }
         }
 
-        $this->snippet = substr($file_contents, $this->preview_start, $this->preview_end - $this->preview_start);
-        $this->text = substr($file_contents, $this->selection_start, $this->selection_end - $this->selection_start);
+        $this->snippet = mb_strcut($file_contents, $this->preview_start, $this->preview_end - $this->preview_start);
+        $this->text = mb_strcut($file_contents, $this->selection_start, $this->selection_end - $this->selection_start);
 
         // reset preview start to beginning of line
         $this->column_from = $this->selection_start -