From 2d5f0f428c68fdce569d1e2ad6c4c180da21b441 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 14 Aug 2015 19:21:28 +0300 Subject: [PATCH] Add test for lookups to top level declarations Original commit: 556c755e83a96d53f49183ee34682c6a4481672a --- .../jps/build/LookupTrackerTestGenerated.java | 6 ++++++ .../lookupTracker/packageDeclarations/bar.kt | 7 +++++++ .../lookupTracker/packageDeclarations/baz.kt | 7 +++++++ .../lookupTracker/packageDeclarations/foo1.kt | 17 +++++++++++++++++ .../lookupTracker/packageDeclarations/foo2.kt | 7 +++++++ .../incremental/lookupTracker/simple/main.kt | 2 +- 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/baz.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 72dc1d1a9c1..401d4211141 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -35,6 +35,12 @@ public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("packageDeclarations") + public void testPackageDeclarations() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/packageDeclarations/"); + doTest(fileName); + } + @TestMetadata("simple") public void testSimple() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/simple/"); diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/bar.kt new file mode 100644 index 00000000000..d69fc70de05 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/bar.kt @@ -0,0 +1,7 @@ +package bar + +/*p:bar*/class A + +/*p:bar*/class B + +/*p:bar*/object O diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/baz.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/baz.kt new file mode 100644 index 00000000000..b6af61fb0db --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/baz.kt @@ -0,0 +1,7 @@ +package baz + +/*p:baz*/class A + +/*p:baz*/class B + +/*p:baz*/class C diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt new file mode 100644 index 00000000000..063c61fbc00 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -0,0 +1,17 @@ +package foo + +import bar.* +import baz./*p:baz*/C + +/*p:foo*/val a = /**p:foo p:bar*/A() +/*p:foo*/var b: /*p:foo p:bar*/baz./*p:baz*/B = /**p:foo p:bar*/baz./**p:baz*/B() + +/*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B { + /**p:foo*/a + 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:foo*/b + return /**p:foo*/MyClass() +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt new file mode 100644 index 00000000000..cf303aa5f0d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt @@ -0,0 +1,7 @@ +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/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt index 20aa0463ba6..33b7fbf143c 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 -fun main(args: /*p:foo.bar*/Array) { +/*p:foo.bar*/fun main(args: /*p:foo.bar*/Array) { val f: /*p:foo.bar*/Array val s: /*p:foo.bar*/String }