commit 614d9773bac84a97ab9416de2e47c81ee3126d14
author Andrey Uskov <andrey.uskov@jetbrains.com> Wed Jan 26 23:34:30 2022 +0400
committer Andrey Uskov <andrey.uskov@jetbrains.com> Tue Dec 06 11:24:48 2022 +0400
tree 7c2eb16053f3699fc7c9e5a7fb8d0957794165c4
parent 9c54569a309ac2ed8b98574d78d6a404253dfde0

CR fixup

buildSrc/src/main/kotlin/org/jetbrains/gradle/plugins/tools/InspectForForbidenAPIUsage.kt

diff --git a/buildSrc/src/main/kotlin/org/jetbrains/gradle/plugins/tools/InspectForForbidenAPIUsage.kt b/buildSrc/src/main/kotlin/org/jetbrains/gradle/plugins/tools/InspectForForbidenAPIUsage.kt
index 7696eff..13e582c 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/gradle/plugins/tools/InspectForForbidenAPIUsage.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/gradle/plugins/tools/InspectForForbidenAPIUsage.kt
@@ -38,6 +38,7 @@
     }
 
     @Incremental
+    @SkipWhenEmpty
     @get:Classpath
     var validationClasspath: FileCollection = project.objects.fileCollection()
 
@@ -50,6 +51,7 @@
             }
             MethodReference(it.substring(0, separatorIndex), it.substring(separatorIndex + 1))
         }
+        if (forbidenMethods.isEmpty()) return
 
         val changedFiles =
         inputChanges.getFileChanges(validationClasspath)
@@ -114,7 +116,8 @@
 
 class SearchingClassVisitor(methods: Collection<MethodReference>) : ClassVisitor(API_VERSION) {
 
-    class SearchingMethodVisitor(private val searchState: SearchState, private val methodsToFind: Collection<MethodReference>) : MethodVisitor(API_VERSION) {
+    class SearchingMethodVisitor(private val methodsToFind: Collection<MethodReference>) : MethodVisitor(API_VERSION) {
+        var searchState = SearchState()
 
         val calls = TreeMap<CallSite, MutableSet<MethodReference>>()
 
@@ -132,15 +135,14 @@
         }
     }
 
-    private val searchState = SearchState()
-    private val methodVisitor = SearchingMethodVisitor(searchState, methods)
+    private val methodVisitor = SearchingMethodVisitor(methods)
 
     override fun visit(version: Int, access: Int, name: String, signature: String?, superName: String, interfaces: Array<String>) {
-        searchState.className = name
+        methodVisitor.searchState.className = name
     }
 
     override fun visitSource(source: String, debug: String?) {
-        searchState.sourceFile = source
+        methodVisitor.searchState.sourceFile = source
     }
 
     override fun visitMethod(
@@ -148,9 +150,13 @@
         desc: String, signature: String?,
         exceptions: Array<String>?
     ): MethodVisitor {
-        searchState.methodName = name
+        methodVisitor.searchState.methodName = name
         return methodVisitor
     }
 
+    override fun visitEnd() {
+        methodVisitor.searchState = SearchState()
+    }
+
     fun getCalls() = methodVisitor.calls
 }