From a0f86d8dd61b1424899bbcc0a72bc87db0545f56 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 12 Jun 2023 16:21:53 +0200 Subject: [PATCH] [JS] Remove JS legacy lookup tracker tests --- .../kotlin/jps/GenerateJpsPluginTests.kt | 3 - .../build/JsLookupTrackerTestGenerated.java | 61 ---------------- .../lookupTracker/js/classifierMembers/bar.kt | 5 -- .../js/classifierMembers/build.log | 21 ------ .../js/classifierMembers/constraints.kt | 7 -- .../lookupTracker/js/classifierMembers/foo.kt | 71 ------------------- .../js/classifierMembers/usages.kt | 50 ------------- .../js/classifierMembers/usages.kt.new.2 | 54 -------------- .../js/classifierMembers/usages.kt.touch.1 | 0 .../lookupTracker/js/conventions/build.log | 16 ----- .../js/conventions/comparison.kt | 18 ----- .../js/conventions/comparison.kt.touch | 0 .../js/conventions/declarations.kt | 35 --------- .../js/conventions/delegateProperty.kt | 30 -------- .../js/conventions/delegateProperty.kt.touch | 0 .../js/conventions/mathematicalLike.kt | 24 ------- .../js/conventions/mathematicalLike.kt.touch | 0 .../lookupTracker/js/conventions/other.kt | 16 ----- .../js/conventions/other.kt.touch | 0 .../lookupTracker/js/expressionType/build.log | 7 -- .../js/expressionType/genericType.kt | 15 ---- .../js/expressionType/inferredType.kt | 19 ----- .../js/expressionType/lambdaParameterType.kt | 11 --- .../js/expressionType/localInnerClassType.kt | 9 --- .../lookupTracker/js/localDeclarations/bar.kt | 1 - .../js/localDeclarations/build.log | 5 -- .../js/localDeclarations/locals.kt | 49 ------------- .../js/packageDeclarations/bar.kt | 7 -- .../js/packageDeclarations/baz.kt | 7 -- .../js/packageDeclarations/build.log | 13 ---- .../js/packageDeclarations/foo1.kt | 17 ----- .../js/packageDeclarations/foo1.kt.touch | 0 .../js/packageDeclarations/foo2.kt | 7 -- .../js/packageDeclarations/foo2.kt.touch | 0 .../lookupTracker/js/simple/build.log | 4 -- .../lookupTracker/js/simple/main.kt | 6 -- 36 files changed, 588 deletions(-) delete mode 100644 jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/bar.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/build.log delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1 delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/build.log delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/build.log delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/bar.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/build.log delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/build.log delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/simple/build.log delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/GenerateJpsPluginTests.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/GenerateJpsPluginTests.kt index 0a8012efd4d..e211bb7060c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/GenerateJpsPluginTests.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/GenerateJpsPluginTests.kt @@ -89,9 +89,6 @@ fun main(args: Array) { testClass { model("incremental/lookupTracker/jvm", extension = null, recursive = false) } - testClass { - model("incremental/lookupTracker/js", extension = null, recursive = false) - } testClass { // todo: investigate why lookups are different from non-klib js model("incremental/lookupTracker/jsKlib", extension = null, recursive = false) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java deleted file mode 100644 index c053f03e2fe..00000000000 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.jps.build; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.jps.GenerateJpsPluginTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("jps/jps-plugin/testData/incremental/lookupTracker/js") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class JsLookupTrackerTestGenerated extends AbstractJsLookupTrackerTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInJs() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/lookupTracker/js"), Pattern.compile("^([^\\.]+)$"), null, false); - } - - @TestMetadata("classifierMembers") - public void testClassifierMembers() throws Exception { - runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/"); - } - - @TestMetadata("conventions") - public void testConventions() throws Exception { - runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/"); - } - - @TestMetadata("expressionType") - public void testExpressionType() throws Exception { - runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/"); - } - - @TestMetadata("localDeclarations") - public void testLocalDeclarations() throws Exception { - runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/"); - } - - @TestMetadata("packageDeclarations") - public void testPackageDeclarations() throws Exception { - runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/"); - } - - @TestMetadata("simple") - public void testSimple() throws Exception { - runTest("jps/jps-plugin/testData/incremental/lookupTracker/js/simple/"); - } -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/bar.kt deleted file mode 100644 index 3798ab0118a..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/bar.kt +++ /dev/null @@ -1,5 +0,0 @@ -package bar - -// To force creating bar package - -/*p:bar(Dummy)*/private class Dummy diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/build.log deleted file mode 100644 index 536cf259677..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/build.log +++ /dev/null @@ -1,21 +0,0 @@ -==== INITIAL BUILD ==== -Compiling files: - src/bar.kt - src/constraints.kt - src/foo.kt - src/usages.kt -Exit code: OK - -==== STEP 1 ==== -Compiling files: - src/usages.kt -Exit code: OK - -==== STEP 2 ==== -Compiling files: - src/usages.kt -Exit code: COMPILATION_ERROR - Unresolved reference: vala - Unresolved reference: vara - Unresolved reference: foo - Unresolved reference: bar \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt deleted file mode 100644 index f92324e88e9..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt +++ /dev/null @@ -1,7 +0,0 @@ -package foo - -import bar.* - -/*p:foo*/fun , C, D> test() - where C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number, C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Comparable, D : B -{} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt deleted file mode 100644 index e9130baea28..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt +++ /dev/null @@ -1,71 +0,0 @@ -package foo - -import bar.* - -/*p:foo*/class A { - val a = /*p:kotlin(Int)*/1 - var b = /*p:kotlin(String)*/"" - - val c: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String - get() = /*c:foo.A p:kotlin(String)*/b - - var d: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String = /*p:kotlin(String)*/"ddd" - get() = /*p:kotlin(String)*/field - set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v } - - fun foo() { - /*c:foo.A p:kotlin(Int)*/a - /*c:foo.A*/foo() - /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a - /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz() - /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - } - - class B { - val a = /*p:kotlin(Int)*/1 - - companion object CO { - fun bar(a: /*c:foo.A c:foo.A.B c:foo.A.B.CO c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} - } - } - - inner class C - - companion object { - val a = /*p:kotlin(Int)*/1 - fun baz() {} - } - - object O { - var v = /*p:kotlin(String)*/"vvv" - } -} - -/*p:foo*/interface I { - var a: /*c:foo.I p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int - fun foo() - - class NI -} - -/*p:foo*/object Obj : /*p:foo*/I { - override var a = /*p:kotlin(Int)*/1 - override fun foo() {} - val b = /*p:kotlin(Int)*/1 - fun bar(): /*c:foo.Obj p:foo*/I = /*p:foo(I) p:kotlin(Nothing)*/null as /*c:foo.Obj p:foo*/I -} - -/*p:foo*/enum class E { - X, - Y; - - val a = /*p:kotlin(Int)*/1 - fun foo() { - /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Y./*c:foo.E*/a - /*c:foo.E*/foo() - /*c:foo.E p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/X./*c:foo.E*/foo() - } -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt deleted file mode 100644 index 35af6681592..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt +++ /dev/null @@ -1,50 +0,0 @@ -package foo - -import bar.* - -/*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{ - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo() - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a - /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) - /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*c:foo.A(Companion) p:foo*/A - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a - /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion - /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O - /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - - /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 - /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a - /*p:foo*/Obj./*c:foo.Obj*/foo() - var ii: /*p:foo*/I = /*p:foo*/Obj - /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a - /*p:foo(I)*/ii./*c:foo.I*/foo() - /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b - val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() - /*p:foo(I)*/iii./*c:foo.I*/foo() - - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X - /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values() - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") -} - -/*p:foo*/fun classifiers( - a: /*p:foo*/A, - ab: /*p:foo*/A./*c:foo.A*/B, - ac: /*p:foo*/A./*c:foo.A*/C, - abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO, - aCompanion: /*p:foo*/A./*c:foo.A*/Companion, - aO: /*p:foo*/A./*c:foo.A*/O, - i: /*p:foo*/I, - ni: /*p:foo*/I./*c:foo.I*/NI, - obj: /*p:foo*/Obj, - e: /*p:foo*/E -) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 deleted file mode 100644 index ebacc22616e..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 +++ /dev/null @@ -1,54 +0,0 @@ -package foo - -import bar.* - -/*p:foo*/fun usages(i: /*p:foo*/I) { - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" - /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo() - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a - /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) - /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*c:foo.A(Companion) p:foo*/A - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a - /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion - /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O - /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vara() - - /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 - /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a - /*p:foo*/Obj./*c:foo.Obj*/foo() - var ii: /*p:foo*/I = /*p:foo*/Obj - /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a - /*p:foo(I)*/ii./*c:foo.I*/foo() - /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b - val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() - /*p:foo(I)*/iii./*c:foo.I*/foo() - - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X - /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values() - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/foo - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/bar() -} - -/*p:foo*/fun classifiers( - a: /*p:foo*/A, - ab: /*p:foo*/A./*c:foo.A*/B, - ac: /*p:foo*/A./*c:foo.A*/C, - abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO, - aCompanion: /*p:foo*/A./*c:foo.A*/Companion, - aO: /*p:foo*/A./*c:foo.A*/O, - i: /*p:foo*/I, - ni: /*p:foo*/I./*c:foo.I*/NI, - obj: /*p:foo*/Obj, - e: /*p:foo*/E -) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1 b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/build.log deleted file mode 100644 index a03aebe0d5f..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/build.log +++ /dev/null @@ -1,16 +0,0 @@ -==== INITIAL BUILD ==== -Compiling files: - src/comparison.kt - src/declarations.kt - src/delegateProperty.kt - src/mathematicalLike.kt - src/other.kt -Exit code: OK - -==== STEP 1 ==== -Compiling files: - src/comparison.kt - src/delegateProperty.kt - src/mathematicalLike.kt - src/other.kt -Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt deleted file mode 100644 index 59eb2b987eb..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt +++ /dev/null @@ -1,18 +0,0 @@ -package foo.bar - -/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/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 - /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:kotlin(Nothing)*/null - - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/> /*p:kotlin(Int)*/b - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/< /*p:kotlin(Int)*/b - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/>= /*p:kotlin(Int)*/b - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/<= /*p:kotlin(Int)*/b - - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt deleted file mode 100644 index 08ab50385d4..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt +++ /dev/null @@ -1,35 +0,0 @@ -package foo.bar - -/*p:foo.bar*/class A { - operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this - operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/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 p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/1 - operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int): /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false - operator fun invoke() {} - - operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/0 - - operator fun component1() = /*p:foo.bar(A)*/this - - operator fun iterator() = /*p:foo.bar(A)*/this - operator fun next() = /*p:foo.bar(A)*/this -} - -/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this -/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/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 p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/true -/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} - -/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/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 p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt deleted file mode 100644 index 66cd987ff61..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt +++ /dev/null @@ -1,30 +0,0 @@ -package foo.bar - -/*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty - -/*p:foo.bar*/class D1 { - operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/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 p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} - -/*p:foo.bar(D2)*/open class D2 { - operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} -} - -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/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 p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D2)*/this - -/*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { - operator fun provideDelegate(p: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D3)*/this -} - - -/*p:foo.bar*/val x1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) p:foo.bar p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1() -/*p:foo.bar*/var y1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) c:foo.bar.D1(setValue) p:foo.bar p:foo.bar(provideDelegate) p:foo.bar(setValue) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1() - -/*p:foo.bar*/val x2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2() -/*p:foo.bar*/var y2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2() - -/*p:foo.bar*/val x3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) p:foo.bar p:foo.bar(getValue)*/D3() -/*p:foo.bar*/var y3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) c:foo.bar.D3(setValue) p:foo.bar p:foo.bar(getValue)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt deleted file mode 100644 index c3dda9f895f..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt +++ /dev/null @@ -1,24 +0,0 @@ -package foo.bar - -/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) { - var d = /*p:foo.bar(A)*/a - - /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++ - /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d - /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- - /*c:foo.bar.A(dec) p:foo.bar(A) p:foo.bar(dec)*/--/*p:foo.bar(A)*/d - - /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b - /*c:foo.bar.A(not) p:foo.bar(not)*/!/*p:foo.bar(A)*/a - - // for val - /*p:foo.bar(A)*/a /*c:foo.bar.A(timesAssign)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b - - // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plus) c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:kotlin.js(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minus) c:foo.bar.A(minusAssign) p:foo.bar(minus) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:kotlin.js(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(times) c:foo.bar.A(timesAssign) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:kotlin.js(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(div) c:foo.bar.A(divAssign) p:foo.bar(div) p:foo.bar(divAssign) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:kotlin.js(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div)*//= /*p:kotlin(Int)*/b -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt deleted file mode 100644 index 0fb034380d4..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt +++ /dev/null @@ -1,16 +0,0 @@ -package foo.bar - -/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) { - /*c:foo.bar.A(set) p:foo.bar(A) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(A) p:kotlin(Int)*/a[2] - - /*p:kotlin(Boolean) p:kotlin(Int)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a - /*p:kotlin(Boolean) p:kotlin(String)*/"s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a - - /*c:foo.bar.A(invoke)*/a() - /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1) - - val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a; - - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext)*/a); - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator)*/na); -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt.touch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/build.log deleted file mode 100644 index 74d3d30ab54..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/build.log +++ /dev/null @@ -1,7 +0,0 @@ -==== INITIAL BUILD ==== -Compiling files: - src/genericType.kt - src/inferredType.kt - src/lambdaParameterType.kt - src/localInnerClassType.kt -Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt deleted file mode 100644 index dd0722893b2..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -// From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25 - -/*p:foo*/fun identity(): (T) -> T = /*p:kotlin(Function1) p:kotlin(Nothing)*/null as (T) -> T - -/*p:foo*/fun compute(f: () -> T) { - val result = f() -} - -/*p:foo*/class Bar(val t: T) { - init { - val a = /*c:foo.Bar c:foo.Bar(T)*/t - } -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt deleted file mode 100644 index cc97bd76b8b..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt +++ /dev/null @@ -1,19 +0,0 @@ -package foo - -/*p:foo(A)*/open class A -/*p:foo*/class B : /*p:foo*/A() - -/*p:foo*/fun getA() = /*p:foo*/A() -/*p:foo*/fun getB() = /*p:foo*/B() - -/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/B()) - -/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List) {} -/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List) {} - -/*p:foo*/fun testInferredType() { - /*p:foo*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA()) - /*p:foo*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB()) - /*p:foo*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB()) -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt deleted file mode 100644 index 4040103b8ae..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt +++ /dev/null @@ -1,11 +0,0 @@ -package foo - -/*p:foo*/class C - -/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {} -/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {} - -/*p:foo*/fun testLambdaParameterType() { - /*p:foo*/lambdaConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/it } - /*p:foo*/extensionConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/this } -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt deleted file mode 100644 index c9e10d74f07..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt +++ /dev/null @@ -1,9 +0,0 @@ -package foo - -/*p:foo*/fun bar() { - class A { - inner class B - } - - val b = A().B() -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/bar.kt deleted file mode 100644 index ddac0faf273..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/bar.kt +++ /dev/null @@ -1 +0,0 @@ -package bar diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/build.log deleted file mode 100644 index dc6965bc972..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/build.log +++ /dev/null @@ -1,5 +0,0 @@ -==== INITIAL BUILD ==== -Compiling files: - src/bar.kt(no lookups) - src/locals.kt -Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt deleted file mode 100644 index e268cb9be52..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt +++ /dev/null @@ -1,49 +0,0 @@ -package local.declarations - -import bar.* - -/*p:local.declarations*/fun f(p: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/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:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() - - abstract class LocalI { - abstract var a: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int - abstract fun foo() - } - - class LocalC : LocalI() { - override var a = /*p:kotlin(Int)*/1 - - override fun foo() {} - - var b = /*p:kotlin(String)*/"bbb" - - fun bar() = /*p:kotlin(Int)*/b - } - - val o = object { - val a = /*p:kotlin(String)*/"aaa" - fun foo(): LocalI = /*p:kotlin(Nothing)*/null as LocalI - } - - /*p:kotlin(Int)*/localFun() - /*p:kotlin(Int)*/1.localExtFun() - - val c = LocalC() - /*p:kotlin(Int)*/c.a - /*p:kotlin(String)*/c.b - c.foo() - /*p:kotlin(Int)*/c.bar() - - val i: LocalI = c - /*p:kotlin(Int)*/i.a - i.foo() - - /*p:kotlin(String)*/o.a - val ii = o.foo() - /*p:kotlin(Int)*/ii.a -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt deleted file mode 100644 index d69fc70de05..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt +++ /dev/null @@ -1,7 +0,0 @@ -package bar - -/*p:bar*/class A - -/*p:bar*/class B - -/*p:bar*/object O diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt deleted file mode 100644 index b6af61fb0db..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt +++ /dev/null @@ -1,7 +0,0 @@ -package baz - -/*p:baz*/class A - -/*p:baz*/class B - -/*p:baz*/class C diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/build.log deleted file mode 100644 index 6c6710fba2c..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/build.log +++ /dev/null @@ -1,13 +0,0 @@ -==== INITIAL BUILD ==== -Compiling files: - src/bar.kt - src/baz.kt - src/foo1.kt - src/foo2.kt -Exit code: OK - -==== STEP 1 ==== -Compiling files: - src/foo1.kt - src/foo2.kt -Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt deleted file mode 100644 index c39a73ac084..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt +++ /dev/null @@ -1,17 +0,0 @@ -package foo - -import bar.* -/*p:baz(C)*/import baz.C - -/*p:foo*/val a = /*p:bar p:foo*/A() -/*p:foo*/var b: /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B = /*p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B() - -/*p:foo*/fun function(p: /*p:bar p:foo*/B): /*p:bar p:foo*/B /*p:kotlin(Nothing)*/{ - /*p:bar(A) p:foo*/a - /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B() -} - -/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/MyClass() -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt deleted file mode 100644 index cf303aa5f0d..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt +++ /dev/null @@ -1,7 +0,0 @@ -package foo - -/*p:foo*/interface MyInterface - -/*p:foo*/class MyClass : /*p:foo*/MyInterface - -/*p:foo*/enum class MyEnum diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/build.log deleted file mode 100644 index 5aaa84efb3d..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/build.log +++ /dev/null @@ -1,4 +0,0 @@ -==== INITIAL BUILD ==== -Compiling files: - src/main.kt -Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt deleted file mode 100644 index 68363c90532..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt +++ /dev/null @@ -1,6 +0,0 @@ -package foo.bar - -/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array) { - val f: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array - val s: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String -}