Merge pull request #47 from picimako/090

Changes for v0.9.0

Author: picimako

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ## [Unreleased]
 
+## [0.9.0]
+### Changed
+- Dropped support for IJ-2021.3.
+- Added support for IJ-2023.1.
+- Minor simplifications under the hood.
+
 ## [0.8.0]
 ### Added
 - [#37](https://github.com/picimako/mockitools/issues/37): Added inspection to report stub-only mocks when they are used verifications.

build.gradle.kts

@@ -6,9 +6,9 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.7.0"
+    id("org.jetbrains.kotlin.jvm") version "1.7.22"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.9.0"
+    id("org.jetbrains.intellij") version "1.12.0"
     // Gradle Changelog Plugin
     id("org.jetbrains.changelog") version "1.3.1"
     // Gradle Qodana Plugin
@@ -98,6 +98,10 @@ tasks {
         include("**/*Test.class")
     }
 
+//    runPluginVerifier {
+//        ideVersions.set(listOf("IC-2023.1"))
+//    }
+
     signPlugin {
         certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))
         privateKey.set(System.getenv("PRIVATE_KEY"))

gradle.properties

@@ -3,16 +3,16 @@
 
 pluginGroup = com.picimako.mockitools
 pluginName = Mockitools
-pluginVersion = 0.8.0
+pluginVersion = 0.9.0
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 213
-pluginUntilBuild = 223.*
+pluginSinceBuild = 221
+pluginUntilBuild = 231.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IC
-platformVersion = 2021.3
+platformVersion = 2022.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

src/main/java/com/picimako/mockitools/dsl/MockObject.java

@@ -33,7 +33,8 @@ public static boolean isStubOnly(PsiReferenceExpression ref) {
         return Optional.of(ref)
             .map(PsiReference::resolve)
             .map(mockVariable -> {
-                if (mockVariable instanceof PsiField) return isFieldMock((PsiField) mockVariable);
+                if (mockVariable instanceof PsiField)
+                    return isFieldMock((PsiField) mockVariable);
                 else if (mockVariable instanceof PsiLocalVariable)
                     return isVariableMock((PsiLocalVariable) mockVariable);
                 return false;

src/main/java/com/picimako/mockitools/intention/ConvertMockSpyFieldToCallIntention.java

@@ -30,7 +30,6 @@
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.JavaPsiFacade;
-import com.intellij.psi.PsiAnnotation;
 import com.intellij.psi.PsiAnnotationMemberValue;
 import com.intellij.psi.PsiArrayInitializerMemberValue;
 import com.intellij.psi.PsiClass;

src/main/java/com/picimako/mockitools/util/PsiMethodUtil.java

@@ -223,9 +223,8 @@ public static Optional<PsiMethodCallExpression> findCallUpwardsInChain(@NotNull
      * @since 0.3.0
      */
     public static Optional<PsiMethodCallExpression> findCallDownwardsInChain(@NotNull PsiExpression aCallInChain, String methodNameToFind) {
-        var callsInChain = PsiTreeUtil.collectParents(aCallInChain,
-            PsiMethodCallExpression.class, false, e -> e instanceof PsiExpressionList || e instanceof PsiStatement);
-        return callsInChain.stream()
+        return collectCallsInChainFromFirst(aCallInChain)
+            .stream()
             .filter(call -> methodNameToFind.equals(getMethodName(call)))
             .findFirst();
     }
@@ -248,7 +247,7 @@ public static List<PsiMethodCallExpression> collectCallsInChainFromLast(@NotNull
         return calls.stream().map(PsiMethodCallExpression.class::cast).collect(toList());
     }
 
-    public static List<PsiMethodCallExpression> collectCallsInChainFromFirst(PsiMethodCallExpression expression, boolean includeMySelf) {
+    public static List<PsiMethodCallExpression> collectCallsInChainFromFirst(PsiExpression expression, boolean includeMySelf) {
         return PsiTreeUtil.collectParents(expression,
             PsiMethodCallExpression.class, includeMySelf, e -> e instanceof PsiExpressionList || e instanceof PsiStatement);
     }
@@ -257,6 +256,10 @@ public static List<PsiMethodCallExpression> collectCallsInChainFromFirst(PsiMeth
         return collectCallsInChainFromFirst(expression, false);
     }
 
+    public static List<PsiMethodCallExpression> collectCallsInChainFromFirst(PsiExpression expression) {
+        return collectCallsInChainFromFirst(expression, false);
+    }
+
     /**
      * Returns whether the provided set of expressions contain any {@link PsiNewExpression} that references
      * a non-default constructor call.

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

@@ -3,13 +3,13 @@
     <id>mockitools</id>
     <name>Mockitools</name>
     <vendor url="https://github.com/picimako/mockitools">Tamás Balog</vendor>
-    <version>0.8.0</version>
+    <version>0.9.0</version>
     <resource-bundle>messages.MockitoolsBundle</resource-bundle>
 
     <description>Provides integration for the Mockito framework for Java.</description>
 
     <!-- https://jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html -->
-    <idea-version since-build="213"/>
+    <idea-version since-build="221"/>
 
     <!-- please see https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html on how to target different products -->
     <depends>com.intellij.modules.platform</depends>