Fix remaining compatibility issues. PluginVerifier is successful

Author: Alberto Venturini

gradle.properties

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

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

@@ -11,7 +11,6 @@
                 Graph database plugin for the IntelliJ Platform
             </a>
         </p>
-
         <p>
             <b>Features:</b>
         <ul>
@@ -52,6 +51,16 @@
             </ul>
         </ul>
         </p>
+        <p>
+            This plugin is based on the 'Graph Database Support plugin'
+            developed by Neueda Technologies, Ltd. The original plugin has not been updated
+            in a long time.
+        </p>
+        <p>
+            This plugin has been updated to run with modern versions of IntelliJ and related IDEs.
+            Just like the original plugin, it supports Neo4j and Cypher data sources; however, support for
+            Gremlin data sources (such as Cosmos DB) has been dropped.
+        </p>
         ]]></description>
 
     <change-notes><![CDATA[

language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherInvocation.java

@@ -67,10 +67,13 @@ default List<InvokableInformation> resolve() {
             return matchedInvocations;
         }
 
+        String name = getFullName();
+
         matchedInvocations.addAll(CypherBuiltInFunctions.FUNCTIONS.stream()
                 .map(CypherBuiltInFunctionElement::getInvokable)
-                .filter(invokable -> Objects.equals(invokable.getName(), getFullName()))
+                .filter(invokable -> Objects.equals(invokable.getName(), name))
                 .collect(toList()));
+
         if (matchedInvocations.isEmpty()) {
             svc.findUserFunction(getFullName())
                 .map(CypherUserFunctionElement::getInvokableInformation)

language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherVariableElement.java

@@ -6,6 +6,7 @@
  */
 package com.albertoventurini.graphdbplugin.language.cypher.references;
 
+import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType;
 import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherMaybeVariableLength;
 import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherNodePattern;
 import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPatternPart;
@@ -15,6 +16,8 @@
 import com.intellij.psi.PsiReference;
 import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherList;
 import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType;
+import com.intellij.psi.PsiReferenceService;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
@@ -43,16 +46,13 @@ default CypherType getType() {
                     } else if (node instanceof CypherPatternPart) {
                         return PATH;
                     } else if (node instanceof CypherRelationshipDetail) {
-                        return resolveRelationshipType((CypherRelationshipDetail) node);
+                        CypherMaybeVariableLength maybeVariableLength =
+                                ((CypherRelationshipDetail) node).getMaybeVariableLength();
+                        return nonNull(maybeVariableLength) ? CypherList.of(RELATIONSHIP) : RELATIONSHIP;
                     }
 
                     return null;
                 })
                 .orElse(ANY);
     }
-
-    default CypherType resolveRelationshipType(CypherRelationshipDetail relationshipDetail) {
-        CypherMaybeVariableLength maybeVariableLength = relationshipDetail.getMaybeVariableLength();
-        return nonNull(maybeVariableLength) ? CypherList.of(RELATIONSHIP) : RELATIONSHIP;
-    }
 }

platform/src/main/resources/graphdb/messages/GraphBundle.properties

@@ -1,14 +1,13 @@
 updater.title=Graph Database plugin updated to v{0}
 updater.notification=Initial release of Graph Database Plugin.<br/>\
-  This plugin is based on the 'Graph Database Support plugin' \
-  developed by Neueda. The original plugin has not been updated\
-  in a long time. <br/>\
-  <br/>\
-  This plugin adds support for newer versions of IntelliJ\
-  and related IDEs.\
-  <br/>\
-  This plugin supports Neo4j data sources but does not support\
-  Gremlin-based data sources such as Cosmos DB.\
-\
+This plugin is based on the 'Graph Database Support plugin' \
+developed by Neueda Technologies, Ltd. The original plugin has not been updated \
+in a long time. <br/>\
 <br/>\
-<a href="https://github.com/albertoventurini/graphdb-intellij-plugin">Github</a>
+This plugin has been updated to run with modern versions of IntelliJ and related IDEs. \
+Just like the original plugin, it supports Neo4j and Cypher data sources; however, support for \
+Gremlin data sources (such as Cosmos DB) has been dropped. \
+<br/>\
+For more information, please see the \
+<a href="https://github.com/albertoventurini/graphdb-intellij-plugin">Github</a> \
+repository.

ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/inspection/CypherExplainWarningInspection.java

@@ -12,6 +12,7 @@
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.albertoventurini.graphdbplugin.database.api.GraphDatabaseApi;
@@ -52,7 +53,7 @@ public void visitElement(@NotNull PsiElement element) {
     private void checkStatement(@NotNull PsiElement statement, @NotNull ProblemsHolder problemsHolder) {
         if (statement.getNode().getElementType() == CypherTypes.SINGLE_QUERY) {
             final DatabaseManagerService databaseManagerService =
-                    statement.getProject().getService(DatabaseManagerService.class);
+                    ApplicationManager.getApplication().getService(DatabaseManagerService.class);
 
             final DataSourcesComponent dataSourcesComponent =
                     statement.getProject().getService(DataSourcesComponent.class);