Skip to content

Commit 2d10014

Browse files
ting-yuanKSP Auto Pick
authored andcommitted
Clean mapAAOrigin up
The hack was erroneous and no longer needed. (cherry picked from commit 465ac41)
1 parent 78e6bb4 commit 2d10014

File tree

2 files changed

+32
-9
lines changed
  • kotlin-analysis-api

2 files changed

+32
-9
lines changed

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,7 @@ internal fun mapAAOrigin(ktSymbol: KaSymbol): Origin {
9898
return if (symbolOrigin == Origin.JAVA && ktSymbol.psi?.containingFile?.fileType?.isBinary == true) {
9999
Origin.JAVA_LIB
100100
} else {
101-
if (ktSymbol.psi == null) {
102-
if (analyze { ktSymbol.containingModule is KaLibraryModule }) {
103-
Origin.KOTLIN_LIB
104-
} else {
105-
Origin.SYNTHETIC
106-
}
107-
} else {
108-
symbolOrigin
109-
}
101+
symbolOrigin
110102
}
111103
}
112104

kotlin-analysis-api/testData/libOrigins.kt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,22 @@
2222
// Validating Anno3
2323
// Validating Anno4
2424
// Validating Anno5
25+
// Validating Foo
26+
// Validating FooProvider2
2527
// Validating JavaLib
2628
// Validating KotlinLibClass
2729
// Exception: [KotlinLibClass, T1, Any?]: SYNTHETIC
2830
// Exception: [KotlinLibClass, T1, Any?]: SYNTHETIC
2931
// Validating kotlinLibFuntion
3032
// Validating kotlinLibProperty
33+
// Validating File: App.java
34+
// Exception: [File: App.java, App, foo, getFoo, Foo]: SYNTHETIC
35+
// Exception: [File: App.java, App, foo, getFoo]: SYNTHETIC
36+
// Validating File: FooProvider1.kt
37+
// Exception: [File: FooProvider1.kt, FooProvider1, Any]: SYNTHETIC
38+
// Exception: [File: FooProvider1.kt, FooProvider1, foo, foo.getter(), Foo, Foo]: SYNTHETIC
39+
// Exception: [File: FooProvider1.kt, FooProvider1, foo, foo.getter(), Foo]: SYNTHETIC
40+
// Exception: [File: FooProvider1.kt, FooProvider1, foo, foo.getter()]: SYNTHETIC
3141
// Validating File: JavaSrc.java
3242
// Exception: [File: JavaSrc.java, JavaSrc, synthetic constructor for JavaSrc, JavaSrc]: SYNTHETIC
3343
// Exception: [File: JavaSrc.java, JavaSrc, synthetic constructor for JavaSrc]: SYNTHETIC
@@ -89,6 +99,15 @@ class JavaLib<T2> {
8999
}
90100
}
91101

102+
// FILE: FooProvider2.kt
103+
package foo.bar
104+
105+
interface Foo
106+
107+
interface FooProvider2 {
108+
fun getFoo(): Foo
109+
}
110+
92111
// MODULE: main(module1)
93112
// FILE: KotlinSrc.kt
94113
package foo.bar
@@ -103,6 +122,13 @@ class KotlinSrcClass<T3>(val q1: Set<T3>, val q2: Short) {
103122
fun g3(q6: Set<Short>): Short = 0
104123
}
105124

125+
// FILE: FooProvider1.kt
126+
package foo.bar
127+
128+
interface FooProvider1 {
129+
val foo: Foo
130+
}
131+
106132
// FILE: JavaSrc.java
107133
package foo.bar;
108134

@@ -123,3 +149,8 @@ public @interface JavaAnno1 {
123149
@Anno5(p1 = 1, p2 = "a2")
124150
String value ();
125151
}
152+
153+
// FILE: App.java
154+
package foo.bar;
155+
import foo.bar.FooProvider2;
156+
interface App extends FooProvider1, FooProvider2 {}

0 commit comments

Comments
 (0)