Support for array translations

src/features/translation.ts

@@ -2,6 +2,7 @@ import { notFound } from "@src/diagnostic";
 import AutocompleteResult from "@src/parser/AutocompleteResult";
 import {
     getTranslations,
+    NestedTranslationItem,
     TranslationItem,
 } from "@src/repositories/translations";
 import { config } from "@src/support/config";
@@ -111,6 +112,32 @@ const getTranslationItemByLang = (
     );
 };
 
+const getNestedTranslationItem = (match: string): NestedTranslationItem | undefined => {
+    const translations = getTranslations().items.translations;
+
+    const firstNestedMatch = Object.keys(translations).find(
+        key => key.startsWith(match + '.')
+    );
+
+    return firstNestedMatch ? {
+        translationItem: translations[firstNestedMatch],
+        isNested: true
+    } as NestedTranslationItem : undefined;
+};
+
+const getTranslationItem = (match: string): NestedTranslationItem | undefined => {
+    const translations = getTranslations().items.translations;
+
+    // First, try to find exact match
+    const translationItem = translations[match];
+
+    // If we can't find exact match, try to find a first nested element
+    return translationItem ? {
+        translationItem: translationItem,
+        isNested: false
+    } as NestedTranslationItem : getNestedTranslationItem(match);
+};
+
 export const linkProvider: LinkProvider = (doc: vscode.TextDocument) => {
     return detectInDoc<vscode.DocumentLink, "string">(
         doc,
@@ -121,15 +148,14 @@ export const linkProvider: LinkProvider = (doc: vscode.TextDocument) => {
                 return null;
             }
 
-            const translation =
-                getTranslations().items.translations[param.value];
-
-            if (!translation) {
+            const translationItem = getTranslationItem(param.value)?.translationItem;
+
+            if (!translationItem) {
                 return null;
             }
 
             const def = getTranslationItemByLang(
-                translation,
+                translationItem,
                 getLang(item as AutocompleteParsingResult.MethodCall),
             );
 
@@ -148,17 +174,19 @@ 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 translationItem = getTranslationItem(match);
 
-        if (!item) {
+        if (!translationItem?.translationItem) {
             return null;
         }
 
-        const text = Object.entries(item)
+        const text = Object.entries(translationItem.translationItem)
             .filter(([key]) => key !== "default")
             .map(([key, translation]) => {
                 return [
-                    `\`${key}\`: ${translation.value}`,
+                    ...(!translationItem.isNested ? [
+                        `\`${key}\`: ${translation.value}`
+                    ] : []),
                     `[${relativePath(translation.path)}](${vscode.Uri.file(
                         translation.path,
                     ).with({
@@ -184,9 +212,9 @@ export const diagnosticProvider = (
                 return null;
             }
 
-            const item = getTranslations().items.translations[param.value];
+            const translationItem = getTranslationItem(param.value)?.translationItem;
 
-            if (item) {
+            if (translationItem) {
                 return null;
             }
 

src/repositories/translations.ts

@@ -3,6 +3,11 @@ import { projectPath } from "@src/support/project";
 import { waitForValue } from "@src/support/util";
 import { repository } from ".";
 
+export interface NestedTranslationItem {
+    translationItem: TranslationItem | undefined;
+    isNested: boolean;
+}
+
 export interface TranslationItem {
     [key: string]: {
         value: string;