v1.6.0

.github/workflows/build.yml

@@ -40,10 +40,6 @@ jobs:
       - name: Fetch Sources
         uses: actions/checkout@v4
 
-      # Validate wrapper
-      - name: Gradle Wrapper Validation
-        uses: gradle/actions/wrapper-validation@v3
-
       # Set up Java environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v4

CHANGELOG.md

@@ -4,6 +4,13 @@
 
 ## [Unreleased]
 
+## [1.6.0]
+### Changed
+- Removed the until-build version, so that the plugin potentially will need less new releases when
+there is no compatibility issue with a newer IDE major version. The earliest IDE version supported now is 2025.1. 
+- Updated project dependency versions and fine-tuned their configuration.
+- Added some minor simplifications to features.
+
 ## [1.5.0]
 ### Changed
 - New supported IDE version range: 2024.3 - 2025.1.*.

CONTRIBUTING.md

@@ -46,7 +46,6 @@ Some messages, like inspection titles are not yet included, and simply are in th
 
 The following markers are placed on extension point implementations and more important types, to help identify certain aspects of the code:
 - `@since <version number>` in javadocs
-- `@HasSonarLintAlternative` annotation if an inspection has an alternative in SonarLint
 
 ## CI/CD
 

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 group = providers.gradleProperty("pluginGroup").get()
 version = providers.gradleProperty("pluginVersion").get()
 
-// Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
+// Set the JVM language level used to build the project.
 kotlin {
     jvmToolchain(21)
 }
