From 4cb5e8a919f605bdf4732a315e192eb10d5d02c7 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 6 Feb 2017 20:31:42 +0300 Subject: [PATCH] Do not force resolve descriptors for explicit imports. Create lazy scope instead. Original commit: b616ef0a40c128d818610fe1d87fd5227a924111 --- .../classifierMembers/constraints.kt | 4 ++-- .../lookupTracker/classifierMembers/foo.kt | 8 +++---- .../lookupTracker/conventions/comparison.kt | 2 +- .../lookupTracker/conventions/declarations.kt | 24 +++++++++---------- .../conventions/delegateProperty.kt | 14 +++++------ .../conventions/mathematicalLike.kt | 2 +- .../lookupTracker/conventions/other.kt | 2 +- .../expressionType/inferredType.kt | 4 ++-- .../expressionType/lambdaParameterType.kt | 4 ++-- .../incremental/lookupTracker/java/usages.kt | 22 ++++++++--------- .../lookupTracker/localDeclarations/locals.kt | 6 ++--- .../lookupTracker/packageDeclarations/foo1.kt | 4 ++-- .../incremental/lookupTracker/simple/main.kt | 6 ++--- .../syntheticProperties/KotlinClass.kt | 6 ++--- .../syntheticProperties/usages.kt | 4 ++-- 15 files changed, 56 insertions(+), 56 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt index 579534024ae..400f192507b 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt @@ -2,6 +2,6 @@ package foo import bar.* -/*p:foo*/fun , C, D> test() - where C : /*p:foo*/Number, C : /*p:foo*/Comparable, D : B +/*p:foo*/fun , C, D> test() + where C : /*p:foo p:kotlin*/Number, C : /*p:foo p:kotlin*/Comparable, D : B {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 14b086ed71e..b932c75deba 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -6,10 +6,10 @@ import bar.* val a = /*p:kotlin(Int)*/1 var b = /*p:kotlin(String)*/"" - val c: /*c:foo.A c:foo.A.Companion p:foo*/String + val c: /*c:foo.A c:foo.A.Companion p:foo p:kotlin*/String get() = /*c:foo.A p:kotlin(String)*/b - var d: /*c:foo.A c:foo.A.Companion p:foo*/String = /*p:kotlin(String)*/"ddd" + var d: /*c:foo.A c:foo.A.Companion p:foo p:kotlin*/String = /*p:kotlin(String)*/"ddd" get() = /*p:kotlin(String)*/field set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v } @@ -27,7 +27,7 @@ import bar.* val a = /*p:kotlin(Int)*/1 companion object CO { - fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo*/Int) {} + fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo p:kotlin*/Int) {} } } @@ -44,7 +44,7 @@ import bar.* } /*p:foo*/interface I { - var a: /*c:foo.I p:foo*/Int + var a: /*c:foo.I p:foo p:kotlin*/Int fun foo() class NI diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index 5eb74e65463..98747a87e47 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ +/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int, c: /*p:foo.bar p:kotlin*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt index ef0612c5cba..46c5c01f611 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt @@ -1,15 +1,15 @@ package foo.bar /*p:foo.bar*/class A { - operator fun plus(a: /*c:foo.bar.A p:foo.bar*/Int) = /*p:foo.bar(A)*/this - operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar*/Any?) {} + operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:foo.bar(A)*/this + operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Any?) {} operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this - operator fun get(i: /*c:foo.bar.A p:foo.bar*/Int) = /*p:kotlin(Int)*/1 - operator fun contains(a: /*c:foo.bar.A p:foo.bar*/Int): /*c:foo.bar.A p:foo.bar*/Boolean = /*p:kotlin(Boolean)*/false + operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:kotlin(Int)*/1 + operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int): /*c:foo.bar.A p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/false operator fun invoke() {} - operator fun compareTo(a: /*c:foo.bar.A p:foo.bar*/Int) = /*p:kotlin(Int)*/0 + operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:kotlin(Int)*/0 operator fun component1() = /*p:foo.bar(A)*/this @@ -17,19 +17,19 @@ package foo.bar operator fun next() = /*p:foo.bar(A)*/this } -/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar*/Int) = /*p:foo.bar(A)*/this -/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar*/Any?) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin*/Int) = /*p:foo.bar(A)*/this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin*/Any?) {} /*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar*/Int, v: /*p:foo.bar*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar*/Any): /*p:foo.bar*/Boolean = /*p:kotlin(Boolean)*/true -/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin*/Int, v: /*p:foo.bar p:kotlin*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin*/Any): /*p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/true +/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar*/Any) = /*p:kotlin(Int)*/0 +/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin*/Any) = /*p:kotlin(Int)*/0 /*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!! -/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar*/Boolean = /*p:kotlin(Boolean)*/false +/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/false diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 8c564e7e8fe..4402628b9dd 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -1,22 +1,22 @@ package foo.bar -import kotlin.reflect./*p:kotlin.reflect*/KProperty +/*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty /*p:foo.bar*/class D1 { - operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1*/KProperty<*>) = /*p:kotlin(Int)*/1 + operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 } -/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar*/Any?, p: KProperty<*>, v: /*p:foo.bar*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin*/Int) {} /*p:foo.bar(D2)*/open class D2 { - operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar*/Int) {} + operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin*/Int) {} } -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar*/Any?, p: KProperty<*>) = /*p:kotlin(Int)*/1 -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar*/Any?, k: /*p:foo.bar*/Any) = /*p:foo.bar(D2)*/this +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin*/Any?, k: /*p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D2)*/this /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { - operator fun provideDelegate(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any?, k: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any) = /*p:foo.bar(D3)*/this + operator fun provideDelegate(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin*/Any?, k: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D3)*/this } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index a342737f5ed..1cf542a2a67 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) { +/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int) { var d = /*p:foo.bar(A)*/a /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++ diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index bf27ef791d0..d6c85490321 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { +/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int, c: /*p:foo.bar p:kotlin*/Any, na: /*p:foo.bar*/A?) { /*p:foo.bar(A) c:foo.bar.A(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET) p:foo.bar(set)*/a[1] = /*p:foo.bar(A) c:foo.bar.A(get) p:kotlin(Int)*/a[2] /*p:kotlin(Int) p:kotlin(Boolean)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt index bd562af2dea..a64392dfd7a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -9,8 +9,8 @@ package foo /*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) /*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) -/*p:foo*/fun useListOfA(a: /*p:foo*/List) {} -/*p:foo*/fun useListOfB(b: /*p:foo*/List) {} +/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin.collections*/List) {} +/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin.collections*/List) {} /*p:foo*/fun testInferredType() { /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(A)*/getListOfA()) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt index 736fba6ade3..e55acec918c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt @@ -2,8 +2,8 @@ package foo /*p:foo*/class C -/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo*/Unit) {} -/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo*/Unit) {} +/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin*/Unit) {} +/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin*/Unit) {} /*p:foo*/fun testLambdaParameterType() { /*p:foo*/lambdaConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/it } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index 619d4d63969..fae7e925fd0 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -1,6 +1,6 @@ package foo -import bar./*p:bar*/C +/*p:bar(C)*/import bar.C import baz.* /*p:foo*/fun usages() { @@ -11,16 +11,16 @@ import baz.* /*p:bar(C)*/c./*c:bar.C*/func() /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm c:bar.C(S)*/C./*c:bar.C*/S() + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/sfunc() + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/IS() + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c @@ -35,10 +35,10 @@ import baz.* } /*p:foo*/fun classifiers( - c: C, - b: C./*c:bar.C*/B, - s: C./*c:bar.C*/S, - cis: C./*c:bar.C*/IS, + c: /*p:bar*/C, + b: /*p:bar*/C./*c:bar.C*/B, + s: /*p:bar*/C./*c:bar.C*/S, + cis: /*p:bar*/C./*c:bar.C*/IS, i: /*p:foo*/I, iis: /*p:foo*/I./*c:foo.I*/IS, e: /*p:foo p:baz*/E diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt index 8dc43de85c1..fa10ec53086 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -2,16 +2,16 @@ package local.declarations import bar.* -/*p:local.declarations*/fun f(p: /*p:local.declarations*/Any) /*p:kotlin(Int)*/{ +/*p:local.declarations*/fun f(p: /*p:local.declarations p:kotlin*/Any) /*p:kotlin(Int)*/{ /*p:kotlin(Any) p:kotlin(String)*/p.toString() val a = /*p:kotlin(Int)*/1 val b = /*p:kotlin(Int)*/a fun localFun() = /*p:kotlin(Int)*/b - fun /*p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() + fun /*p:local.declarations p:kotlin*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() abstract class LocalI { - abstract var a: /*p:local.declarations*/Int + abstract var a: /*p:local.declarations p:kotlin*/Int abstract fun foo() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 2bbe33fe6de..222fadbf956 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -1,7 +1,7 @@ package foo import bar.* -import baz./*p:baz*/C +/*p:baz(C)*/import baz.C /*p:foo*/val a = /*p:foo p:bar*/A() /*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:baz(B)*/baz./*p:baz*/B() @@ -11,7 +11,7 @@ import baz./*p:baz*/C /*p:kotlin(Nothing)*/return /*p:foo p:bar*/B() } -/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ +/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo p:kotlin*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:baz(B)*/b /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt index 33b7fbf143c..09f59f1743c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun main(args: /*p:foo.bar*/Array) { - val f: /*p:foo.bar*/Array - val s: /*p:foo.bar*/String +/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin*/Array) { + val f: /*p:foo.bar p:kotlin*/Array + val s: /*p:foo.bar p:kotlin*/String } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt index 75b360dbbb9..ac2ea2093d3 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt @@ -1,8 +1,8 @@ package foo -import /*p:*/JavaClass +/*p:(JavaClass)*/import JavaClass -/*p:foo*/class KotlinClass : JavaClass() { +/*p:foo*/class KotlinClass : /*p:*/JavaClass() { override fun getFoo() = /*p:kotlin(Int)*/2 - fun setFoo(i: /*c:foo.KotlinClass c:JavaClass p:foo*/Int) {} + fun setFoo(i: /*c:foo.KotlinClass c:JavaClass p:foo p:kotlin*/Int) {} } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 38edcec3ac5..6e90f036e0a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -1,7 +1,7 @@ package foo.bar -import /*p:*/JavaClass -import foo./*p:foo*/KotlinClass +/*p:(JavaClass)*/import JavaClass +/*p:foo(KotlinClass)*/import foo.KotlinClass /*p:foo.bar*/fun test() { val j = /*p:*/JavaClass()