Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 48 additions & 9 deletions src/features/translation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
getTranslationItemByName,
getTranslationPathByName,
getTranslations,
NestedTranslationItem,
TranslationItem,
} from "@src/repositories/translations";
import { config } from "@src/support/config";
Expand Down Expand Up @@ -113,6 +114,38 @@ const getTranslationItemByLang = (
);
};

const getNestedTranslationItem = (
match: string,
): NestedTranslationItem | undefined => {
const translations = getTranslations().items.translations;

const firstNestedMatch = Object.keys(translations).find((key) =>
key.startsWith(match.replaceAll("\\", "") + "."),
);

return firstNestedMatch
? ({
translationItem: getTranslationItemByName(firstNestedMatch),
isNested: true,
} as NestedTranslationItem)
: undefined;
};

const getTranslationItem = (
match: string,
): NestedTranslationItem | undefined => {
// First, try to find exact match
const translationItem = getTranslationItemByName(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,
Expand All @@ -123,14 +156,16 @@ export const linkProvider: LinkProvider = (doc: vscode.TextDocument) => {
return null;
}

const translation = getTranslationItemByName(param.value);
const translationItem = getTranslationItem(
param.value,
)?.translationItem;

if (!translation) {
if (!translationItem) {
return null;
}

const def = getTranslationItemByLang(
translation,
translationItem,
getLang(item as AutocompleteParsingResult.MethodCall),
);

Expand All @@ -149,17 +184,19 @@ export const hoverProvider: HoverProvider = (
pos: vscode.Position,
): vscode.ProviderResult<vscode.Hover> => {
return findHoverMatchesInDoc(doc, pos, toFind, getTranslations, (match) => {
const item = getTranslationItemByName(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({
Expand All @@ -185,9 +222,11 @@ export const diagnosticProvider = (
return null;
}

const translation = getTranslationItemByName(param.value);
const translationItem = getTranslationItem(
param.value,
)?.translationItem;

if (translation) {
if (translationItem) {
return null;
}

Expand Down
5 changes: 5 additions & 0 deletions src/repositories/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down