@@ -34,10 +34,10 @@ dependencies {
 
     //Required for 'junit.framework.TestCase' referenced in 'com.intellij.testFramework.UsefulTestCase'
     testImplementation(libs.junit)
-    testImplementation("org.assertj:assertj-core:3.27.3")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.11.4")
+    testImplementation(libs.assertj)
+    testImplementation(libs.junitJupiterApi)
+    testRuntimeOnly(libs.junitJupiterEngine)
+    testImplementation(libs.junitJupiterParams)
 
     // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
 
@@ -50,7 +50,6 @@ dependencies {
         // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
         plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
 
-        instrumentationTools()
         pluginVerifier()
         zipSigner()
         testFramework(TestFrameworkType.Platform)
@@ -62,6 +61,7 @@ dependencies {
 // Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html
 intellijPlatform {
     pluginConfiguration {
+        name = providers.gradleProperty("pluginName")
         version = providers.gradleProperty("pluginVersion")
 
         // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
@@ -92,7 +92,7 @@ intellijPlatform {
 
         ideaVersion {
             sinceBuild = providers.gradleProperty("pluginSinceBuild")
-            untilBuild = providers.gradleProperty("pluginUntilBuild")
+//            untilBuild = providers.gradleProperty("pluginUntilBuild")
         }
     }
 
@@ -106,13 +106,14 @@ intellijPlatform {
 intellijPlatformTesting {
     val runTestsInIJCommunity by intellijPlatformTesting.testIde.registering {
         type = IntelliJPlatformType.IntellijIdeaCommunity
-        version = "2024.3"
+        version = "2025.1"
         task {
             useJUnitPlatform {
                 isScanForTestClasses = false
                 include("**/*Test.class")
                 //Excluded due to https://github.com/picimako/mockitools/issues/69
                 exclude("**/MockFieldInitializationInspectionTest.class, **/StubOnlyMockInVerificationInspectionTest.class")
+                environment("NO_FS_ROOTS_ACCESS_CHECK", true)
             }
         }
     }

gradle.properties

@@ -3,15 +3,15 @@
 pluginGroup = com.picimako.mockitools
 pluginName = Mockitools
 # SemVer format -> https://semver.org
-pluginVersion = 1.5.0
+pluginVersion = 1.6.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 243
-pluginUntilBuild = 251.*
+pluginSinceBuild = 251
+#pluginUntilBuild = 251.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IC
-platformVersion = 2024.3
+platformVersion = 2025.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
@@ -21,7 +21,7 @@ platformPlugins =
 platformBundledPlugins = com.intellij.java
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.10.2
+gradleVersion = 8.13
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false

gradle/libs.versions.toml

@@ -1,15 +1,21 @@
 [versions]
 # libraries
 junit = "4.13.2"
+assertj = "3.27.3"
+junitJupiter = "5.11.3"
 
 # plugins
 changelog = "2.2.1"
-intelliJPlatform = "2.0.1"
-kotlin = "2.1.0"
-lombok = "8.12.1"
+intelliJPlatform = "2.5.0"
+kotlin = "2.1.20"
+lombok = "8.13.1"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }
+assertj = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" }
+junitJupiterApi = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitJupiter" }
+junitJupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junitJupiter" }
+junitJupiterParams = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junitJupiter" }
 
 [plugins]
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/picimako/mockitools/CallChainAnalyzer.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/CallChainEndsWith.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 
@@ -7,20 +7,16 @@
 import java.util.List;
 
 import com.intellij.psi.PsiMethodCallExpression;
-import lombok.RequiredArgsConstructor;
 
 /**
  * Analyzes a call chain whether the penultimate call is a call to a predefined method name, either {@code when()} or {@code given()}, in which the mock
  * object, or the call to a mock object is specified.
  */
-@RequiredArgsConstructor
-public final class CallChainEndsWith implements CallChainAnalyzer {
+public record CallChainEndsWith(String stubbingCallName) implements CallChainAnalyzer {
 
     public static final CallChainEndsWith ENDS_WITH_WHEN = new CallChainEndsWith("when");
     public static final CallChainEndsWith ENDS_WITH_GIVEN = new CallChainEndsWith("given");
 
-    private final String stubbingCallName;
-
     @Override
     public boolean analyze(List<PsiMethodCallExpression> calls) {
         return calls.size() >= 2 && stubbingCallName.equals(getMethodName(calls.get(calls.size() - 2)));

src/main/java/com/picimako/mockitools/Convention.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/EnforceConventionUtil.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/MemberInplaceRenameHelper.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/MockableTypesUtil.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/MockitoMockMatchers.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/MockitoQualifiedNames.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/MockitoolsPsiUtil.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/StubType.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/StubbingApproach.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/VerificationApproach.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools;
 

src/main/java/com/picimako/mockitools/completion/MockCompletionContributor.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.picimako.mockitools.completion;
 
 import static com.intellij.patterns.PlatformPatterns.psiElement;
@@ -46,6 +46,10 @@ final class MockCompletionContributor extends CompletionContributor {
     private static final Pattern MOCKITO_VERIFY_PATTERN = Pattern.compile("Mockito\\.(verifyNoInteractions|verifyNoMoreInteractions|verifyZeroInteractions)");
     private static final Pattern VERIFY_PATTERN = Pattern.compile("verifyNoInteractions|verifyNoMoreInteractions|verifyZeroInteractions");
 
+    /**
+     * This capture uses regex based identification of the target method calls because the CallMatcher based
+     * solution can't resolve calls to their methods when the completion is triggered in an empty argument list.
+     */
     private static final PsiElementPattern.Capture<PsiElement> MOCK_OBJECT_PARAMETER_HOLDER_PATTERN =
         psiElement(JavaTokenType.IDENTIFIER)
             .withSuperParent(3, psiElement(PsiMethodCallExpression.class)
@@ -54,14 +58,12 @@ final class MockCompletionContributor extends CompletionContributor {
                     public boolean accepts(@NotNull PsiMethodCallExpression element, ProcessingContext context) {
                         if (MockitoolsPsiUtil.MOCK_OBJECT_PARAMETER_HOLDER.matches(element))
                             return true;
-                        else {
 
-                            String canonicalText = element.getMethodExpression().getCanonicalText();
-                            //E.g. 'Mockito.verifyNoInteractions'
-                            return MOCKITO_VERIFY_PATTERN.matcher(canonicalText).matches()
-                                //E.g. 'verifyNoInteractions' when static-imported
-                                || (VERIFY_PATTERN.matcher(canonicalText).matches() && isMethodDeclaredInMockitoClass(element));
-                        }
+                        String canonicalText = element.getMethodExpression().getCanonicalText();
+                        //E.g. 'Mockito.verifyNoInteractions'
+                        return MOCKITO_VERIFY_PATTERN.matcher(canonicalText).matches()
+                            //E.g. 'verifyNoInteractions' when static-imported
+                            || (VERIFY_PATTERN.matcher(canonicalText).matches() && isMethodDeclaredInMockitoClass(element));
                     }
                 }));
 

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

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools.dsl;
 

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

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools.dsl;
 

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

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools.dsl;
 

src/main/java/com/picimako/mockitools/inspection/BaseQuickFix.java

@@ -0,0 +1,30 @@
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package com.picimako.mockitools.inspection;
+
+import com.intellij.codeInspection.LocalQuickFix;
+import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Base implementation for quick fixes. Based on the original {@code com.siyeh.ig.InspectionGadgetsFix}.
+ */
+public abstract class BaseQuickFix implements LocalQuickFix {
+
+    public final void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
+        var problemElement = descriptor.getPsiElement();
+        if (problemElement != null && problemElement.isValid()) {
+            try {
+                doFix(project, descriptor, problemElement);
+            } catch (IncorrectOperationException e) {
+                Logger.getInstance(this.getClass().getName()).error(e);
+            }
+        }
+    }
+
+    protected abstract void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor, PsiElement problemElement);
+}

src/main/java/com/picimako/mockitools/inspection/CallOnMockitoResetInspection.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools.inspection;
 

src/main/java/com/picimako/mockitools/inspection/MockitoolsBaseInspection.java

@@ -1,4 +1,4 @@
-//Copyright 2024 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+//Copyright 2025 Tamás Balog. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.picimako.mockitools.inspection;