light resolve tests when applicable

This commit is contained in:
Anna.Kozlova
2019-01-02 16:32:47 +01:00
parent d80740d020
commit 05027a22f6
224 changed files with 785 additions and 799 deletions

View File

@@ -9,7 +9,7 @@ class Test {
}
public static void main(Stream<Test> stream) {
stream.map(s -> Inner.of(Test::get<ref>Key, s));
stream.map(s -> Inner.of(Test::get<caret>Key, s));
}
public static final class Inner<K> {

View File

@@ -12,7 +12,7 @@ abstract class Test {
}
}
final ArrayList<String> guavaList = newArrayList(fil<ref>ter(tweetList, new Predicate<String>() {
final ArrayList<String> guavaList = newArrayList(fil<caret>ter(tweetList, new Predicate<String>() {
@Override
public boolean test(String tweet) {
return false;

View File

@@ -17,6 +17,6 @@ class MyTest {
List<Integer> baz(Iterator<Integer> s, Iterator<Integer> i) {return null;}
{
List<Integer> l = foo(a -> bar(b -> b<ref>az(a, b)));
List<Integer> l = foo(a -> bar(b -> b<caret>az(a, b)));
}
}

View File

@@ -11,7 +11,7 @@ abstract class Token {
private static B<Long> getMode(Optional<Map.Entry<Integer, Long>> max){
return max
.flatMap(e -> Optional.of(new B<>(Long.valu<ref>eOf(e.getValue().longValue()))))
.flatMap(e -> Optional.of(new B<>(Long.valu<caret>eOf(e.getValue().longValue()))))
.get();
}

View File

@@ -7,7 +7,7 @@ class Test {
{
Set<Map.Entry<String, Integer>> sort3 = new TreeSet<>((x, y) -> {
return Integer.compare(x.get<ref>Value(), y.getValue());
return Integer.compare(x.get<caret>Value(), y.getValue());
});
}
}

View File

@@ -16,6 +16,6 @@ class MyTest {
List<Integer> baz(Iterator<Integer> s, Iterator<Integer> i) {return null;}
{
List<Integer> l = foo(a -> bar(ba<ref>z(a.iterator(), a.iterator())));
List<Integer> l = foo(a -> bar(ba<caret>z(a.iterator(), a.iterator())));
}
}

View File

@@ -1,4 +1,4 @@
class A extends A.<ref>Foo, B{
class A extends A.<caret>Foo, B{
}
interface B{

View File

@@ -1,4 +1,4 @@
class A extends B.<ref>Foo implements B{
class A extends B.<caret>Foo implements B{
}
interface B{

View File

@@ -1,3 +1,3 @@
public class TTT implements <ref>Bar{
public class TTT implements <caret>Bar{
static interface Bar{}
}

View File

@@ -1,3 +1,3 @@
class Test{
void foo() throws java.io.<ref>IOException{}
void foo() throws java.io.<caret>IOException{}
}

View File

@@ -3,6 +3,6 @@ import java.util.*;
public class ImpmortConflict1{
public static void main(String[] args){
<ref>Date d = new Date();
<caret>Date d = new Date();
}
}

View File

@@ -3,6 +3,6 @@ import java.util.Date;
public class ImportConflict2{
public static void main(String[] args){
<ref>Date d = new Date();
<caret>Date d = new Date();
}
}

View File

@@ -1,7 +1,7 @@
class C{
void foo(){
class A{
<ref>B b = null;
<caret>B b = null;
private class B{};
}
}

View File

@@ -2,6 +2,6 @@ class A{
{
class B{}
new <ref>B();
new <caret>B();
}
}

View File

@@ -1,7 +1,7 @@
class A{
{
class B{
<ref>B b;
<caret>B b;
}
new B();

View File

@@ -2,4 +2,4 @@ class A{
private static class B{}
}
class C extends A.<ref>B{}
class C extends A.<caret>B{}

View File

@@ -1,7 +1,7 @@
class A {
{
Outer outer;
outer.new <ref>Inner();
outer.new <caret>Inner();
}
}

View File

@@ -1,7 +1,7 @@
class A {
{
Outer outer;
outer.new <ref>Inner(){};
outer.new <caret>Inner(){};
}
}

View File

@@ -2,7 +2,7 @@ import foo.Outer;
class Foo {
{
new Outer.<ref>Inner() { };
new Outer.<caret>Inner() { };
}
}

View File

@@ -1,4 +1,4 @@
class C<T> {}
class CC extends C<<ref>Inner> {
class CC extends C<<caret>Inner> {
static class Inner { }
}

View File

@@ -8,6 +8,6 @@ class B implements A {
class C extends B {
static void foo(<ref>Entry e){
static void foo(<caret>Entry e){
}
}

View File

@@ -7,6 +7,6 @@ class Outer {
class StaticImportTest {
public static void main(String[] args) {
<ref>Double d;
<caret>Double d;
}
}

View File

@@ -1,5 +1,5 @@
class s {
public static final repeat REPEAT = new <ref>repeat();
public static final repeat REPEAT = new <caret>repeat();
boolean repeat = false;
static class repeat {}
}

View File

@@ -1,5 +1,5 @@
class s {
public static final repeat REPEAT = new <ref>repeat(){};
public static final repeat REPEAT = new <caret>repeat(){};
boolean repeat = false;
static class repeat {}
}

View File

@@ -1,6 +1,6 @@
public class Test {
public void foo() {
int i = 0;
System.out.println(<ref>i);
System.out.println(<caret>i);
}
}

View File

@@ -5,7 +5,7 @@ public class FieldVsOuter2 {
public final String field = "yyy";
public void foo() {
System.out.println(<ref>field);
System.out.println(<caret>field);
}
}
}

View File

@@ -5,7 +5,7 @@ public class FieldVsOuter {
public final String field = "yyy";
public void foo() {
System.out.println(<ref>field);
System.out.println(<caret>field);
}
}
}

View File

@@ -9,7 +9,7 @@ public class AnonField {
new AnonField() {
@Override
public void foo() {
System.out.println(<ref>xxx);
System.out.println(<caret>xxx);
}
}.foo();
}

View File

@@ -7,7 +7,7 @@ public class PrivateFieldVsParam {
new Cls() {
@Override
void foo() {
System.out.println(<ref>field);
System.out.println(<caret>field);
}
}.foo();
}

View File

@@ -2,6 +2,6 @@
class Test {
private static void p( Class<? extends Object> cl )
{
cl.<ref>getSuperclass();
cl.<caret>getSuperclass();
}
}

View File

@@ -4,6 +4,6 @@ class C {
}
void n () {
<ref>m(10);
<caret>m(10);
}
}

View File

@@ -13,6 +13,6 @@ public class Seq<T> {
}
static void foo() {
Seq<String> n = <ref>nil();
Seq<String> n = <caret>nil();
}
}

View File

@@ -13,6 +13,6 @@ public class Seq<T> {
}
static void foo() {
Seq<String> s = <ref>cons("abc", nil());
Seq<String> s = <caret>cons("abc", nil());
}
}

View File

@@ -15,6 +15,6 @@ public class Seq<T> {
static void foo (Seq<String> seq) {}
static void foo() {
foo(<ref>nil());
foo(<caret>nil());
}
}

View File

@@ -13,6 +13,6 @@ public class Seq<T> {
}
static void foo() {
(Seq<String>)<ref>nil();
(Seq<String>)<caret>nil();
}
}

View File

@@ -6,6 +6,6 @@ class C {
<T> T f(T t1, T t2) {return null;}
void foo () {
Object o = <ref>f (new A(), new B ());
Object o = <caret>f (new A(), new B ());
}
}

View File

@@ -3,7 +3,7 @@ public class C <T> {
class Sub {
T foo () {
return C.this.<ref>foo();
return C.this.<caret>foo();
}
}
}

View File

@@ -5,6 +5,6 @@ class C {
<T> B<T> f() {return null;}
void bar () {
A<String> a = <ref>f();
A<String> a = <caret>f();
}
}

View File

@@ -8,6 +8,6 @@ class SortedList<E extends Comparable> extends ArrayList<E>
}
public boolean add(E e){
<ref>binarySearch(this,e); //infer E
<caret>binarySearch(this,e); //infer E
}
}

View File

@@ -6,7 +6,7 @@ class Test {
}
void foo (List<double[]> l) {
<ref>extract(l);
<caret>extract(l);
}
}

View File

@@ -5,6 +5,6 @@ public class C {
<T> T f (G<T> l) { return null;}
void foo (G l) {
String s = <ref>f(l);
String s = <caret>f(l);
}
}

View File

@@ -9,6 +9,6 @@ public class TokenStreamRewriteEngine {
protected void addToSortedRewriteList(String programName, String op, Comparator comparator) {
List rewrites = new ArrayList();
<ref>binarySearch(rewrites, op, comparator);
<caret>binarySearch(rewrites, op, comparator);
}
}

View File

@@ -3,6 +3,6 @@ class C {
<T extends Inner> T f() {return null;}
void bar () {
Object o = <ref>f();
Object o = <caret>f();
}
}

View File

@@ -4,6 +4,6 @@ class Test {
}
void cc() {
<ref>getValue();
<caret>getValue();
}
}

View File

@@ -5,6 +5,6 @@ class C {
<T> T foo (T... ts) { return null; }
void bar () {
<ref>foo(new C2());
<caret>foo(new C2());
}
}

View File

@@ -5,6 +5,6 @@ class C {
<T> T foo (T... ts) { return null; }
void bar () {
<ref>foo(new C2(), new C1());
<caret>foo(new C2(), new C1());
}
}

View File

@@ -5,6 +5,6 @@ class Test {
return null;
}
void foo () {
<ref>asList(new int[0]);
<caret>asList(new int[0]);
}
}

View File

@@ -5,6 +5,6 @@ class Test {
return null;
}
void foo () {
<ref>asList(new int[0], new int[0]);
<caret>asList(new int[0], new int[0]);
}
}

View File

@@ -5,6 +5,6 @@ class Test {
return null;
}
void foo () {
<ref>asList(new Integer[0]);
<caret>asList(new Integer[0]);
}
}

View File

@@ -5,6 +5,6 @@ class Test {
return null;
}
void foo () {
<ref>asList(new Integer[0], new Integer[0]);
<caret>asList(new Integer[0], new Integer[0]);
}
}

View File

@@ -4,7 +4,7 @@ class Comparator<T> {}
public class Collections {
public static <T> T min(Collection<? extends T> coll, Comparator<? super T> comp) {
if (comp==null)
return (T)<ref>min((Collection<SelfComparable>) (Collection) coll);
return (T)<caret>min((Collection<SelfComparable>) (Collection) coll);
return null;
}

View File

@@ -2,6 +2,6 @@ class C<T> {
<T> T foo (C<? extends T> c) {return null;}
void bar (C<? extends String> c) {
<ref>foo(c);
<caret>foo(c);
}
}

View File

@@ -20,6 +20,6 @@ public class Bazz {
}
public static void failure(final Collection<FooImpl> foos) {
<ref>getElements(foos);
<caret>getElements(foos);
}
}

View File

@@ -9,7 +9,7 @@ class X {
{
Y<Long> y1 = null;
X.<ref>x(y1);
X.<caret>x(y1);
}
}
}

View File

@@ -9,7 +9,7 @@ class X {
{
Y<Long[]> y1 = null;
X.<ref>x(y1);
X.<caret>x(y1);
}
}
}

View File

@@ -9,7 +9,7 @@ class X {
{
Y<Y<Long>> y1 = null;
X.<ref>x(y1);
X.<caret>x(y1);
}
}
}

View File

@@ -6,7 +6,7 @@ class CaptureTest <T> {
private List<? extends List<T>> listOfSets;
private void foo() {
<ref>doGenericThing(listOfSets.get());
<caret>doGenericThing(listOfSets.get());
}
public <U> List<U> doGenericThing(List<U> set) {

View File

@@ -6,7 +6,7 @@ public class Test1 {
public static void main(String[] args){
new A(){
protected void foo(){
super.<ref>foo();
super.<caret>foo();
}
};
}

View File

@@ -1,6 +1,6 @@
class Array{
void foo(){
int[] array;
array.<ref>clone();
array.<caret>clone();
}
}

View File

@@ -2,7 +2,7 @@
public class Bug7968 {
public static void foo (String s, String s1, String s2, Object[] oa)
{
Bar.<ref>bar (s, s1, s2, oa);
Bar.<caret>bar (s, s1, s2, oa);
}
class Bar
{

View File

@@ -10,7 +10,7 @@ class Z{
Object clone() {
C c = new C();
((A) c).clone();
((B) c).<ref>clone();
((B) c).<caret>clone();
return c.clone();
}
}

View File

@@ -17,7 +17,7 @@ public class Cycle1{
void foo(int ggg){}
void foo1(){
<ref>foo();
<caret>foo();
}
}
}

View File

@@ -1,5 +1,5 @@
class A{
A(){
<ref>super();
<caret>super();
}
}

View File

@@ -1,6 +1,6 @@
abstract public class YYY implements I,II{
private void f(YYY y) {
II i = y.<ref>foo();
II i = y.<caret>foo();
}
}
interface I {

View File

@@ -1,5 +1,5 @@
class A{
{
"aaa".<ref>indexOf('a');
"aaa".<caret>indexOf('a');
}
}

View File

@@ -5,7 +5,7 @@ public class Inner1 {
private class A extends B{
{
int j = <ref>a();
int j = <caret>a();
}
}
}

View File

@@ -12,6 +12,6 @@ class B extends A{
class Super1 extends B{
{
super.<ref>askdh();
super.<caret>askdh();
}
}

View File

@@ -5,7 +5,7 @@ public class InnerClass {
void foo(int i) {}
void bar() {
<ref>foo();
<caret>foo();
}
}

View File

@@ -7,6 +7,6 @@ class A{
void foo(B b){}
}
{
new C().<ref>foo(new C())
new C().<caret>foo(new C())
}
}

View File

@@ -2,7 +2,7 @@ class Test{
{
new Runnable(){
{
<ref>run();
<caret>run();
}
}
}

View File

@@ -14,7 +14,7 @@ interface VeryNamed extends NN, N2, N3, N1 {}
class MyClass {
void foo(VeryNamed f) {
f.getNa<ref>me();
f.getNa<caret>me();
}
}

View File

@@ -3,7 +3,7 @@ class A{
}
void foo(){
<ref>foo("aaa", true);
<caret>foo("aaa", true);
}
void foo(String a, boolean b){

View File

@@ -12,6 +12,6 @@ class A {
class C extends A {
{
b1.<ref>f();
b1.<caret>f();
}
}

View File

@@ -6,6 +6,6 @@ interface PublicCloneable {
interface Extension extends Serializable, PublicCloneable {}
class Test {
void foo(Extension bar) {
bar.<ref>clone();
bar.<caret>clone();
}
}

View File

@@ -1,7 +1,7 @@
class A{
public abstract class IntegerPredicateBase implements Predicate{
public boolean applies(Object obj){
return <ref>applies((Integer)obj);
return <caret>applies((Integer)obj);
}
}
public interface Predicate{

View File

@@ -5,6 +5,6 @@ class A{
class B{
{
new A().<ref>foo("a");
new A().<caret>foo("a");
}
}

View File

@@ -3,7 +3,7 @@ class Outer {
static class Inner extends Outer {
void bar() {
<ref>foo();
<caret>foo();
}
}

View File

@@ -3,7 +3,7 @@ class Outer {
class Inner extends Outer {
void bar() {
<ref>foo();
<caret>foo();
}
}

View File

@@ -5,6 +5,6 @@ class Xc extends JComponent {
JComponent component;
protected void paintComponent(final Graphics g) {
component.<ref>paintComponent(g);
component.<caret>paintComponent(g);
}
}

View File

@@ -9,6 +9,6 @@ public class Remove1{
}
public static void main(){
new A().<ref>foo("aaa");
new A().<caret>foo("aaa");
}
}

View File

@@ -2,6 +2,6 @@ import java.util.ArrayList;
public class Remove2{
private static ArrayList lst = new ArrayList();
public static void main(){
lst.<ref>remove("aaa");
lst.<caret>remove("aaa");
}
}

View File

@@ -6,6 +6,6 @@ public class Remove3{
THashMap map = new THashMap();
void foo(){
map.<ref>size();
map.<caret>size();
}
}

View File

@@ -1,4 +0,0 @@
package ;
public class Remove4 {
}

View File

@@ -6,6 +6,6 @@ interface I {
abstract class C implements I {
public boolean foo(Object obj) {
return <ref>foo((Integer)obj);
return <caret>foo((Integer)obj);
}
}

View File

@@ -22,6 +22,6 @@ class Server {
class Client {
{
Derived arg = null;
Server.<ref>sub(arg, arg);
Server.<caret>sub(arg, arg);
}
}

View File

@@ -3,6 +3,6 @@ class A{
String toHex(short i) {}
void f(){
<ref>toHex('i');
<caret>toHex('i');
}
}

View File

@@ -4,6 +4,6 @@ public class Simple {
static {
Simple a = new Simple();
a.<ref>method("blah");
a.<caret>method("blah");
}
}

View File

@@ -1,5 +1,5 @@
class Sout {
static {
System.out.<ref>println();
System.out.<caret>println();
}
}

View File

@@ -6,6 +6,6 @@
class A{
{
Foo.<ref>foo();
Foo.<caret>foo();
}
}

View File

@@ -5,6 +5,6 @@ class A{
class Super1 extends A{
{
super.<ref>askdh();
super.<caret>askdh();
}
}

View File

@@ -10,6 +10,6 @@ class CBase implements I {
class C extends CBase implements J {
{
super.<ref>clone();
super.<caret>clone();
}
}

View File

@@ -8,6 +8,6 @@ public class TestOverloading1 {
}
{
new B().<ref>foo(1);
new B().<caret>foo(1);
}
}

View File

@@ -1,5 +1,5 @@
class A{
void foo() throws Exception{
throw <ref>Exception();
throw <caret>Exception();
}
}

View File

@@ -1,5 +1,5 @@
class A{
void foo() throws Exception{
throw <ref>Exception();
throw <caret>Exception();
}
}

View File

@@ -1,5 +1,5 @@
class A{
void foo(){
String.<ref>valueOf(1);
String.<caret>valueOf(1);
}
}

View File

@@ -4,6 +4,6 @@ public class Ambiguous {
void g(Integer i)
{
<ref>f(1, i);
<caret>f(1, i);
}
}

View File

@@ -5,7 +5,7 @@ public class Foo {
{
<ref>foo(1L);
<caret>foo(1L);
}
}

View File

@@ -4,6 +4,6 @@ class Foo {
}
static {
Foo f = <String>new <ref>Foo();
Foo f = <String>new <caret>Foo();
}
}

View File

@@ -15,6 +15,6 @@ class C {
};
B[] bar() {
return x.f<ref>oo();
return x.f<caret>oo();
}
}

View File

@@ -8,6 +8,6 @@ interface B extends E,F { }
class User {
void x(B a) {
String o = a.<ref>o();
String o = a.<caret>o();
}
}

Some files were not shown because too many files have changed in this diff Show More