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

Fix exception on key completion / annotation

Browse Source 
Now using builtin project getters. This should avoid null calls.
This commit is contained in:
Marcel Haßlinger 2021-05-14 14:58:33 +02:00
parent de0154fd96
commit 63164a94a4
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,6 @@ import com.intellij.codeInsight.completion.CompletionParameters;
import com.intellij.codeInsight.completion.CompletionProvider; import com.intellij.codeInsight.completion.CompletionProvider;
import com.intellij.codeInsight.completion.CompletionResultSet; import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.util.ProcessingContext; import com.intellij.util.ProcessingContext;
@ -24,18 +22,11 @@ import java.util.List;
*/ */
public class I18nCompletionProvider extends CompletionProvider<CompletionParameters> { public class I18nCompletionProvider extends CompletionProvider<CompletionParameters> {
private Project project;
private String previewLocale;
public I18nCompletionProvider() {
DataManager.getInstance().getDataContextFromFocusAsync().onSuccess(data -> {
project = PlatformDataKeys.PROJECT.getData(data);
previewLocale = SettingsService.getInstance(project).getState().getPreviewLocale();
});
}
@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();
String previewLocale = SettingsService.getInstance(project).getState().getPreviewLocale();
String query = result.getPrefixMatcher().getPrefix(); String query = result.getPrefixMatcher().getPrefix();
List<String> sections = TranslationsUtil.getSections(query); List<String> sections = TranslationsUtil.getSections(query);
String lastSection = null; String lastSection = null;
@ -54,12 +45,13 @@ public class I18nCompletionProvider extends CompletionProvider<CompletionParamet
// Construct full key path / Fore nested objects add '.' to indicate deeper level // Construct full key path / Fore nested objects add '.' to indicate deeper level
String fullKey = (path.isEmpty() ? children.getKey() : path + "." + children.getKey()) + (children.isLeaf() ? "" : "."); String fullKey = (path.isEmpty() ? children.getKey() : path + "." + children.getKey()) + (children.isLeaf() ? "" : ".");
result.addElement(LookupElementBuilder.create(fullKey).appendTailText(getTailText(children), true)); result.addElement(LookupElementBuilder.create(fullKey)
.appendTailText(getTailText(children, previewLocale), true));
} }
} }
} }
private String getTailText(LocalizedNode node) { private String getTailText(LocalizedNode node, String previewLocale) {
return !node.isLeaf() ? " I18n([])" return !node.isLeaf() ? " I18n([])"
: " I18n(" + previewLocale + ": " + node.getValue().get(previewLocale) + ")"; : " I18n(" + previewLocale + ": " + node.getValue().get(previewLocale) + ")";
} }

17
src/main/java/de/marhali/easyi18n/ui/editor/I18nKeyAnnotator.java
View File

@ -1,16 +1,16 @@
package de.marhali.easyi18n.ui.editor; package de.marhali.easyi18n.ui.editor;
import com.intellij.ide.DataManager;
import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.AnnotationHolder;
import com.intellij.lang.annotation.Annotator; import com.intellij.lang.annotation.Annotator;
import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.lang.annotation.HighlightSeverity;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiLiteralValue; import com.intellij.psi.PsiLiteralValue;
import de.marhali.easyi18n.model.LocalizedNode; import de.marhali.easyi18n.model.LocalizedNode;
import de.marhali.easyi18n.service.DataStore; import de.marhali.easyi18n.service.DataStore;
import de.marhali.easyi18n.service.SettingsService; import de.marhali.easyi18n.service.SettingsService;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
/** /**
@ -19,16 +19,6 @@ import org.jetbrains.annotations.NotNull;
*/ */
public class I18nKeyAnnotator implements Annotator { public class I18nKeyAnnotator implements Annotator {
private Project project;
private String previewLocale;
public I18nKeyAnnotator() {
DataManager.getInstance().getDataContextFromFocusAsync().onSuccess(data -> {
project = PlatformDataKeys.PROJECT.getData(data);
previewLocale = SettingsService.getInstance(project).getState().getPreviewLocale();
});
}
@Override @Override
public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
if(!(element instanceof PsiLiteralValue)) { if(!(element instanceof PsiLiteralValue)) {
@ -42,6 +32,9 @@ public class I18nKeyAnnotator implements Annotator {
return; return;
} }
Project project = element.getProject();
String previewLocale = SettingsService.getInstance(project).getState().getPreviewLocale();
LocalizedNode node = DataStore.getInstance(project).getTranslations().getNode(value); LocalizedNode node = DataStore.getInstance(project).getTranslations().getNode(value);
if(node == null) { // Unknown translation. Just ignore it if(node == null) { // Unknown translation. Just ignore it