Solve almost all problems highlighted by the plugin verifier

Author: Alberto Venturini

gradle.properties

@@ -1,4 +1,4 @@
-version=0.1.0
+version=0.1.2
 
 # Intellij SDK
 intellijSdkVersion=2022.2

graph-database-plugin/build.gradle

@@ -3,9 +3,6 @@
 // Modified by Alberto Venturini, 2022
 apply plugin: "org.jetbrains.intellij"
 
-sourceCompatibility = 17
-targetCompatibility = 17
-
 dependencies {
     implementation project(':language:cypher')
     implementation project(':ui:jetbrains')
@@ -14,8 +11,8 @@ dependencies {
 
 intellij {
     version = intellijSdkVersion
-    pluginName = 'GraphDatabaseSupport'
-    updateSinceUntilBuild = false
+    pluginName = 'GraphDatabase'
+    //updateSinceUntilBuild = false
     sameSinceUntilBuild = false
 
     publishPlugin {
@@ -33,6 +30,11 @@ intellij {
     plugins = ['java']
 }
 
+patchPluginXml {
+    sinceBuild = "222.0"
+    untilBuild = "222.*"
+}
+
 runIde {
     systemProperty 'graphDatabaseSupportDevelopment', 'true'
 }

graph-database-plugin/src/main/resources/META-INF/plugin.xml

@@ -128,7 +128,6 @@
                 language="Cypher"
                 extensions="cyp;cql;cypher" />
 
-<!--        <fileTypeFactory implementation="file.com.albertoventurini.graphdbplugin.language.cypher.CypherFileTypeFactory"/>-->
         <lang.parserDefinition
                 language="Cypher" implementationClass="com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition"/>
         <lang.syntaxHighlighterFactory

language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherParserDefinition.java

@@ -47,12 +47,12 @@ public Lexer createLexer(Project project) {
     }
 
     @Override
-    public PsiParser createParser(Project project) {
+    public @NotNull PsiParser createParser(Project project) {
         return new CypherParser();
     }
 
     @Override
-    public IFileElementType getFileNodeType() {
+    public @NotNull IFileElementType getFileNodeType() {
         return FILE;
     }
 
@@ -81,12 +81,12 @@ public PsiElement createElement(ASTNode node) {
     }
 
     @Override
-    public PsiFile createFile(FileViewProvider viewProvider) {
+    public @NotNull PsiFile createFile(@NotNull FileViewProvider viewProvider) {
         return new CypherFile(viewProvider);
     }
 
     @Override
-    public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
+    public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) {
         return SpaceRequirements.MAY;
     }
 }

language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherBuiltInFunctions.java

@@ -106,7 +106,7 @@ public final class CypherBuiltInFunctions {
             element("toString", "(expression :: STRING)", CypherSimpleType.STRING)
     );
 
-    public static final List<CypherBuiltInFunctionElement> FUNCTIONS = new ArrayList<CypherBuiltInFunctionElement>() {{
+    public static final List<CypherBuiltInFunctionElement> FUNCTIONS = new ArrayList<>() {{
         addAll(FUNCTIONS_PREDICATE);
         addAll(FUNCTIONS_SHORTEST_PATH);
         addAll(FUNCTIONS_SCALAR);

language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/BaseCompletionProvider.java

@@ -17,7 +17,7 @@ public abstract class BaseCompletionProvider extends CompletionProvider<Completi
     protected void withCypherMetadataProvider(CompletionParameters parameters, ProjectRunnable runnable) {
         Project project = parameters.getEditor().getProject();
         if (project != null) {
-            CypherMetadataProviderService provider = ServiceManager.getService(project, CypherMetadataProviderService.class);
+            CypherMetadataProviderService provider = project.getService(CypherMetadataProviderService.class);
             runnable.run(provider);
         }
     }

language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/CypherDocumentationProvider.java

@@ -44,9 +44,11 @@ public class CypherDocumentationProvider extends AbstractDocumentationProvider {
 
     @Nullable
     @Override
-    public PsiElement getCustomDocumentationElement(@NotNull Editor editor,
-                                                    @NotNull PsiFile file,
-                                                    @Nullable PsiElement contextElement) {
+    public PsiElement getCustomDocumentationElement(
+            final @NotNull Editor editor,
+            final @NotNull PsiFile file,
+            final @Nullable PsiElement contextElement,
+            final int targetOffset) {
         return TraverseUtil.findParent(contextElement, SEARCH_TYPES).orElse(null);
     }
 
@@ -144,6 +146,6 @@ private Optional<String> userFunctionDocumentation(PsiElement element) {
     }
 
     private CypherMetadataProviderService getMetadataService(PsiElement element) {
-        return ServiceManager.getService(element.getProject(), CypherMetadataProviderService.class);
+        return element.getProject().getService(CypherMetadataProviderService.class);
     }
 }

language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/editor/CypherParameterInfoHandler.java

@@ -21,16 +21,16 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
 public class CypherParameterInfoHandler
         implements ParameterInfoHandlerWithTabActionSupport<CypherInvocation, CypherInvocation, PsiElement> {
 
-    @NotNull
     @Override
     @SuppressWarnings("unchecked")
-    public PsiElement[] getActualParameters(@NotNull CypherInvocation o) {
+    public PsiElement @NotNull [] getActualParameters(@NotNull CypherInvocation o) {
         return ArrayUtil.toObjectArray(o.arguments(), PsiElement.class);
     }
 
@@ -49,13 +49,13 @@ public IElementType getActualParametersRBraceType() {
     @NotNull
     @Override
     public Set<Class<?>> getArgumentListAllowedParentClasses() {
-        return ContainerUtil.newHashSet();
+        return new HashSet<>();
     }
 
     @NotNull
     @Override
     public Set<? extends Class<?>> getArgListStopSearchClasses() {
-        return ContainerUtil.newHashSet();
+        return new HashSet<>();
     }
 
     @NotNull

language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/file/CypherFileTypeFactory.java

@@ -24,25 +24,22 @@
 import com.intellij.psi.formatter.FormatterUtil;
 import com.intellij.psi.impl.source.tree.TreeUtil;
 import com.intellij.psi.tree.IElementType;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 
-import static com.intellij.openapi.util.Pair.pair;
-import static com.intellij.util.containers.ContainerUtil.list;
-
 public class CypherBlock implements ASTBlock {
 
-    private static final Map<IElementType, List<IElementType>> ALIGNMENT_MAPPING = ContainerUtil.newHashMap(
-            pair(CypherTypes.PATTERN, list(CypherTypes.PATTERN_PART, CypherTypes.RELATIONSHIPS_PATTERN)),
-            pair(CypherTypes.MAP_LITERAL, list(CypherTypes.PROPERTY_KEY_NAME, CypherTypes.EXPRESSION)),
-            pair(CypherTypes.RETURN_ITEMS, list(CypherTypes.OP_MUL, CypherTypes.RETURN_ITEM, CypherTypes.WHERE)),
-            pair(CypherTypes.FILTER_EXPRESSION, list(CypherTypes.ID_IN_COLL, CypherTypes.WHERE))
+    private static final Map<IElementType, List<IElementType>> ALIGNMENT_MAPPING = Map.ofEntries(
+            Map.entry(CypherTypes.PATTERN, Arrays.asList(CypherTypes.PATTERN_PART, CypherTypes.RELATIONSHIPS_PATTERN)),
+            Map.entry(CypherTypes.MAP_LITERAL, Arrays.asList(CypherTypes.PROPERTY_KEY_NAME, CypherTypes.EXPRESSION)),
+            Map.entry(CypherTypes.RETURN_ITEMS, Arrays.asList(CypherTypes.OP_MUL, CypherTypes.RETURN_ITEM, CypherTypes.WHERE)),
+            Map.entry(CypherTypes.FILTER_EXPRESSION, Arrays.asList(CypherTypes.ID_IN_COLL, CypherTypes.WHERE))
     );
 
     private ASTNode node;