Skip to content

Commit b70a9d1

Browse files
authored
Merge pull request github#11304 from tamasvajk/kotlin-mut-dep
Kotlin: Exclude .kt files from mutual dependency query
2 parents ae38d5d + b697812 commit b70a9d1

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

java/ql/src/Architecture/Dependencies/MutualDependency.ql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ where
3030
t2.getName().toLowerCase().matches("%visitor%") or
3131
t1.getAMethod().getName().toLowerCase().matches("%visit%") or
3232
t2.getAMethod().getName().toLowerCase().matches("%visit%") or
33-
t1.getPackage() = t2.getPackage()
33+
t1.getPackage() = t2.getPackage() or
34+
t1.getFile().isKotlinSourceFile() or
35+
t2.getFile().isKotlinSourceFile()
3436
)
3537
select t1, "This type and type $@ are mutually dependent.", t2, t2.getName()

java/ql/test/kotlin/query-tests/MutualDependency/MutualDependency.expected

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Architecture/Dependencies/MutualDependency.ql
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package foo.bar
2+
3+
class Foo {
4+
private fun someFun() {
5+
fun say(s: String) { println(s) }
6+
say("Str")
7+
}
8+
}

0 commit comments

Comments
 (0)