Many changes

Author: jord1e

build.gradle.kts

@@ -22,9 +22,9 @@ fun properties(key: String) = project.findProperty(key).toString()
 plugins {
     id("java")
     id("org.jetbrains.kotlin.jvm") version "1.5.30"
-    id("org.jetbrains.intellij") version "1.2.1"
-    id("org.jetbrains.changelog") version "1.3.0"
-    id("org.jetbrains.qodana") version "0.1.12"
+    id("org.jetbrains.intellij") version "1.3.0"
+    id("org.jetbrains.changelog") version "1.3.1"
+    id("org.jetbrains.qodana") version "0.1.13"
 }
 
 group = properties("pluginGroup")
@@ -67,6 +67,12 @@ java {
 }
 
 tasks {
+    compileKotlin {
+        kotlinOptions {
+            jvmTarget = properties("javaVersion")
+        }
+    }
+
     runIde {
         autoReloadPlugins.set(true)
     }

gradle.properties

@@ -17,25 +17,32 @@
 
 # IntelliJ Platform Artifacts Repositories
 # -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
+
 pluginGroup=nl.jrdie.idea.springql
 pluginName=spring-graphql-intellij-plugin
-pluginVersion=0.0.2-alpha
+pluginVersion=0.0.2-alpha.2
+
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild=211.0
 pluginUntilBuild=213.*
+
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions=2020.3.4, 2021.1.3, 2021.2.1
+pluginVerifierIdeVersions=2020.3.4, 2021.1.3, 2021.3.1
+
 platformType=IU
 platformVersion=IU-212.5457.46
 platformDownloadSources=true
+
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins=com.intellij.java, org.jetbrains.kotlin, IntelliLang, com.intellij.lang.jsgraphql:3.0.0, PsiViewer:212-SNAPSHOT
+platformPlugins=com.intellij.java, org.jetbrains.kotlin, IntelliLang, com.intellij.lang.jsgraphql:3.1.2, PsiViewer:212-SNAPSHOT
+
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
 javaVersion=11
-gradleVersion=7.2
+gradleVersion=7.3.3
+
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
 # suppress inspection "UnusedProperty"

gradle/wrapper/gradle-wrapper.properties

@@ -1,22 +1,5 @@
-#
-# Copyright (C) 2021 Jordie
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,20 +1,19 @@
 #!/bin/sh
 
 #
-# Copyright (C) 2021 Jordie
+# Copyright © 2015-2021 the original authors.
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 ##############################################################################
@@ -33,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #

src/main/java/nl/jrdie/idea/springql/svc/QLIdeService.java

@@ -0,0 +1,35 @@
+package nl.jrdie.idea.springql.svc;
+
+import com.intellij.openapi.project.Project;
+import nl.jrdie.idea.springql.index.QLIdeIndex;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.uast.UAnnotation;
+import org.jetbrains.uast.UMethod;
+
+public interface QLIdeService {
+
+    @NotNull
+    default QLIdeIndex getIndex() {
+        return getIndex(false);
+    }
+
+    @NotNull
+    QLIdeIndex getIndex(boolean forceReload);
+
+    boolean isApplicableProject(Project project);
+
+    boolean isSchemaMappingAnnotation(UAnnotation uAnnotation);
+
+    boolean isBatchMappingAnnotation(UAnnotation uAnnotation);
+
+    boolean isValidBatchMappingReturnType(UMethod uMethod);
+
+    boolean isMethodUsed(UMethod uMethod);
+
+    @NotNull
+    QLSchemaRegistry getSchemaRegistry();
+
+//    @NotNull
+//    Project getApplicableProject();
+
+}