From ac4086679c9d87bb6ef7d4e836e87d515339d237 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Sun, 14 Nov 2021 22:38:35 +0100
Subject: [PATCH] apply some intellij fixes
---
.../tooling/aspect/AspectColorSettingsPage.java | 4 ++--
.../tooling/aspect/AspectSyntaxHighlighter.java | 2 +-
.../tooling/aspect/parser/AspectParserDefinition.java | 6 +++---
.../grammar/GrammarChooseByNameContributor.java | 10 ++++++++--
.../tooling/grammar/GrammarColorSettingsPage.java | 1 +
.../tooling/grammar/GrammarFormattingModelBuilder.java | 1 -
.../tooling/grammar/GrammarLineMarkerProvider.java | 2 +-
.../tooling/grammar/GrammarStructureViewModel.java | 2 +-
.../java/org/jastadd/tooling/grammar/GrammarUtil.java | 2 +-
.../grammar/parser/GrammarParserDefinition.java | 6 +++---
10 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectColorSettingsPage.java b/src/main/java/org/jastadd/tooling/aspect/AspectColorSettingsPage.java
index 84739a0..d6e4e21 100644
--- a/src/main/java/org/jastadd/tooling/aspect/AspectColorSettingsPage.java
+++ b/src/main/java/org/jastadd/tooling/aspect/AspectColorSettingsPage.java
@@ -72,13 +72,13 @@ public class AspectColorSettingsPage implements ColorSettingsPage {
@NotNull
@Override
- public AttributesDescriptor[] getAttributeDescriptors() {
+ public AttributesDescriptor @NotNull [] getAttributeDescriptors() {
return DESCRIPTORS;
}
@NotNull
@Override
- public ColorDescriptor[] getColorDescriptors() {
+ public ColorDescriptor @NotNull [] getColorDescriptors() {
return ColorDescriptor.EMPTY_ARRAY;
}
diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java b/src/main/java/org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java
index f6a3c03..4f44cb0 100644
--- a/src/main/java/org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java
+++ b/src/main/java/org/jastadd/tooling/aspect/AspectSyntaxHighlighter.java
@@ -131,7 +131,7 @@ public class AspectSyntaxHighlighter extends SyntaxHighlighterBase {
@NotNull
@Override
- public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
+ public TextAttributesKey @NotNull [] getTokenHighlights(IElementType tokenType) {
if (javaKeywords.contains(tokenType) || jastAddKeywords.contains(tokenType)) {
return KEYWORD_KEYS;
} else if (keywordLiterals.contains(tokenType)) {
diff --git a/src/main/java/org/jastadd/tooling/aspect/parser/AspectParserDefinition.java b/src/main/java/org/jastadd/tooling/aspect/parser/AspectParserDefinition.java
index 62cf3ab..5d0c747 100644
--- a/src/main/java/org/jastadd/tooling/aspect/parser/AspectParserDefinition.java
+++ b/src/main/java/org/jastadd/tooling/aspect/parser/AspectParserDefinition.java
@@ -56,17 +56,17 @@ public class AspectParserDefinition implements ParserDefinition {
}
@Override
- public IFileElementType getFileNodeType() {
+ public @NotNull IFileElementType getFileNodeType() {
return FILE;
}
@Override
- public PsiFile createFile(FileViewProvider viewProvider) {
+ public @NotNull PsiFile createFile(@NotNull FileViewProvider viewProvider) {
return new AspectFile(viewProvider);
}
@Override
- public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) {
+ public @NotNull SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) {
return SpaceRequirements.MAY;
}
diff --git a/src/main/java/org/jastadd/tooling/grammar/GrammarChooseByNameContributor.java b/src/main/java/org/jastadd/tooling/grammar/GrammarChooseByNameContributor.java
index 972038e..f1d88f5 100644
--- a/src/main/java/org/jastadd/tooling/grammar/GrammarChooseByNameContributor.java
+++ b/src/main/java/org/jastadd/tooling/grammar/GrammarChooseByNameContributor.java
@@ -3,6 +3,7 @@ package org.jastadd.tooling.grammar;
import com.intellij.navigation.ChooseByNameContributor;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
import org.jastadd.tooling.grammar.psi.GrammarTypeDecl;
import org.jetbrains.annotations.NotNull;
@@ -28,8 +29,13 @@ public class GrammarChooseByNameContributor implements ChooseByNameContributor {
@Override
public NavigationItem @NotNull [] getItemsByName(String name, String pattern, Project project, boolean includeNonProjectItems) {
// TODO: include non project items
- List<GrammarTypeDecl> typeDecls = GrammarUtil.findTypeDecl(project, name);
- return typeDecls.toArray(new NavigationItem[0]);
+
+ List<NavigationItem> items = new ArrayList<>();
+ for (PsiElement typeDecl : GrammarUtil.findTypeDecl(project, name)) {
+ items.add((NavigationItem) typeDecl);
+ }
+
+ return items.toArray(new NavigationItem[0]);
}
}
diff --git a/src/main/java/org/jastadd/tooling/grammar/GrammarColorSettingsPage.java b/src/main/java/org/jastadd/tooling/grammar/GrammarColorSettingsPage.java
index dd5ee32..e1c1519 100644
--- a/src/main/java/org/jastadd/tooling/grammar/GrammarColorSettingsPage.java
+++ b/src/main/java/org/jastadd/tooling/grammar/GrammarColorSettingsPage.java
@@ -13,6 +13,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Map;
+@SuppressWarnings("DialogTitleCapitalization")
public class GrammarColorSettingsPage implements ColorSettingsPage {
private static final AttributesDescriptor[] DESCRIPTORS = new AttributesDescriptor[]{
diff --git a/src/main/java/org/jastadd/tooling/grammar/GrammarFormattingModelBuilder.java b/src/main/java/org/jastadd/tooling/grammar/GrammarFormattingModelBuilder.java
index 8df61fa..4567ebc 100644
--- a/src/main/java/org/jastadd/tooling/grammar/GrammarFormattingModelBuilder.java
+++ b/src/main/java/org/jastadd/tooling/grammar/GrammarFormattingModelBuilder.java
@@ -3,7 +3,6 @@ package org.jastadd.tooling.grammar;
import com.intellij.formatting.*;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
diff --git a/src/main/java/org/jastadd/tooling/grammar/GrammarLineMarkerProvider.java b/src/main/java/org/jastadd/tooling/grammar/GrammarLineMarkerProvider.java
index 169e729..756de68 100644
--- a/src/main/java/org/jastadd/tooling/grammar/GrammarLineMarkerProvider.java
+++ b/src/main/java/org/jastadd/tooling/grammar/GrammarLineMarkerProvider.java
@@ -28,7 +28,7 @@ public class GrammarLineMarkerProvider extends RelatedItemLineMarkerProvider {
Optional<PsiClass> classOptional = asReferenceToTypeDecl(element.getParent());
- if (classOptional.isEmpty()) {
+ if (!classOptional.isPresent()) {
return;
}
diff --git a/src/main/java/org/jastadd/tooling/grammar/GrammarStructureViewModel.java b/src/main/java/org/jastadd/tooling/grammar/GrammarStructureViewModel.java
index 98994e4..255a47e 100644
--- a/src/main/java/org/jastadd/tooling/grammar/GrammarStructureViewModel.java
+++ b/src/main/java/org/jastadd/tooling/grammar/GrammarStructureViewModel.java
@@ -16,7 +16,7 @@ public class GrammarStructureViewModel extends StructureViewModelBase implements
}
@NotNull
- public Sorter[] getSorters() {
+ public Sorter @NotNull [] getSorters() {
return new Sorter[]{Sorter.ALPHA_SORTER};
}
diff --git a/src/main/java/org/jastadd/tooling/grammar/GrammarUtil.java b/src/main/java/org/jastadd/tooling/grammar/GrammarUtil.java
index 9c4f0cf..46280ad 100644
--- a/src/main/java/org/jastadd/tooling/grammar/GrammarUtil.java
+++ b/src/main/java/org/jastadd/tooling/grammar/GrammarUtil.java
@@ -76,7 +76,7 @@ public class GrammarUtil {
public static Optional<PsiClass> asReferenceToTypeDecl(@NotNull final PsiElement element) {
- // Ensure the Psi Element is an reference
+ // Ensure the Psi Element is a reference
if (!(element instanceof PsiJavaCodeReferenceElement)) {
return Optional.empty();
}
diff --git a/src/main/java/org/jastadd/tooling/grammar/parser/GrammarParserDefinition.java b/src/main/java/org/jastadd/tooling/grammar/parser/GrammarParserDefinition.java
index 5f2ee17..dd1fc89 100644
--- a/src/main/java/org/jastadd/tooling/grammar/parser/GrammarParserDefinition.java
+++ b/src/main/java/org/jastadd/tooling/grammar/parser/GrammarParserDefinition.java
@@ -55,17 +55,17 @@ public class GrammarParserDefinition implements ParserDefinition {
}
@Override
- public IFileElementType getFileNodeType() {
+ public @NotNull IFileElementType getFileNodeType() {
return FILE;
}
@Override
- public PsiFile createFile(FileViewProvider viewProvider) {
+ public @NotNull PsiFile createFile(@NotNull FileViewProvider viewProvider) {
return new GrammarFile(viewProvider);
}
@Override
- public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) {
+ public @NotNull SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) {
return SpaceRequirements.MAY;
}
--
GitLab