Merge pull request #375 from N1ebieski/Fix-False-positive-Translation-not-found-with-partial-string-in-Laravel-JSON-translation-#38

Fix False positive "Translation not found" with partial string in Laravel JSON translation

Author: joetannenbaum

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) {