Cleanups as prep for 213 (#360)

Author: cedricziel

CHANGELOG.md

@@ -5,6 +5,13 @@
 
 ### Changed
 - migrate checkHighlight to testHighlight where possible
+- migrate away from using FileTypeIndex.NAME directly
+- register inspections individually and remove InspectionTool
+- migrate `CreateInjectorQuickFix` away from removed API to use writeCommandAction
+- migrate `ExtbaseControllerActionAction` away from removed API to use writeCommandAction
+- migrate `createNotification` usage to distinct NotificationGroup
+- Remove unused, deprecated API usage related to icons
+- Use diamond operator where applicable
 ### Deprecated
 
 ### Removed

lang-fluid/src/main/java/com/cedricziel/idea/fluid/codeInsight/template/LiveTemplateFactory.java

@@ -33,44 +33,34 @@ public static Template createInlineArgumentListTemplate(@NotNull ViewHelper view
     }
 
     public static Template createTagModeForLoopTemplate(@NotNull PsiElement wrap) {
-        StringBuilder sb = new StringBuilder();
 
-        sb
-            .append("<f:for each=\"$EACH$\" as=\"$AS$\">\n")
-            .append("  $END$\n")
-            .append("</f:for>\n")
-        ;
+        String sb = "<f:for each=\"$EACH$\" as=\"$AS$\">\n" +
+            "  $END$\n" +
+            "</f:for>\n";
 
-        TemplateImpl template = new TemplateImpl("f:for", sb.toString(), "Fluid");
+        TemplateImpl template = new TemplateImpl("f:for", sb, "Fluid");
         template.setDescription("f:for loop over an expression");
         template.setToReformat(true);
 
         return template;
     }
 
     public static Template createTagModeAliasTemplate(@NotNull PsiElement wrap) {
-        StringBuilder sb = new StringBuilder();
 
-        sb
-            .append("<f:alias map=\"{$ALIAS$: $EXPR$}\">\n")
-            .append("  $END$\n")
-            .append("</f:alias>\n")
-        ;
+        String sb = "<f:alias map=\"{$ALIAS$: $EXPR$}\">\n" +
+            "  $END$\n" +
+            "</f:alias>\n";
 
-        TemplateImpl template = new TemplateImpl("f:alias", sb.toString(), "Fluid");
+        TemplateImpl template = new TemplateImpl("f:alias", sb, "Fluid");
         template.setDescription("f:alias the current expression");
         template.setToReformat(true);
 
         return template;
     }
 
     public static Template createInlinePipeToDebugTemplate(@NotNull PsiElement source) {
-        StringBuilder sb = new StringBuilder();
-        sb
-            .append("{ $EXPR$ -> f:debug() }")
-        ;
 
-        TemplateImpl template = new TemplateImpl("f:debug", sb.toString(), "Fluid");
+        TemplateImpl template = new TemplateImpl("f:debug", "{ $EXPR$ -> f:debug() }", "Fluid");
         template.setDescription("f:debug the expression result");
         template.setToReformat(true);
 

lang-fluid/src/main/java/com/cedricziel/idea/fluid/completion/FluidCompletionContributor.java

@@ -18,7 +18,7 @@
 
 public class FluidCompletionContributor extends CompletionContributor {
     public FluidCompletionContributor() {
-        extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<CompletionParameters>() {
+        extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() {
             @Override
             protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                 parameters.getPosition();
@@ -31,21 +31,19 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
          * { <caret> }
          * { fo<caret> }
          */
-        extend(CompletionType.BASIC, FluidPatterns.getFirstIdentifierPattern(), new CompletionProvider<CompletionParameters>() {
+        extend(CompletionType.BASIC, FluidPatterns.getFirstIdentifierPattern(), new CompletionProvider<>() {
             @Override
             protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                 PsiElement psiElement = parameters.getPosition().getOriginalElement();
 
-                FluidTypeResolver.collectScopeVariables(parameters.getOriginalPosition()).forEach((name, var) -> {
-                    result.addElement(
+                FluidTypeResolver.collectScopeVariables(parameters.getOriginalPosition()).forEach((name, var) -> result.addElement(
                         LookupElementBuilder
-                            .create(name)
-                            .withTypeText(
-                                FluidTypeResolver.getTypeDisplayName(psiElement.getProject(), var.getTypes()), true
-                            )
-                            .withIcon(PhpIcons.VARIABLE)
-                    );
-                });
+                                .create(name)
+                                .withTypeText(
+                                        FluidTypeResolver.getTypeDisplayName(psiElement.getProject(), var.getTypes()), true
+                                )
+                                .withIcon(PhpIcons.VARIABLE)
+                ));
 
                 if (!PlatformPatterns.psiElement().withSuperParent(2, FluidArgumentValue.class).accepts(psiElement)) {
                     FluidUtil.completeViewHelpers(parameters, result);
@@ -66,21 +64,21 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
         /*
          * {object -> <caret>}
          */
-        extend(CompletionType.BASIC, FluidPatterns.inlineChainPipeTarget(), new CompletionProvider<CompletionParameters>() {
+        extend(CompletionType.BASIC, FluidPatterns.inlineChainPipeTarget(), new CompletionProvider<>() {
             @Override
             protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                 FluidUtil.completeViewHelpers(parameters, result);
             }
         });
 
-        extend(CompletionType.BASIC, PlatformPatterns.psiElement(FluidTypes.IDENTIFIER).withParent(FluidBoundNamespace.class), new CompletionProvider<CompletionParameters>() {
+        extend(CompletionType.BASIC, PlatformPatterns.psiElement(FluidTypes.IDENTIFIER).withParent(FluidBoundNamespace.class), new CompletionProvider<>() {
             @Override
             protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                 FluidUtil.completeViewHelpers(parameters, result);
             }
         });
 
-        extend(CompletionType.BASIC, PlatformPatterns.psiElement(FluidTypes.IDENTIFIER).withParent(FluidViewHelperReference.class), new CompletionProvider<CompletionParameters>() {
+        extend(CompletionType.BASIC, PlatformPatterns.psiElement(FluidTypes.IDENTIFIER).withParent(FluidViewHelperReference.class), new CompletionProvider<>() {
             @Override
             protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                 FluidUtil.completeViewHelpers(parameters, result);
@@ -92,7 +90,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
          * {f:foo(u<caret>)}
          * {f:foo(u<caret>:)}
          */
-        extend(CompletionType.BASIC, FluidPatterns.inlineArgumentNamePattern(), new CompletionProvider<CompletionParameters>() {
+        extend(CompletionType.BASIC, FluidPatterns.inlineArgumentNamePattern(), new CompletionProvider<>() {
             @Override
             protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
                 FluidUtil.completeViewHelperArguments(parameters, result);

lang-fluid/src/main/java/com/cedricziel/idea/fluid/config/FluidConfigurationPage.java

@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public class FluidConfigurationPage implements SearchableConfigurable {
@@ -99,7 +99,7 @@ private void resetCommentLanguageCombo(@NotNull Language commentLanguage) {
 
         languages.add(FluidLanguage.INSTANCE);
 
-        Collections.sort(languages, (o1, o2) -> o1.getID().compareTo(o2.getID()));
+        languages.sort(Comparator.comparing(Language::getID));
         for (Language language: languages) {
             model.addElement(language);
         }

lang-fluid/src/main/java/com/cedricziel/idea/fluid/editor/FluidInjector.java

@@ -25,7 +25,7 @@
  */
 public class FluidInjector implements MultiHostInjector {
 
-    private static String[] ATTRIBUTES = {
+    private static final String[] ATTRIBUTES = {
         "each", "as"
     };
 

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/FluidFileType.java

@@ -1,8 +1,6 @@
 package com.cedricziel.idea.fluid.lang;
 
 import com.intellij.lang.Language;
-import com.intellij.openapi.editor.colors.EditorColorsScheme;
-import com.intellij.openapi.editor.highlighter.EditorHighlighter;
 import com.intellij.openapi.fileTypes.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.CharsetToolkit;
@@ -21,12 +19,7 @@ public class FluidFileType extends LanguageFileType implements TemplateLanguageF
     protected FluidFileType() {
         super(FluidLanguage.INSTANCE);
 
-        FileTypeEditorHighlighterProviders.INSTANCE.addExplicitExtension(this, new EditorHighlighterProvider() {
-            public EditorHighlighter getEditorHighlighter(@Nullable Project project, @NotNull FileType fileType, @Nullable VirtualFile virtualFile, @NotNull EditorColorsScheme colors) {
-
-                return new FluidTemplateHighlighter(project, virtualFile, colors);
-            }
-        });
+        FileTypeEditorHighlighterProviders.INSTANCE.addExplicitExtension(this, (project, fileType, virtualFile, colors) -> new FluidTemplateHighlighter(project, virtualFile, colors));
     }
 
     private static LanguageFileType getAssociatedFileType(VirtualFile file, Project project) {

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/psi/ArgumentList.java

@@ -5,6 +5,5 @@
 import org.jetbrains.annotations.Nullable;
 
 public interface ArgumentList extends PsiElement {
-    @Nullable
-    public FluidViewHelperArgument getArgument(@NotNull String argumentName);
+    @Nullable FluidViewHelperArgument getArgument(@NotNull String argumentName);
 }

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/psi/FluidPresentableName.java

@@ -3,5 +3,5 @@
 import org.jetbrains.annotations.NotNull;
 
 public interface FluidPresentableName {
-    public @NotNull String getPresentableName();
+    @NotNull String getPresentableName();
 }

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/psi/FluidViewHelperMixin.java

@@ -3,6 +3,6 @@
 import org.jetbrains.annotations.NotNull;
 
 public interface FluidViewHelperMixin {
-    public @NotNull
+    @NotNull
     String getPresentableName();
 }

lang-fluid/src/main/java/com/cedricziel/idea/fluid/lang/psi/StringLiteral.java

@@ -5,6 +5,5 @@
 import org.jetbrains.annotations.NotNull;
 
 public interface StringLiteral extends PsiElement, PsiLanguageInjectionHost {
-    @NotNull
-    public String getContents();
+    @NotNull String getContents();
 }