Merge branch 'main' of https://github.com/laravel/vs-code-extension

Author: joetannenbaum

php-templates/configs.php

@@ -117,6 +117,10 @@ function vsCodeGetConfigValue($value, $key, $configPaths) {
       }
     }
 
+    if (is_object($value)) {
+      $value = get_class($value);
+    }
+
     return [
       "name" => $key,
       "value" => $value,

php-templates/translations.php

@@ -129,11 +129,11 @@ protected function linesFromJsonFile($file)
 
         $lines = explode(PHP_EOL, $contents);
         $encoded = array_map(
-            fn($k) => [json_encode($k), $k],
+            fn($k) => [json_encode($k, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), $k],
             array_keys($json),
         );
         $result = [];
-        $searchRange = 2;
+        $searchRange = 5;
 
         foreach ($encoded as $index => $keys) {
             // Pretty likely to be on the line that is the index, go happy path first
@@ -142,7 +142,7 @@ protected function linesFromJsonFile($file)
                 continue;
             }
 
-            // Search around the index, like to be within 2 lines
+            // Search around the index, likely to be within $searchRange lines
             $start = max(0, $index - $searchRange);
             $end = min($index + $searchRange, count($lines) - 1);
             $current = $start;
@@ -364,4 +364,4 @@ protected function fromPhpFile($file, $path, $namespace)
     'values' => array_keys($translator->values),
     'params' => array_map(fn($p) => json_decode($p, true), array_keys($translator->paramResults)),
     'to_watch' => $translator->directoriesToWatch,
-]);
+], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);

src/features/translation.ts

@@ -1,6 +1,7 @@
 import { notFound } from "@src/diagnostic";
 import AutocompleteResult from "@src/parser/AutocompleteResult";
 import {
+    getTranslationItemByName,
     getTranslations,
     TranslationItem,
 } from "@src/repositories/translations";
@@ -121,8 +122,7 @@ export const linkProvider: LinkProvider = (doc: vscode.TextDocument) => {
                 return null;
             }
 
-            const translation =
-                getTranslations().items.translations[param.value];
+            const translation = getTranslationItemByName(param.value);
 
             if (!translation) {
                 return null;
@@ -148,7 +148,7 @@ export const hoverProvider: HoverProvider = (
     pos: vscode.Position,
 ): vscode.ProviderResult<vscode.Hover> => {
     return findHoverMatchesInDoc(doc, pos, toFind, getTranslations, (match) => {
-        const item = getTranslations().items.translations[match];
+        const item = getTranslationItemByName(match);
 
         if (!item) {
             return null;
@@ -184,7 +184,7 @@ export const diagnosticProvider = (
                 return null;
             }
 
-            const item = getTranslations().items.translations[param.value];
+            const item = getTranslationItemByName(param.value);
 
             if (item) {
                 return null;
@@ -252,6 +252,15 @@ export const completionProvider = {
             getTranslations().items.translations,
         ).length;
 
+        const precedingCharacter = document.getText(
+            new vscode.Range(
+                position.line,
+                position.character - 1,
+                position.line,
+                position.character,
+            ),
+        );
+
         return Object.entries(getTranslations().items.translations).map(
             ([key, translations]) => {
                 let completionItem = new vscode.CompletionItem(
@@ -264,6 +273,12 @@ export const completionProvider = {
                     wordMatchRegex,
                 );
 
+                if (precedingCharacter === "'") {
+                    completionItem.insertText = key.replaceAll("'", "\\'");
+                } else if (precedingCharacter === '"') {
+                    completionItem.insertText = key.replaceAll('"', '\\"');
+                }
+
                 if (totalTranslationItems < 200) {
                     // This will bomb if we have too many translations,
                     // 200 is an arbitrary but probably safe number

src/repositories/translations.ts

@@ -70,6 +70,10 @@ const load = () => {
     });
 };
 
+export const getTranslationItemByName = (match: string): TranslationItem | undefined => {
+    return getTranslations().items.translations[match.replaceAll('\\', '')];
+};
+
 export const getTranslations = repository<TranslationGroupResult>({
     load,
     pattern: () =>

src/support/doc.ts

@@ -69,7 +69,7 @@ export const findHoverMatchesInDoc = (
 ): ProviderResult<Hover> => {
     const linkRange = doc.getWordRangeAtPosition(
         pos,
-        new RegExp(/(['"])(.*?)\1/),
+        new RegExp(/(?<!\\)(['"])(.*?)(?<!\\)\1/),
     );
 
     if (!linkRange) {

src/support/parser.ts

@@ -147,7 +147,7 @@ export const detect = async (
 
     const promise = runCommand(`detect "${cleanArg(code)}"`)
         .then((result: string) => {
-            return JSON.parse(result);
+            return result.length > 0 ? JSON.parse(result) : result;
         })
         .catch((err) => {
             showErrorPopup(err);

src/templates/configs.ts

@@ -117,6 +117,10 @@ function vsCodeGetConfigValue($value, $key, $configPaths) {
       }
     }
 
+    if (is_object($value)) {
+      $value = get_class($value);
+    }
+
     return [
       "name" => $key,
       "value" => $value,

src/templates/translations.ts

@@ -129,11 +129,11 @@ $translator = new class
 
         $lines = explode(PHP_EOL, $contents);
         $encoded = array_map(
-            fn($k) => [json_encode($k), $k],
+            fn($k) => [json_encode($k, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), $k],
             array_keys($json),
         );
         $result = [];
-        $searchRange = 2;
+        $searchRange = 5;
 
         foreach ($encoded as $index => $keys) {
             // Pretty likely to be on the line that is the index, go happy path first
@@ -142,7 +142,7 @@ $translator = new class
                 continue;
             }
 
-            // Search around the index, like to be within 2 lines
+            // Search around the index, likely to be within $searchRange lines
             $start = max(0, $index - $searchRange);
             $end = min($index + $searchRange, count($lines) - 1);
             $current = $start;
@@ -364,5 +364,5 @@ echo json_encode([
     'values' => array_keys($translator->values),
     'params' => array_map(fn($p) => json_decode($p, true), array_keys($translator->paramResults)),
     'to_watch' => $translator->directoriesToWatch,
-]);
+], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
 `;