RedGuy/easy-18in
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix npe if translation is unknown

Browse Source
This commit is contained in:
Marcel Haßlinger 2021-05-25 17:08:29 +02:00
parent 5e922512fb
commit 52d5aed000
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/marhali/easyi18n/ui/editor/I18nCompletionProvider.java
View File

@ -24,7 +24,7 @@ public class I18nCompletionProvider extends CompletionProvider<CompletionParamet
@Override @Override
protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) { protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
Project project = parameters.getEditor().getProject(); Project project = parameters.getOriginalFile().getProject();
String previewLocale = SettingsService.getInstance(project).getState().getPreviewLocale(); String previewLocale = SettingsService.getInstance(project).getState().getPreviewLocale();
String query = result.getPrefixMatcher().getPrefix(); String query = result.getPrefixMatcher().getPrefix();
@ -40,6 +40,10 @@ public class I18nCompletionProvider extends CompletionProvider<CompletionParamet
LocalizedNode node = sections.isEmpty() ? DataStore.getInstance(project).getTranslations().getNodes() LocalizedNode node = sections.isEmpty() ? DataStore.getInstance(project).getTranslations().getNodes()
: DataStore.getInstance(project).getTranslations().getNode(path); : DataStore.getInstance(project).getTranslations().getNode(path);
if(node == null) { // Unknown translation
return;
}
for(LocalizedNode children : node.getChildren()) { for(LocalizedNode children : node.getChildren()) {
if(lastSection == null || children.getKey().startsWith(lastSection)) { if(lastSection == null || children.getKey().startsWith(lastSection)) {
// Construct full key path / Fore nested objects add '.' to indicate deeper level // Construct full key path / Fore nested objects add '.' to indicate deeper level