Fix search of package-level function/property usages in Java code

This commit is contained in:
Alexey Sedunov
2013-10-14 20:59:15 +04:00
parent 60c9aa559b
commit bdc908d45f
22 changed files with 246 additions and 7 deletions
@@ -0,0 +1,11 @@
<node text="packageFun() ()" base="true">
<node text="KA.name(2 usages) ()"/>
<node text="packageFun.localFun(String)(2 usages) ()"/>
<node text="JA.foo(String)(2 usages) ()">
<node text="PrintStream.println(String) (java.io)"/>
</node>
<node text="KA.foo(String)(3 usages) ()"/>
<node text="packageVal ()"/>
<node text="JA.JA()(4 usages) ()"/>
<node text="KA(5 usages) ()"/>
</node>
@@ -0,0 +1,21 @@
class KA {
val name = "A"
fun foo(s: String): String = "A: $s"
}
val packageVal = ""
fun <caret>packageFun() {
fun localFun(s: String): String = s
val localVal = localFun("")
KA().foo(KA().name)
JA().foo(JA().name)
localFun(packageVal)
run {
KA().foo(KA().name)
JA().foo(JA().name)
KA().foo(localVal)
}
}
@@ -0,0 +1,12 @@
class JA {
public JA() {
}
public String name = "A";
public String foo(String s) {
System.out.println(s);
return "A " + s;
}
}
@@ -0,0 +1,13 @@
<node text="packageVal ()" base="true">
<node text="JA.JA()(4 usages) ()"/>
<node text="KA.foo(String)(2 usages) ()"/>
<node text="localFun(String)(2 usages) ()">
<node text="packageFun(String) ()"/>
</node>
<node text="KA.name(2 usages) ()"/>
<node text="JA.foo(String)(2 usages) ()">
<node text="PrintStream.println(String) (java.io)"/>
</node>
<node text="packageFun(String) ()"/>
<node text="KA(4 usages) ()"/>
</node>
@@ -0,0 +1,24 @@
class KA {
val name = "A"
fun foo(s: String): String = "A: $s"
}
fun packageFun(s: String): String = s
val <caret>packageVal: String
get() {
fun localFun(s: String): String = packageFun(s)
val localVal = localFun("")
KA().foo(KA().name)
JA().foo(JA().name)
localFun("")
run {
KA().foo(KA().name)
JA().foo(JA().name)
packageFun(localVal)
}
return ""
}
@@ -0,0 +1,12 @@
class JA {
public JA() {
}
public String name = "A";
public String foo(String s) {
System.out.println(s);
return "A " + s;
}
}
@@ -0,0 +1,11 @@
<node text="packageFun(String) ()" base="true">
<node text="bar.localFun() ()"/>
<node text="main0.kt ()"/>
<node text="JA.foo() ()"/>
<node text="KClientObj ()"/>
<node text="KClient ()"/>
<node text="KClient ()"/>
<node text="KClient.bar ()"/>
<node text="KClient.bar() ()"/>
<node text="JA ()"/>
</node>
@@ -0,0 +1,26 @@
fun <caret>packageFun(s: String): String = s
val packageVal = packageFun("")
class KClient {
{
packageFun("")
}
class object {
val a = packageFun("")
}
val bar: String
get() = packageFun("")
fun bar() {
fun localFun() = packageFun("")
packageFun("")
}
}
object KClientObj {
val a = packageFun("")
}
@@ -0,0 +1,7 @@
class JA {
public String name = _DefaultPackage.packageFun("");
public String foo() {
return _DefaultPackage.packageFun("");
}
}
@@ -0,0 +1,11 @@
<node text="packageVal ()" base="true">
<node text="JA ()"/>
<node text="JA.getName()(2 usages) ()"/>
<node text="KClient ()"/>
<node text="KClient ()"/>
<node text="KClient.bar() ()"/>
<node text="KClient.bar(2 usages) ()"/>
<node text="KClientObj(2 usages) ()"/>
<node text="bar.localFun() ()"/>
<node text="packageFun(String) ()"/>
</node>
@@ -0,0 +1,30 @@
var <caret>packageVal = ""
fun packageFun(s: String): String = packageVal + s
class KClient {
{
packageVal = ""
}
class object {
val a = packageVal
}
val bar: String
get() = packageVal
set(value: String) {packageVal = value}
fun bar() {
fun localFun() = packageVal
val s = packageVal
}
}
object KClientObj {
val a = packageVal
{
packageVal = ""
}
}
@@ -0,0 +1,8 @@
class JA {
public String name = _DefaultPackage.getPackageVal();
public String getName() {
_DefaultPackage.setPackageVal("");
return _DefaultPackage.getPackageVal();
}
}