[T3CMS] Cleanups based on inspections

cedricziel · cedricziel · commit 9450c25d65d4 · 2020-05-02T12:00:35.000+02:00
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/action/ExtbaseControllerActionAction.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/action/ExtbaseControllerActionAction.java
@@ -70,7 +70,7 @@ public void update(AnActionEvent event) {
      * @param event Carries information on the invocation place
      */
     @Override
-    public void actionPerformed(AnActionEvent event) {
+    public void actionPerformed(@NotNull AnActionEvent event) {
         final Project project = getEventProject(event);
         if (project == null) {
             this.setStatus(event, false);
@@ -113,11 +113,10 @@ private void write(@NotNull Project project, PhpClass phpClass, String actionNam
 
             @Override
             protected void run(@NotNull Result result) {
-                final String methodName = actionName;
 
                 Method actionMethod = PhpPsiElementFactory.createMethod(
                         project,
-                        "public function " + methodName + " () { \n" +
+                        "public function " + actionName + " () { \n" +
                                 "}\n"
 
                 );
@@ -130,7 +129,7 @@ protected void run(@NotNull Result result) {
                 PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument());
                 PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument());
 
-                final int insertPos = CodeUtil.getMethodInsertPosition(phpClass, methodName);
+                final int insertPos = CodeUtil.getMethodInsertPosition(phpClass, actionName);
                 if (insertPos == -1) {
                     return;
                 }
@@ -145,7 +144,7 @@ protected void run(@NotNull Result result) {
                 CodeStyleManager.getInstance(project).reformatText(phpClass.getContainingFile(), insertPos, endPos);
                 PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument());
 
-                Method insertedMethod = phpClass.findMethodByName(methodName);
+                Method insertedMethod = phpClass.findMethodByName(actionName);
                 if (insertedMethod != null) {
                     editor.getCaretModel().moveToOffset(insertedMethod.getTextRange().getStartOffset());
                     editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/codeInsight/navigation/PathResourceGotoDeclarationHandler.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/codeInsight/navigation/PathResourceGotoDeclarationHandler.java
@@ -39,7 +39,7 @@ private PsiElement[] emptyPsiElementArray() {
 
     @Nullable
     @Override
-    public String getActionText(DataContext context) {
+    public String getActionText(@NotNull DataContext context) {
         return null;
     }
 }
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/contextApi/ContextReferenceContributor.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/contextApi/ContextReferenceContributor.java
@@ -22,7 +22,7 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)
         );
     }
 
-    private class ContextReferenceProvider extends PsiReferenceProvider {
+    private static class ContextReferenceProvider extends PsiReferenceProvider {
         @NotNull
         @Override
         public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extbase/ExtbaseUtils.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extbase/ExtbaseUtils.java
@@ -50,9 +50,7 @@ public static PhpClass getBaseRepositoryClass(@NotNull Project project) {
             return null;
         }
 
-        PhpClass repositoryClass = iterator.next();
-
-        return repositoryClass;
+        return iterator.next();
     }
 
     public static boolean isRepositoryClass(@NotNull PhpClass phpClass) {
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extbase/persistence/ExtbaseModelCollectionReturnTypeProvider.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extbase/persistence/ExtbaseModelCollectionReturnTypeProvider.java
@@ -13,6 +13,7 @@
 import com.jetbrains.php.lang.psi.resolve.types.PhpType;
 import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider4;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -180,7 +181,7 @@ public MethodReturnTypeVisitor() {
         }
 
         @Override
-        public void visitElement(PsiElement element) {
+        public void visitElement(@NotNull PsiElement element) {
             super.visitElement(element);
 
             if (PlatformPatterns.psiElement(FieldReference.class).withParent(PhpReturn.class).accepts(element)) {
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extbase/persistence/codeInsight/QueryCompletionContributor.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extbase/persistence/codeInsight/QueryCompletionContributor.java
@@ -26,7 +26,7 @@ public QueryCompletionContributor() {
     public static class QueryCompletionProvider extends CompletionProvider<CompletionParameters> {
 
         @Override
-        protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) {
+        protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
             PsiElement element = parameters.getOriginalPosition();
 
             Method containingMethod = (Method) PsiTreeUtil.findFirstParent(element, x -> PlatformPatterns.psiElement(Method.class).accepts(x));
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extensionScanner/codeInspection/FunctionCallMatcherInspection.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extensionScanner/codeInspection/FunctionCallMatcherInspection.java
@@ -4,26 +4,12 @@
 import com.cedricziel.idea.typo3.util.DeprecationUtility;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInspection.ProblemsHolder;
-import com.intellij.patterns.PlatformPatterns;
-import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.search.FilenameIndex;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.jetbrains.php.lang.parser.PhpElementTypes;
 import com.jetbrains.php.lang.psi.elements.FunctionReference;
-import com.jetbrains.php.lang.psi.elements.PhpPsiElement;
-import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
 import com.jetbrains.php.lang.psi.visitors.PhpElementVisitor;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 public class FunctionCallMatcherInspection extends PluginEnabledPhpInspection {
     @Nls
     @NotNull
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/IconIndex.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/IconIndex.java
@@ -85,7 +85,7 @@ public static IconStub[] getAllIcons(@NotNull Project project) {
             iconStubs.addAll(values);
         });
 
-        return iconStubs.toArray(new IconStub[iconStubs.size()]);
+        return iconStubs.toArray(new IconStub[0]);
     }
 
     @NotNull
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/RouteIndex.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/RouteIndex.java
@@ -99,7 +99,7 @@ public ExtTablesRouteVisitor() {
         }
 
         @Override
-        public void visitElement(PsiElement element) {
+        public void visitElement(@NotNull PsiElement element) {
             if (!(element instanceof MethodReference)) {
                 super.visitElement(element);
                 return;
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/extbase/ControllerActionIndex.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/extbase/ControllerActionIndex.java
@@ -89,7 +89,7 @@ public Map<String, StubControllerAction> getMap() {
         }
 
         @Override
-        public void visitElement(PsiElement element) {
+        public void visitElement(@NotNull PsiElement element) {
             if (element instanceof Method) {
                 Method m = (Method) element;
                 if (!m.getName().endsWith("Action") || !m.getModifier().isPublic()) {
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/extensionScanner/MethodArgumentDroppedIndex.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/extensionScanner/MethodArgumentDroppedIndex.java
@@ -60,7 +60,7 @@ public DataIndexer<String, Integer, FileContent> getIndexer() {
                 if (parent instanceof ArrayHashElement) {
                     ArrayHashElement arr = (ArrayHashElement) parent;
                     PhpPsiElement value = arr.getValue();
-                    if (value != null && value instanceof ArrayCreationExpression) {
+                    if (value instanceof ArrayCreationExpression) {
                         ArrayCreationExpression creationExpression = (ArrayCreationExpression) value;
                         creationExpression.getHashElements().forEach(x -> {
                             PhpPsiElement key = x.getKey();
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/php/LegacyClassesForIDEIndex.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/index/php/LegacyClassesForIDEIndex.java
@@ -101,7 +101,7 @@ public Map<String, String> getMap() {
         }
 
         @Override
-        public void visitElement(PsiElement element) {
+        public void visitElement(@NotNull PsiElement element) {
 
             if (!PlatformPatterns.psiElement(PhpClass.class).accepts(element)) {
                 super.visitElement(element);
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/languageInjection/CssInjector.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/languageInjection/CssInjector.java
@@ -1,7 +1,6 @@
 package com.cedricziel.idea.typo3.languageInjection;
 
 import com.intellij.lang.css.CSSLanguage;
-import com.intellij.lang.javascript.JavascriptLanguage;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.patterns.PsiElementPattern;
@@ -18,7 +17,7 @@ public class CssInjector implements LanguageInjector {
     public void getLanguagesToInject(@NotNull PsiLanguageInjectionHost host, @NotNull InjectedLanguagePlaces injectionPlacesRegistrar) {
         if (getXmlFAssetCssContentPattern().accepts(host)) {
             injectionPlacesRegistrar.addPlace(CSSLanguage.INSTANCE, new TextRange(0, host.getTextLength()-1), null, null);
-        };
+        }
     }
 
     @NotNull
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/languageInjection/JavaScriptInjector.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/languageInjection/JavaScriptInjector.java
@@ -17,7 +17,7 @@ public class JavaScriptInjector implements LanguageInjector {
     public void getLanguagesToInject(@NotNull PsiLanguageInjectionHost host, @NotNull InjectedLanguagePlaces injectionPlacesRegistrar) {
         if (getXmlFAssetJsContentPattern().accepts(host)) {
             injectionPlacesRegistrar.addPlace(JavascriptLanguage.INSTANCE, new TextRange(0, host.getTextLength()-1), null, null);
-        };
+        }
     }
 
     @NotNull
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/psi/visitor/CoreFlagParserVisitor.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/psi/visitor/CoreFlagParserVisitor.java
@@ -5,6 +5,7 @@
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.php.lang.psi.elements.*;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
@@ -24,7 +25,7 @@ public Map<String, IconStub> getMap() {
     }
 
     @Override
-    public void visitElement(PsiElement element) {
+    public void visitElement(@NotNull PsiElement element) {
         Variable iconFolder = PsiTreeUtil.findChildOfType(element, Variable.class);
         if (iconFolder == null || !iconFolder.getName().equals("iconFolder")) {
             // Something changed - dynamic parsing failed.
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/psi/visitor/CoreIconParserVisitor.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/psi/visitor/CoreIconParserVisitor.java
@@ -26,7 +26,7 @@ public Map<String, IconStub> getMap () {
     }
 
     @Override
-    public void visitElement(PsiElement element) {
+    public void visitElement(@NotNull PsiElement element) {
         if ((element instanceof ArrayCreationExpression)) {
             visitIconDefinition((ArrayCreationExpression) element);
         }
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/routing/RouteFoldingBuilder.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/routing/RouteFoldingBuilder.java
@@ -42,7 +42,7 @@ public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement root, @NotNull D
 
         }
 
-        return descriptors.toArray(new FoldingDescriptor[descriptors.size()]);
+        return descriptors.toArray(new FoldingDescriptor[0]);
     }
 
     @Nullable
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/routing/RouteParserVisitor.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/routing/RouteParserVisitor.java
@@ -33,7 +33,7 @@ public Collection<RouteStub> getRouteStubs() {
     }
 
     @Override
-    public void visitElement(PsiElement element) {
+    public void visitElement(@NotNull PsiElement element) {
         if (isRouteElement(element)) {
             ArrayHashElement arrayCreationExpression = (ArrayHashElement) element;
             visitRouteCreation(arrayCreationExpression);
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/tca/codeInsight/TCACompletionContributor.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/tca/codeInsight/TCACompletionContributor.java
@@ -21,7 +21,7 @@ public TCACompletionContributor() {
                 TCAPatterns.arrayAssignmentValueWithIndexPattern("renderType"),
                 new CompletionProvider<CompletionParameters>() {
                     @Override
-                    protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) {
+                    protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                         for (String renderType: TCAUtil.getAvailableRenderTypes(parameters.getPosition())) {
                             result.addElement(LookupElementBuilder.create(renderType).withIcon(TYPO3CMSIcons.TYPO3_ICON));
                         }
@@ -37,7 +37,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
                 TCAPatterns.arrayAssignmentValueWithIndexPattern("type"),
                 new CompletionProvider<CompletionParameters>() {
                     @Override
-                    protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) {
+                    protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                         for (String columnType: TCAUtil.getAvailableColumnTypes(parameters.getPosition().getProject())) {
                             result.addElement(LookupElementBuilder.create(columnType).withIcon(TYPO3CMSIcons.TYPO3_ICON));
                         }
@@ -53,7 +53,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
                 TCAPatterns.isEvalColumnValue(),
                 new CompletionProvider<CompletionParameters>() {
                     @Override
-                    protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) {
+                    protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
 
                         StringLiteralExpression literalExpression = (StringLiteralExpression) parameters.getOriginalPosition().getParent();
                         if (literalExpression == null) {
@@ -97,7 +97,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
                 TCAPatterns.isIndexInParentIndex("config"),
                 new CompletionProvider<CompletionParameters>() {
                     @Override
-                    protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) {
+                    protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                         for (String evaluationName: TCAUtil.getConfigSectionChildren()) {
                             result.addElement(LookupElementBuilder.create(evaluationName).withIcon(TYPO3CMSIcons.TYPO3_ICON));
                         }
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/tca/codeInspection/v10/InternalTypeFileInspection.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/tca/codeInspection/v10/InternalTypeFileInspection.java
@@ -2,7 +2,6 @@
 
 import com.cedricziel.idea.typo3.TYPO3CMSProjectSettings;
 import com.cedricziel.idea.typo3.psi.PhpElementsUtil;
-import com.cedricziel.idea.typo3.util.TCAUtil;
 import com.cedricziel.idea.typo3.util.TYPO3Utility;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInspection.ProblemHighlightType;
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/userFunc/UserFuncInsertHandler.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/userFunc/UserFuncInsertHandler.java
@@ -2,6 +2,7 @@
 
 import com.intellij.codeInsight.completion.InsertHandler;
 import com.intellij.codeInsight.completion.InsertionContext;
+import org.jetbrains.annotations.NotNull;
 
 public class UserFuncInsertHandler implements InsertHandler<UserFuncLookupElement> {
     private static final UserFuncInsertHandler INSTANCE = new UserFuncInsertHandler();
@@ -11,7 +12,7 @@ public static UserFuncInsertHandler getInstance() {
     }
 
     @Override
-    public void handleInsert(InsertionContext context, UserFuncLookupElement item) {
+    public void handleInsert(@NotNull InsertionContext context, @NotNull UserFuncLookupElement item) {
 
     }
 }
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/userFunc/UserFuncLookupElement.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/userFunc/UserFuncLookupElement.java
@@ -25,7 +25,7 @@ public UserFuncLookupElement(@NotNull PhpNamedElement namedElement) {
     }
 
     @Override
-    public void handleInsert(InsertionContext context) {
+    public void handleInsert(@NotNull InsertionContext context) {
         UserFuncInsertHandler.getInstance().handleInsert(context, this);
     }
 }
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/userFunc/UserFuncReference.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/userFunc/UserFuncReference.java
@@ -6,7 +6,6 @@
 import com.intellij.psi.PsiPolyVariantReferenceBase;
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlText;
 import com.intellij.psi.xml.XmlToken;
 import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.*;
@@ -18,7 +17,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-public class UserFuncReference extends PsiPolyVariantReferenceBase {
+public class UserFuncReference extends PsiPolyVariantReferenceBase<PsiElement> {
     private final String className;
     private final String methodName;
 
@@ -30,10 +29,6 @@ public UserFuncReference(XmlToken xmlText) {
             String[] split = StringUtils.split(text, "->");
 
             switch (split.length) {
-                case 0:
-                    className = null;
-                    methodName = null;
-                    break;
                 case 1:
                     className = split[0].trim();
                     methodName = null;
@@ -64,10 +59,6 @@ public UserFuncReference(StringLiteralExpression stringLiteralExpression, TextRa
             String[] split = StringUtils.split(text, "->");
 
             switch (split.length) {
-                case 0:
-                    className = null;
-                    methodName = null;
-                    break;
                 case 1:
                     className = split[0].trim();
                     methodName = null;
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/userFunc/UserFuncReferenceContributor.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/userFunc/UserFuncReferenceContributor.java
@@ -2,7 +2,6 @@
 
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.psi.xml.XmlText;
 import com.intellij.psi.xml.XmlToken;
 import com.intellij.util.ProcessingContext;
 import com.jetbrains.php.lang.psi.elements.ConcatenationExpression;
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/ExtensionUtility.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/ExtensionUtility.java
@@ -156,7 +156,7 @@ public String[] getNamespaces() {
                 return new String[0];
             }
 
-            return ns.toArray(new String[ns.size()]);
+            return ns.toArray(new String[0]);
         }
     }
 
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/PhpLangUtil.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/PhpLangUtil.java
@@ -125,7 +125,6 @@ private static String extractFqnFromClassReference(MethodReference methodReferen
         return fqn;
     }
 
-    @NotNull
     public static int getParameterPosition(@NotNull PsiElement element) {
         ParameterList parameterList = PsiTreeUtil.getParentOfType(element, ParameterList.class);
         if (parameterList == null) {
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/PhpTypeProviderUtil.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/PhpTypeProviderUtil.java
@@ -56,7 +56,7 @@ public static String getReferenceSignatureByFirstParameter(@NotNull FunctionRefe
 
         // whitelist here; we can also provide some more but think of performance
         // Service::NAME, $this->name and Entity::CLASS;
-        if (parameter instanceof PhpReference && (parameter instanceof ClassConstantReference || parameter instanceof FieldReference)) {
+        if (parameter instanceof ClassConstantReference || parameter instanceof FieldReference) {
             String signature = ((PhpReference) parameter).getSignature();
             if (StringUtil.isNotEmpty(signature)) {
                 return refSignature + trimKey + signature;
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/TCAUtil.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/TCAUtil.java
@@ -232,11 +232,10 @@ private synchronized static Set<String> getAvailableRenderTypes(Project project)
         }
 
         CachedValue<Set<String>> cachedValue = CachedValuesManager.getManager(project).createCachedValue(() -> {
-            Set<String> renderTypes = new HashSet<>();
             Set<PsiElement> elementsFromExtLocalConf = findAvailableRenderTypes(project);
 
             // add static list of render types
-            renderTypes.addAll(Arrays.asList(TCA_V8_CORE_RENDER_TYPES));
+            Set<String> renderTypes = new HashSet<>(Arrays.asList(TCA_V8_CORE_RENDER_TYPES));
 
             // add dynamic list of render types from nodeRegistry
             for (PsiElement el : elementsFromExtLocalConf) {
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/TableUtil.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/TableUtil.java

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ private PsiElement[] emptyPsiElementArray() {`
`39`	`39`
`40`	`40`	`@Nullable`
`41`	`41`	`@Override`
`42`		`- public String getActionText(DataContext context) {`
	`42`	`+ public String getActionText(@NotNull DataContext context) {`
`43`	`43`	`return null;`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)`
`22`	`22`	`);`
`23`	`23`	`}`
`24`	`24`
`25`		`- private class ContextReferenceProvider extends PsiReferenceProvider {`
	`25`	`+ private static class ContextReferenceProvider extends PsiReferenceProvider {`
`26`	`26`	`@NotNull`
`27`	`27`	`@Override`
`28`	`28`	`public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,7 @@ public static PhpClass getBaseRepositoryClass(@NotNull Project project) {`
`50`	`50`	`return null;`
`51`	`51`	`}`
`52`	`52`
`53`		`- PhpClass repositoryClass = iterator.next();`
`54`		`-`
`55`		`- return repositoryClass;`
	`53`	`+ return iterator.next();`
`56`	`54`	`}`
`57`	`55`
`58`	`56`	`public static boolean isRepositoryClass(@NotNull PhpClass phpClass) {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public static IconStub[] getAllIcons(@NotNull Project project) {`
`85`	`85`	`iconStubs.addAll(values);`
`86`	`86`	`});`
`87`	`87`
`88`		`- return iconStubs.toArray(new IconStub[iconStubs.size()]);`
	`88`	`+ return iconStubs.toArray(new IconStub[0]);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@NotNull`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public ExtTablesRouteVisitor() {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`@Override`
`102`		`- public void visitElement(PsiElement element) {`
	`102`	`+ public void visitElement(@NotNull PsiElement element) {`
`103`	`103`	`if (!(element instanceof MethodReference)) {`
`104`	`104`	`super.visitElement(element);`
`105`	`105`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public Map<String, StubControllerAction> getMap() {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Override`
`92`		`- public void visitElement(PsiElement element) {`
	`92`	`+ public void visitElement(@NotNull PsiElement element) {`
`93`	`93`	`if (element instanceof Method) {`
`94`	`94`	`Method m = (Method) element;`
`95`	`95`	`if (!m.getName().endsWith("Action") \|\| !m.getModifier().isPublic()) {`