Merge remote-tracking branch 'origin/main' into claude/fix-outdated-stub-index-X6jfP

claude · claude · commit d2419b797529 · 2026-05-15T09:26:13.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       # Build plugin
       - name: Build plugin
@@ -103,7 +103,7 @@ jobs:
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
           cache-read-only: true
 
@@ -191,7 +191,7 @@ jobs:
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
           cache-read-only: true
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
           cache-read-only: true
 
diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
           cache-read-only: true
 
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ pluginGroup = com.github.xepozz.testo
 pluginName = Testo
 pluginRepositoryUrl = https://github.com/j-plugins/testo-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 2026.1.6
+pluginVersion = 2026.2.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 243
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,10 +5,10 @@ opentest4j = "1.3.0"
 
 # plugins
 changelog = "2.5.0"
-intelliJPlatform = "2.11.0"
-kotlin = "2.3.0"
+intelliJPlatform = "2.16.0"
+kotlin = "2.3.20"
 kover = "0.9.4"
-qodana = "2025.3.1"
+qodana = "2025.3.2"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/kotlin/com/github/xepozz/testo/mixin.kt b/src/main/kotlin/com/github/xepozz/testo/mixin.kt
@@ -24,11 +24,20 @@ fun PsiElement.isTestoFunction() = when(this) {
     else -> false
 }
 
-fun PsiElement.isTestoMethod() = when(this) {
-    is Method -> (modifier.isPublic && name.startsWith("test")) || hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES)
+fun PsiElement.isTestoMethod() = when (this) {
+    is Method -> hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES)
+            || (modifier.isPublic && name.startsWith("test"))
+            || isPublicMethodOfTestoMarkedClass()
     else -> false
 }
 
+private fun Method.isPublicMethodOfTestoMarkedClass() = when {
+    !modifier.isPublic -> false
+    modifier.isAbstract -> false
+    name.startsWith("__") -> false
+    else -> containingClass?.hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES) == true
+}
+
 fun PsiElement.isTestoDataProviderLike() = when (this) {
     is Method -> modifier.isPublic && modifier.isStatic
     is Function -> true
@@ -39,7 +48,9 @@ fun PhpAttributesOwner.hasAttribute(fqn: String) = getAttributes(fqn).isNotEmpty
 fun PhpAttributesOwner.hasAnyAttribute(vararg fqn: String) = attributes.any { it.fqn in fqn }
 
 fun PsiElement.isTestoClass() = when (this) {
-    is PhpClass -> TestoTestDescriptor.isTestClassName(name) || ownMethods.any { it.isTestoMethod() || it.isTestoBench() }
+    is PhpClass -> TestoTestDescriptor.isTestClassName(name)
+            || hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES)
+            || ownMethods.any { it.isTestoMethod() || it.isTestoBench() }
     else -> false
 }
 
diff --git a/src/main/kotlin/com/github/xepozz/testo/ui/TestoIconProvider.kt b/src/main/kotlin/com/github/xepozz/testo/ui/TestoIconProvider.kt
@@ -4,6 +4,9 @@ import com.github.xepozz.testo.TestoIcons
 import com.github.xepozz.testo.TestoUtil
 import com.github.xepozz.testo.isTestoFile
 import com.intellij.ide.IconProvider
+import com.intellij.openapi.diagnostic.logger
+import com.intellij.openapi.progress.ProcessCanceledException
+import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.util.Iconable
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.GlobalSearchScopesCore
@@ -13,23 +16,42 @@ import com.jetbrains.php.lang.psi.elements.PhpClass
 import javax.swing.Icon
 
 class TestoIconProvider : IconProvider() {
+    private val log = logger<TestoIconProvider>()
+
     override fun getIcon(element: PsiElement, @Iconable.IconFlags flags: Int): Icon? {
-        val phpFile = element as? PhpFile ?: return null
-        if (!TestoUtil.isEnabled(element.project)) return null
+        return try {
+            val phpFile = element as? PhpFile ?: return null
+            val project = element.project
+            if (!TestoUtil.isEnabled(project)) return null
 
-        if (!phpFile.isTestoFile()) return null
-        if (!GlobalSearchScopesCore.projectTestScope(element.project).contains(phpFile.virtualFile)) {
-            return null
-        }
+            val virtualFile = phpFile.virtualFile ?: return null
+            if (!virtualFile.isValid) return null
+
+            val fileIndex = ProjectFileIndex.getInstance(project)
+            // Quick exit: file is not in project content, is excluded, or is ignored by the IDE.
+            if (!fileIndex.isInContent(virtualFile)) return null
+            if (fileIndex.isExcluded(virtualFile)) return null
+            if (fileIndex.isUnderIgnored(virtualFile)) return null
+
+            if (!phpFile.isTestoFile()) return null
+            if (!GlobalSearchScopesCore.projectTestScope(project).contains(virtualFile)) {
+                return null
+            }
 
-        val phpClasses = PsiTreeUtil.findChildrenOfType(phpFile, PhpClass::class.java)
+            val phpClasses = PsiTreeUtil.findChildrenOfType(phpFile, PhpClass::class.java)
 
-        return when {
-            phpClasses.isEmpty() -> TestoIcons.Layered.FUNCTION
-            phpClasses.size > 1 -> TestoIcons.Layered.FILE
-            phpClasses.first().modifier.isAbstract -> TestoIcons.Layered.Class.CLASS_ABSTRACT
-            phpClasses.first().modifier.isFinal -> TestoIcons.Layered.Class.CLASS_FINAL
-            else -> TestoIcons.Layered.Class.CLASS
+            when {
+                phpClasses.isEmpty() -> TestoIcons.Layered.FUNCTION
+                phpClasses.size > 1 -> TestoIcons.Layered.FILE
+                phpClasses.first().modifier.isAbstract -> TestoIcons.Layered.Class.CLASS_ABSTRACT
+                phpClasses.first().modifier.isFinal -> TestoIcons.Layered.Class.CLASS_FINAL
+                else -> TestoIcons.Layered.Class.CLASS
+            }
+        } catch (e: ProcessCanceledException) {
+            throw e
+        } catch (e: Throwable) {
+            log.warn("Failed to compute Testo icon for element: ${element.javaClass.name}", e)
+            null
         }
     }
 }
diff --git a/src/test/kotlin/com/github/xepozz/testo/MixinPsiTest.kt b/src/test/kotlin/com/github/xepozz/testo/MixinPsiTest.kt
