diff options
Diffstat (limited to 'java/java-tests')
167 files changed, 823 insertions, 180 deletions
diff --git a/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation.java b/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation.java new file mode 100644 index 000000000000..60897adf5440 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation.java @@ -0,0 +1,5 @@ +public class Test { + private String s + + @Deprecated private String foo; +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation_after.java b/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation_after.java new file mode 100644 index 000000000000..904bae91fca0 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation_after.java @@ -0,0 +1,5 @@ +public class Test { + private String s;<caret> + + @Deprecated private String foo; +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation.java b/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation.java new file mode 100644 index 000000000000..af7100e9182b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation.java @@ -0,0 +1,5 @@ +public class Test { + private String s() + + @Deprecated private String foo; +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation_after.java b/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation_after.java new file mode 100644 index 000000000000..6abd1bbfeee7 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation_after.java @@ -0,0 +1,7 @@ +public class Test { + private String s() { + <caret> + } + + @Deprecated private String foo; +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/keywords/instanceofAfterUnresolved.java b/java/java-tests/testData/codeInsight/completion/keywords/instanceofAfterUnresolved.java new file mode 100644 index 000000000000..a29b65cc27de --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/keywords/instanceofAfterUnresolved.java @@ -0,0 +1,7 @@ +class Foo { + void test() { + if (o <caret>) { + + } + } +} diff --git a/java/java-tests/testData/codeInsight/completion/keywords/noFinalAfterTryBody.java b/java/java-tests/testData/codeInsight/completion/keywords/noFinalAfterTryBody.java new file mode 100644 index 000000000000..703c79c52884 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/keywords/noFinalAfterTryBody.java @@ -0,0 +1,8 @@ +public class Util { + void foo() { + try { + + } + <caret> + } +} diff --git a/java/java-tests/testData/codeInsight/completion/normal/AnonymousProcess_after.java b/java/java-tests/testData/codeInsight/completion/normal/AnonymousProcess_after.java index b532bc1ff2cc..0a23829bb222 100644 --- a/java/java-tests/testData/codeInsight/completion/normal/AnonymousProcess_after.java +++ b/java/java-tests/testData/codeInsight/completion/normal/AnonymousProcess_after.java @@ -6,7 +6,7 @@ public class Runner { List<Process> dest = ListUtils.filter(src, new Pred<Process>() { @Override public boolean predicate(Process elem) { - <selection><caret>return false; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection><caret>return false;</selection> } }); } diff --git a/java/java-tests/testData/codeInsight/completion/normal/ClassNameAnonymous_after.java b/java/java-tests/testData/codeInsight/completion/normal/ClassNameAnonymous_after.java index 47114349916a..3b364480ad60 100644 --- a/java/java-tests/testData/codeInsight/completion/normal/ClassNameAnonymous_after.java +++ b/java/java-tests/testData/codeInsight/completion/normal/ClassNameAnonymous_after.java @@ -3,7 +3,6 @@ class Foo { Zzoo l = new Zzoo() { @Override public void run() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } } diff --git a/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInner_after.java b/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInner_after.java index 1170812a5513..4f77648a4cb5 100644 --- a/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInner_after.java +++ b/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInner_after.java @@ -3,7 +3,6 @@ class Foo { Zzoo l = new Zzoo() { @Override public void run() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } } diff --git a/java/java-tests/testData/codeInsight/completion/normal/ImplementViaCompletion_after.java b/java/java-tests/testData/codeInsight/completion/normal/ImplementViaCompletion_after.java index a13b20e89807..c8e336a29bc3 100644 --- a/java/java-tests/testData/codeInsight/completion/normal/ImplementViaCompletion_after.java +++ b/java/java-tests/testData/codeInsight/completion/normal/ImplementViaCompletion_after.java @@ -5,6 +5,5 @@ interface Foo<T> { public class A implements Foo<String> { @Override public void run(String s, int myInt) { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } diff --git a/java/java-tests/testData/codeInsight/completion/normalSorting/PreferFinallyToFinal.java b/java/java-tests/testData/codeInsight/completion/normalSorting/PreferFinallyToFinal.java index b7e11a45313d..7b4958969e48 100644 --- a/java/java-tests/testData/codeInsight/completion/normalSorting/PreferFinallyToFinal.java +++ b/java/java-tests/testData/codeInsight/completion/normalSorting/PreferFinallyToFinal.java @@ -1,6 +1,6 @@ class A { { - try {} + try {} catch (Exception e) {} fin<caret>x } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/smartType/AnonymousNoPairBracket-out.java b/java/java-tests/testData/codeInsight/completion/smartType/AnonymousNoPairBracket-out.java index 20da698d9eaa..7271ebe2f368 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/AnonymousNoPairBracket-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/AnonymousNoPairBracket-out.java @@ -3,7 +3,6 @@ public class Bar { new Thread(new Runnable() { @Override public void run() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }) } diff --git a/java/java-tests/testData/codeInsight/completion/smartType/DiamondNotCollapsedInCaseOfAnonymousClasses-out.java b/java/java-tests/testData/codeInsight/completion/smartType/DiamondNotCollapsedInCaseOfAnonymousClasses-out.java index 0b2d9e76e1c3..75920b24bebf 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/DiamondNotCollapsedInCaseOfAnonymousClasses-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/DiamondNotCollapsedInCaseOfAnonymousClasses-out.java @@ -3,27 +3,27 @@ class MyClass { MyDD<String> d = new MyDD<String>() { @Override public int hashCode() { - <selection>return super.hashCode(); //To change body of overridden methods use File | Settings | File Templates.</selection> + <selection>return super.hashCode();</selection> } @Override public boolean equals(Object obj) { - return super.equals(obj); //To change body of overridden methods use File | Settings | File Templates. + return super.equals(obj); } @Override protected Object clone() throws CloneNotSupportedException { - return super.clone(); //To change body of overridden methods use File | Settings | File Templates. + return super.clone(); } @Override public String toString() { - return super.toString(); //To change body of overridden methods use File | Settings | File Templates. + return super.toString(); } @Override protected void finalize() throws Throwable { - super.finalize(); //To change body of overridden methods use File | Settings | File Templates. + super.finalize(); } }; } diff --git a/java/java-tests/testData/codeInsight/completion/smartType/IfConditionExpectedType-out.java b/java/java-tests/testData/codeInsight/completion/smartType/IfConditionExpectedType-out.java index c8c1ad66e119..03681f3b8617 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/IfConditionExpectedType-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/IfConditionExpectedType-out.java @@ -12,7 +12,7 @@ public class Zoo2 { if (run(new Computable<Boolean>() { @Override public Boolean compute() { - <selection>return null; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } })) } diff --git a/java/java-tests/testData/codeInsight/completion/smartType/IgnoreDefaultMethods-out.java b/java/java-tests/testData/codeInsight/completion/smartType/IgnoreDefaultMethods-out.java index f6b90f287be6..6a07021a5c75 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/IgnoreDefaultMethods-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/IgnoreDefaultMethods-out.java @@ -11,7 +11,7 @@ public class Test1 { Predicate p = new Predicate() { @Override public boolean test(Object o) { - <selection>return false; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return false;</selection> } }; } diff --git a/java/java-tests/testData/codeInsight/completion/smartType/InsertOverride-out.java b/java/java-tests/testData/codeInsight/completion/smartType/InsertOverride-out.java index bd86c539af73..d8946b14a664 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/InsertOverride-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/InsertOverride-out.java @@ -3,7 +3,6 @@ class C { Runnable r = new Runnable() { @Override public void run() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }; } diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractClassWithConstructorArgs-out.java b/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractClassWithConstructorArgs-out.java index 28ffcacc0105..4f5e39715b8c 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractClassWithConstructorArgs-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractClassWithConstructorArgs-out.java @@ -4,7 +4,6 @@ public class Main { Bar b = new Bar() { @Override void update() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }; } diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractInsideAnonymous-out.java b/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractInsideAnonymous-out.java index 3c290421b29b..f9d65197a509 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractInsideAnonymous-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractInsideAnonymous-out.java @@ -6,7 +6,6 @@ public class Foo { Goo<String> g = new Goo<String>() { @Override void foo() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }; } diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NewAnonymousFunction-out.java b/java/java-tests/testData/codeInsight/completion/smartType/NewAnonymousFunction-out.java index 3a4d6fb06f81..78916255ed3a 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/NewAnonymousFunction-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/NewAnonymousFunction-out.java @@ -3,27 +3,27 @@ class A { private static final Function<String, String> a = new Function<String, String>() { @Override public int hashCode() { - <selection>return super.hashCode(); //To change body of overridden methods use File | Settings | File Templates.</selection> + <selection>return super.hashCode();</selection> } @Override public boolean equals(Object obj) { - return super.equals(obj); //To change body of overridden methods use File | Settings | File Templates. + return super.equals(obj); } @Override protected Object clone() throws CloneNotSupportedException { - return super.clone(); //To change body of overridden methods use File | Settings | File Templates. + return super.clone(); } @Override public String toString() { - return super.toString(); //To change body of overridden methods use File | Settings | File Templates. + return super.toString(); } @Override protected void finalize() throws Throwable { - super.finalize(); //To change body of overridden methods use File | Settings | File Templates. + super.finalize(); } }; }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NoWrongSubstitutorFromStats-out.java b/java/java-tests/testData/codeInsight/completion/smartType/NoWrongSubstitutorFromStats-out.java index 4f68901ba4b6..65456174e901 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/NoWrongSubstitutorFromStats-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/NoWrongSubstitutorFromStats-out.java @@ -9,7 +9,7 @@ public class Foo { Collections.sort(myList, new Comparator<String>() { @Override public int compare(String o1, String o2) { - <selection>return 0; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return 0;</selection> } }); } diff --git a/java/java-tests/testData/codeInsight/completion/smartType/WrongAnonymous-out.java b/java/java-tests/testData/codeInsight/completion/smartType/WrongAnonymous-out.java index 127e4f74f414..6ee4ff843631 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/WrongAnonymous-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/WrongAnonymous-out.java @@ -7,7 +7,7 @@ class Intermediate { new File(".").listFiles(new FilenameFilter() { @Override public boolean accept(File dir, String name) { - <selection>return false; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return false;</selection> } }) SwingUtilities.invokeLater(new Runnable() { diff --git a/java/java-tests/testData/codeInsight/completion/style/AfterNew15-out.java b/java/java-tests/testData/codeInsight/completion/style/AfterNew15-out.java index 6d43d5e3aa6e..bcf00264728a 100644 --- a/java/java-tests/testData/codeInsight/completion/style/AfterNew15-out.java +++ b/java/java-tests/testData/codeInsight/completion/style/AfterNew15-out.java @@ -5,7 +5,7 @@ class A { { new java.io.File("aaa").list(new FilenameFilter() { public boolean accept(File dir, String name) { - <selection>return false; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return false;</selection> } }); } diff --git a/java/java-tests/testData/codeInsight/createSubclass/innerClassImplement/after/Test.java b/java/java-tests/testData/codeInsight/createSubclass/innerClassImplement/after/Test.java index 2f916af27455..4e97010530e8 100644 --- a/java/java-tests/testData/codeInsight/createSubclass/innerClassImplement/after/Test.java +++ b/java/java-tests/testData/codeInsight/createSubclass/innerClassImplement/after/Test.java @@ -11,7 +11,6 @@ public class Test { @Override void bar() { - //To change body of implemented methods use File | Settings | File Templates. } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NewExpressionClass.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NewExpressionClass.java new file mode 100644 index 000000000000..4cfc983f39eb --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/NewExpressionClass.java @@ -0,0 +1,8 @@ +class Test { + void foo(Object obj) { + new <error descr="Cannot find symbol obj">obj</error>(); + new <error descr="Cannot find symbol java">java</error>(); + new java.lang.Object(); + new Object(); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureTopLevelWildcardsForConditionalExpression.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureTopLevelWildcardsForConditionalExpression.java new file mode 100644 index 000000000000..83bc7f60d7ac --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureTopLevelWildcardsForConditionalExpression.java @@ -0,0 +1,6 @@ +import java.util.*; +class Bug { + void foo(Double d) { + <error descr="Incompatible types. Found: 'java.util.List<java.lang.Class<capture<? extends java.lang.Object>>>', required: 'java.util.List<java.lang.Class<?>>'">List<Class<?>> list = Arrays.asList(d == null ? Object.class : d.getClass());</error> + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/GenericsOverrideMethodInRawInheritor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/GenericsOverrideMethodInRawInheritor.java new file mode 100644 index 000000000000..0e33486407e5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/GenericsOverrideMethodInRawInheritor.java @@ -0,0 +1,9 @@ +import java.util.List; + +<error descr="'method(List<String>)' in 'Implementation' clashes with 'method(List<String>)' in 'IfcWithGenericMethod'; both methods have same erasure, yet neither overrides the other">class Implementation implements IfcWithGenericMethod</error> { + public void method(final List<String> strings) {} +} + +interface IfcWithGenericMethod<T> { + void method(List<String> strings); +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57877.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57877.java new file mode 100644 index 000000000000..2639d324fccd --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57877.java @@ -0,0 +1,8 @@ +import java.util.*; + +class Test { + { + Object obj = new Object(); + <error descr="Incompatible types. Found: 'java.util.Set<java.lang.Class<capture<? extends java.lang.Object>>>', required: 'java.util.Set<java.lang.Class<?>>'">Set<Class<?>> types = Collections.singleton(obj.getClass());</error> + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/SelectFromTypeParameter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/SelectFromTypeParameter.java new file mode 100644 index 000000000000..dc8f66f9f3d5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/SelectFromTypeParameter.java @@ -0,0 +1,16 @@ +import java.util.List; +interface Builder<T> { + T build(); +} + +interface Test<D extends Test<D, X>, X> { + static interface TestBuilder<D extends Test<D, X>, X> extends Builder<D> {} +} + +interface Algorithm<T, B extends Builder<T>> {} + +class SelectFromVariableType<X, T extends Test<T, X>> + implements Algorithm<T,<error descr="Cannot select from a type parameter">T</error>.TestBuilder<T, X>> { + List<<error descr="Cannot select from a type parameter">T</error>.TestBuilder<T, X>> b; + <error descr="Cannot select from a type parameter">T</error>.TestBuilder<T, X> b1; +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsGivenOnRawType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsGivenOnRawType.java index 147fd862fe77..09ff35bad8d4 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsGivenOnRawType.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsGivenOnRawType.java @@ -1,3 +1,4 @@ +import java.util.List; class A<D> { abstract class C<S> { <T extends A> void foo(T.C<Integer> x) { @@ -28,4 +29,21 @@ class A1 { abstract S bar(); } -}
\ No newline at end of file +} + +interface Builder<T> { + T build(); +} + +interface Test<D extends Test<D, X>, X> { + static interface TestBuilder<D extends Test<D, X>, X> extends Builder<D> {} +} + +interface Algorithm<T, B extends Builder<T>> {} + +class SelectFromVariableType<X, T extends Test<T, X>> + implements Algorithm<T, <error descr="Cannot select from a type parameter">T</error>.TestBuilder<T, X>> { + + List<T.TestBuilder<T, X>> b; + T.TestBuilder<T, X> b1; +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeParamsCyclicInference.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeParamsCyclicInference.java new file mode 100644 index 000000000000..996077e03715 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeParamsCyclicInference.java @@ -0,0 +1,2 @@ +class Test<<error descr="Cyclic inheritance involving 'T'"></error>T extends T> {} +class Test1<<error descr="Cyclic inheritance involving 'T'"></error>T extends S, S extends T> {}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ConditionalExpr.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ConditionalExpr.java index e44f0de64815..f2b44b8ae915 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ConditionalExpr.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ConditionalExpr.java @@ -31,7 +31,7 @@ class Test { I i4 = flag ? (() -> 42) : new I() { @Override public int m() { - return 0; //To change body of implemented methods use File | Settings | File Templates. + return 0; } }; } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after1.java index ef8e0d3eebf3..3268af85e6b5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after1.java @@ -7,7 +7,7 @@ class a { g(); } catch (Error e) { } catch (Exception e) { - <caret><selection>e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <caret><selection>e.printStackTrace();</selection> } } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after3.java index 108453b6b1f3..87ab38b6deb3 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after3.java @@ -10,7 +10,7 @@ class a { g(); // comment after } catch (Exception e) { - <caret><selection>e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <caret><selection>e.printStackTrace();</selection> } } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after4.java index f5864c4c9ed6..6236317f61bb 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after4.java @@ -10,7 +10,7 @@ class Test { foo(); } catch (MyException1 e) { } catch (MyException2 myException2) { - <caret><selection>myException2.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <caret><selection>myException2.printStackTrace();</selection> } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after5.java index 359aa1ce5994..9c6a55dc4aaf 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after5.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after5.java @@ -9,7 +9,7 @@ class Test { void m() { try (MyResource r = new MyResource()) { } catch (IOException e) { - <selection>e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <selection>e.printStackTrace();</selection> } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after6.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after6.java index 7a4a8ad18e05..6aed7f9fd571 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after6.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after6.java @@ -13,7 +13,7 @@ class Test { r.doSomething(); } catch (E1 ignore) { } catch (E2 e2) { - <selection>e2.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <selection>e2.printStackTrace();</selection> } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after7.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after7.java index c28baa610c88..1f2be7703875 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after7.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after7.java @@ -11,9 +11,9 @@ class Test { void m() { try (MyResource r = new MyResource()) { } catch (E2 e2) { - <selection>e2.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <selection>e2.printStackTrace();</selection> } catch (E1 e1) { - e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + e1.printStackTrace(); } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterHierarchy.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterHierarchy.java index 2c0d63e8cb14..a1a6f464e26b 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterHierarchy.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterHierarchy.java @@ -12,9 +12,9 @@ class CatchExceptions { try { foo(); } catch (FileNotFoundException e) { - <selection>e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <selection>e.printStackTrace();</selection> } catch (IOException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + e.printStackTrace(); } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after1.java index 5bbdb484f3c6..b70f0cca2364 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after1.java @@ -1,7 +1,7 @@ // "Add Method Body" "true" class a { void f() { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after2.java index 844bc3b1b2ba..7dbf85cc74a5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after2.java @@ -1,7 +1,7 @@ // "Add Method Body" "true" class a { String f() { - <caret><selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after3.java index 6cd2bdc785c6..f45a46cb8441 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after3.java @@ -1,7 +1,7 @@ // "Add Method Body" "true" class a { a() { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection></selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after4.java index 844bc3b1b2ba..7dbf85cc74a5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addMethodBody/after4.java @@ -1,7 +1,7 @@ // "Add Method Body" "true" class a { String f() { - <caret><selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/afterWildcards.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/afterWildcards.java new file mode 100644 index 000000000000..c9098aba06cd --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/afterWildcards.java @@ -0,0 +1,18 @@ +// "Add explicit type arguments" "true" +class X<A1, A2, R> { } + +class D<R> { + public <A1, A2> X<A1, A2, R> f() { + return null; + } +} + +class Z { + public void f() { + g(new D<Void>().<String, Integer>f()); + } + + public void g(X<String, ? super Integer, Void> x) { + + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/beforeWildcards.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/beforeWildcards.java new file mode 100644 index 000000000000..93a567496bad --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/beforeWildcards.java @@ -0,0 +1,18 @@ +// "Add explicit type arguments" "true" +class X<A1, A2, R> { } + +class D<R> { + public <A1, A2> X<A1, A2, R> f() { + return null; + } +} + +class Z { + public void f() { + g(new D<Void>().<caret>f()); + } + + public void g(X<String, ? super Integer, Void> x) { + + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterClassObjectAccess.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterClassObjectAccess.java index 8a87bb59d6dd..8754508527e0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterClassObjectAccess.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterClassObjectAccess.java @@ -2,7 +2,7 @@ class Test { { ((Runnable) () -> { - //To change body of implemented methods use File | Settings | File Templates. + }).getClass();; } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassObjectAccess.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassObjectAccess.java index 2df1edd648b5..6154328509eb 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassObjectAccess.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassObjectAccess.java @@ -4,7 +4,7 @@ class Test { new Ru<caret>nnable() { @Override public void run() { - //To change body of implemented methods use File | Settings | File Templates. + } }.getClass();; } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeFormalTypes.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeFormalTypes.java index 2b28afb7b3db..5b3a5fc6b563 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeFormalTypes.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeFormalTypes.java @@ -12,7 +12,7 @@ class Test2 { bar(new I<Stri<caret>ng>() { @Override public String foo(List<String> list) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } }); } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java index 6e5703a6c994..9caf9c84fbad 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java @@ -5,7 +5,6 @@ class a implements Runnable { } public void run() { - <caret><selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java index 56daa74aaf43..a0f5015d8ead 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java @@ -5,7 +5,6 @@ class a implements b<String> { } public void g(b<String> t) { - <caret><selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } interface b<T> { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after1.java index 33eebd0b9456..1a68d8a4f9ea 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after1.java @@ -10,6 +10,6 @@ class MyCollection { } public MyCollection(int i) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after2.java index eef213bd9677..7157c8211c89 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after2.java @@ -7,6 +7,6 @@ public class Test { class MyCollection { public MyCollection(Test test) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after3.java index e3622db70d72..6257e2284940 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/after3.java @@ -9,7 +9,7 @@ class Outer { class CreateConstructorFromUsage { public CreateConstructorFromUsage(String parameter) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterAnon.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterAnon.java index 709c0645ae5b..5da910d94105 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterAnon.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterAnon.java @@ -7,7 +7,7 @@ class Test { class Inner { public Inner(String a) { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection></selection> } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterDefaultSuperConstructor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterDefaultSuperConstructor.java index b7ad0c94e199..58522a9c105f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterDefaultSuperConstructor.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterDefaultSuperConstructor.java @@ -2,7 +2,7 @@ class Test extends A{ public Test(String a) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } public void t() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterDisjunction.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterDisjunction.java index e6d5a0662897..2cd83dcca6d5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterDisjunction.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterDisjunction.java @@ -15,7 +15,7 @@ class Test { class A { public A(Exception e) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } } class Ex1 extends Exception {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterImplicitSuperConstructor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterImplicitSuperConstructor.java index 0293ed5758bd..646815ba6790 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterImplicitSuperConstructor.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterImplicitSuperConstructor.java @@ -2,7 +2,7 @@ class Test extends A{ public Test(String a) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } public void t() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterIncompleteEnum.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterIncompleteEnum.java index 0573407590a1..a0373dad907b 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterIncompleteEnum.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterIncompleteEnum.java @@ -3,6 +3,6 @@ public enum ReportType { AGING("Aging"); ReportType(String aging) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterIncompleteEnum1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterIncompleteEnum1.java index 7abef7964c58..8b47ac0bb541 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterIncompleteEnum1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterIncompleteEnum1.java @@ -3,6 +3,6 @@ public enum ReportType { AGING("Aging"),; ReportType(String aging) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterInsertSuper.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterInsertSuper.java index 52dca4122c8a..3aed02cd4492 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterInsertSuper.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterInsertSuper.java @@ -2,7 +2,7 @@ class Test extends A{ public Test(String a) { - <selection>super(a); //To change body of overridden methods use File | Settings | File Templates.</selection> + <selection>super(a);</selection> } public void t() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromSuper/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromSuper/after1.java index 0cf7fc49b0d6..3baf1da30695 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromSuper/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromSuper/after1.java @@ -1,7 +1,7 @@ // "Create Constructor In 'Base'" "true" class Base { public Base(int i, Object o) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after1.java index 8a94eda2675e..d1329e5abbe9 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after1.java @@ -5,6 +5,6 @@ public class Test { } private void test() { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after3.java index 8a94eda2675e..b846e181b008 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after3.java @@ -5,6 +5,6 @@ public class Test { } private void test() { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection></selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after4.java index 8a94eda2675e..b846e181b008 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after4.java @@ -5,6 +5,6 @@ public class Test { } private void test() { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection></selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after5.java index 16607155d34b..7f88868addb5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after5.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/after5.java @@ -6,6 +6,6 @@ public class Test { } private void test() { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection></selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterArrayTypeParam.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterArrayTypeParam.java index 6a48f2351929..8a30c1221cf2 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterArrayTypeParam.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterArrayTypeParam.java @@ -6,6 +6,6 @@ public class Test { } private void test(byte[] bytes) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterAssertDescription.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterAssertDescription.java index c6630d3af83b..15fc09f88184 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterAssertDescription.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterAssertDescription.java @@ -5,6 +5,6 @@ class A { } private String f() { - <selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterClassTypeParamNotAvailable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterClassTypeParamNotAvailable.java index 54129e4a2d60..8df75815e274 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterClassTypeParamNotAvailable.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterClassTypeParamNotAvailable.java @@ -19,7 +19,7 @@ class Sup<T> extends Base<T> { } private static <T> Operator<T> makeOp(MetaOperator<T> mop) { - <selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterGenerics1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterGenerics1.java index ed3f5ed75de0..e061d7e89f72 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterGenerics1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterGenerics1.java @@ -5,6 +5,6 @@ public class Test { } private <T extends String> void bar(T t1, T t2) { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection></selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterIDEA2327.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterIDEA2327.java index 0500941b771e..02bdf6330166 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterIDEA2327.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterIDEA2327.java @@ -5,6 +5,6 @@ public class Test { } private boolean test() { - <caret><selection>return false; //To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection>return false;</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterIDEADEV6068.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterIDEADEV6068.java index 412f4f72d449..07976ed3a232 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterIDEADEV6068.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterIDEADEV6068.java @@ -8,6 +8,6 @@ class BrokenCreateMethod { } private Map<String, String[]> toMulti(Map<String, String> bar) { - <selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterLambdaArgument.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterLambdaArgument.java index 96744f43c5b1..3b4f2b76c337 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterLambdaArgument.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterLambdaArgument.java @@ -5,6 +5,6 @@ class A { } private void f(Object p0) { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection></selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodReferenceArgument.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodReferenceArgument.java index c5257c0cf338..3d0c8efd429e 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodReferenceArgument.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodReferenceArgument.java @@ -5,7 +5,7 @@ class A { } private void f(Object foo) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } static int foo() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamBecomeClassTypeParameter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamBecomeClassTypeParameter.java index 8bfbe6fcb9af..36a03f5fab27 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamBecomeClassTypeParameter.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamBecomeClassTypeParameter.java @@ -9,6 +9,6 @@ class T<R, D> { public R foo(Test test, D data) { - <selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamUsed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamUsed.java index f2437aef38fe..f0e201ff03dd 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamUsed.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamUsed.java @@ -5,7 +5,7 @@ class A { } private <T> B<T> f() { - <selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamUsed1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamUsed1.java index 155620535c71..5deaa579d5b3 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamUsed1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMethodTypeParamUsed1.java @@ -6,6 +6,6 @@ public class CreateMethodTest { } private <T> T f(T t) { - <selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMultipleTypes.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMultipleTypes.java index adbac37a0b03..bb5aedd02b3a 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMultipleTypes.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterMultipleTypes.java @@ -6,6 +6,6 @@ class A { } private String bar() { - <caret><selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection>return null;</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterNoQualification.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterNoQualification.java index 0f3e698ad712..26398c3262a5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterNoQualification.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterNoQualification.java @@ -15,6 +15,6 @@ class Bug { } private void run() { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterSCR6758.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterSCR6758.java index 785fac52e671..e34dcc294ca5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterSCR6758.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterSCR6758.java @@ -8,7 +8,7 @@ public class Test { } private boolean someMethod(Object o) { - <caret><selection>return false; //To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection>return false;</selection> } }; } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterSCR6826.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterSCR6826.java index 603006986104..b7d5f9317716 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterSCR6826.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterSCR6826.java @@ -10,6 +10,6 @@ class A { } class B { public static void f(Runnable runnable) { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection></selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterStaticMethodNotInInterface.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterStaticMethodNotInInterface.java index 16a4e13bf79e..af0ba17f5445 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterStaticMethodNotInInterface.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterStaticMethodNotInInterface.java @@ -6,6 +6,6 @@ class A implements I { } private static void f() { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterThisCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterThisCall.java index 750224836f10..a6563e8632cb 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterThisCall.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterThisCall.java @@ -5,7 +5,7 @@ public class A { } private static int f() { - <caret><selection>return 0; //To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection>return 0;</selection> } public A(int i) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after1.java index 0b54419284ca..4fee7bdbcbae 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after1.java @@ -1,7 +1,7 @@ // "Create Method 'get'" "true" class W<T> { public T get(T s) { - <selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after2.java index 163161258c36..cdfc6cc67e2e 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after2.java @@ -1,7 +1,7 @@ // "Create Method 'get'" "true" class Generic<T> { public T get() { - <caret><selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after3.java index 138b06a54542..b9df0d027454 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after3.java @@ -4,7 +4,7 @@ interface Int<T> { class A1<T> implements Int<T> { public void foo(Int<T> c) { - <caret><selection>//To change body of created methods use File | Settings | File Templates.</selection> + } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after4.java index dd4899a82635..92f0c2a9c68f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after4.java @@ -8,7 +8,7 @@ class R implements Comparable<R> { class A1<T> { public T foo() { - <caret><selection>return null; //To change body of created methods use File | Settings | File Templates.</selection> + <caret><selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after5.java index a5d70c584a24..bea91d8ee1ce 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after5.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage/after5.java @@ -3,7 +3,7 @@ public class Seq<T> { public Seq() {} public Seq(T x, Seq<T> xs) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + } static <T> Seq<T> nil () { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterLocalClass.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterLocalClass.java index 27a9470f21dd..f12e9cd32224 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterLocalClass.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterLocalClass.java @@ -29,7 +29,7 @@ public class IDEA100452 { static class MatchOp<H> { public MatchOp(int i, MatchKind matchKind, Supplier<BooleanTerminalSink<H>> s) { - //To change body of created methods use File | Settings | File Templates. + } static enum MatchKind {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeLocalClass.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeLocalClass.java index 9dfd3b42f1b3..5e46e4f8353b 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeLocalClass.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeLocalClass.java @@ -29,7 +29,7 @@ public class IDEA100452 { static class MatchOp<H> { public MatchOp(int i, MatchKind matchKind, Supplier<BooleanTerminalSink<H>> s) { - //To change body of created methods use File | Settings | File Templates. + } static enum MatchKind {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/makeTypeGeneric/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/makeTypeGeneric/after1.java index f3ede7a78d75..42db71f707e5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/makeTypeGeneric/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/makeTypeGeneric/after1.java @@ -4,7 +4,7 @@ class CCCC { private final static Comparator<String> <caret>TT = new Comparator<String>() { @Override public int compare(String o1, String o2) { - return 0; //To change body of implemented methods use File | Settings | File Templates. + return 0; } }; } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/makeTypeGeneric/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/makeTypeGeneric/before1.java index cc651ff9daa8..9dbf5c0cfbf7 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/makeTypeGeneric/before1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/makeTypeGeneric/before1.java @@ -4,7 +4,7 @@ class CCCC { private final static Comparator <caret>TT = new Comparator<String>() { @Override public int compare(String o1, String o2) { - return 0; //To change body of implemented methods use File | Settings | File Templates. + return 0; } }; } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveInitializerToConstructor/afterNoBody.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveInitializerToConstructor/afterNoBody.java index a85a0b23518a..d5a1c11695ea 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveInitializerToConstructor/afterNoBody.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveInitializerToConstructor/afterNoBody.java @@ -3,7 +3,6 @@ public class X { <caret>final int fi; public X(String s) { - //To change body of created methods use File | Settings | File Templates. fi = 0; } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java index c9dc72cd2243..2b5d7f27057c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java @@ -6,6 +6,5 @@ abstract class Test { class TImple extends Test { @Override void foo() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterProtectedMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterProtectedMethod.java index d5f20a3c5b26..d6f57afcba25 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterProtectedMethod.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterProtectedMethod.java @@ -6,6 +6,6 @@ class Test { class TImple extends Test { @Override protected void foo() { - <selection>super.foo(); //To change body of overridden methods use File | Settings | File Templates.</selection> + <selection>super.foo();</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java index f9ef728d7056..94c822617276 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java @@ -8,6 +8,5 @@ abstract class Test { class TImple extends Test { @Override public void foo(@Nullable String a) { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithTry/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithTry/after1.java index b4463038a988..633386100759 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithTry/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithTry/after1.java @@ -11,7 +11,7 @@ class C { try (MyResource r = new MyResource()) { } } catch (E1 e1) { - <selection>e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <selection>e1.printStackTrace();</selection> } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithTry/afterLambdaCodeBlock.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithTry/afterLambdaCodeBlock.java index 67eeb7469d52..7c7477598a1a 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithTry/afterLambdaCodeBlock.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithTry/afterLambdaCodeBlock.java @@ -9,7 +9,7 @@ public class ExTest { try { return ExTest.maybeThrow(t); } catch (Ex ex) { - <selection>ex.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <selection>ex.printStackTrace();</selection> } }; } diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java/CommentAsFirstTryCatchFinallySurroundStatement_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java/CommentAsFirstTryCatchFinallySurroundStatement_after.java index 098d0865f0aa..eedceb5282eb 100644 --- a/java/java-tests/testData/codeInsight/generation/surroundWith/java/CommentAsFirstTryCatchFinallySurroundStatement_after.java +++ b/java/java-tests/testData/codeInsight/generation/surroundWith/java/CommentAsFirstTryCatchFinallySurroundStatement_after.java @@ -4,7 +4,7 @@ class Test { // This is comment" int i = 1; } catch (Exception e) { - <caret><selection>e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <caret><selection>e.printStackTrace();</selection> } finally { } } diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java/CommentAsFirstTryCatchSurroundStatement_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java/CommentAsFirstTryCatchSurroundStatement_after.java index 6506ce88c9dc..22a55e5ab270 100644 --- a/java/java-tests/testData/codeInsight/generation/surroundWith/java/CommentAsFirstTryCatchSurroundStatement_after.java +++ b/java/java-tests/testData/codeInsight/generation/surroundWith/java/CommentAsFirstTryCatchSurroundStatement_after.java @@ -4,7 +4,7 @@ class Test { // This is comment" int i = 1; } catch (Exception e) { - <caret><selection>e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.</selection> + <caret><selection>e.printStackTrace();</selection> } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/navigation/alexProject/test1/src/com/test/TestIImpl1.java b/java/java-tests/testData/codeInsight/navigation/alexProject/test1/src/com/test/TestIImpl1.java index d06b163e5806..a87d8bc69bca 100644 --- a/java/java-tests/testData/codeInsight/navigation/alexProject/test1/src/com/test/TestIImpl1.java +++ b/java/java-tests/testData/codeInsight/navigation/alexProject/test1/src/com/test/TestIImpl1.java @@ -9,6 +9,6 @@ package com.test; */ public class TestIImpl1 implements TestI { public void test() { - //To change body of implemented methods use File | Settings | File Templates. + } } diff --git a/java/java-tests/testData/codeInsight/navigation/alexProject/test1/src/com/test/TestIImpl2.java b/java/java-tests/testData/codeInsight/navigation/alexProject/test1/src/com/test/TestIImpl2.java index fd221c978f26..26a8595a1366 100644 --- a/java/java-tests/testData/codeInsight/navigation/alexProject/test1/src/com/test/TestIImpl2.java +++ b/java/java-tests/testData/codeInsight/navigation/alexProject/test1/src/com/test/TestIImpl2.java @@ -9,6 +9,6 @@ package com.test; */ public class TestIImpl2 implements TestI { public void test() { - //To change body of implemented methods use File | Settings | File Templates. + } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterAnnotation.java b/java/java-tests/testData/codeInsight/overrideImplement/afterAnnotation.java index 8016d8f8e61f..b62fb276e9bc 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterAnnotation.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterAnnotation.java @@ -3,10 +3,10 @@ } class d implements ff { public String f() { - <caret><selection>return null; //To change body of implemented methods use File | Settings | File Templates.</selection> + <caret><selection>return null;</selection> } public Class<? extends Annotation> annotationType() { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterClone.java b/java/java-tests/testData/codeInsight/overrideImplement/afterClone.java index 26dc3b01cd08..582f8e6bd3eb 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterClone.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterClone.java @@ -7,6 +7,6 @@ class Gen { class X2 extends Gen { @Override protected Gen clone() { - <caret><selection>return super.clone(); //To change body of overridden methods use File | Settings | File Templates.</selection> + <caret><selection>return super.clone();</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterDoNotImplementExtensionMethods.java b/java/java-tests/testData/codeInsight/overrideImplement/afterDoNotImplementExtensionMethods.java index 04dfc07497fe..d4c43d983e83 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterDoNotImplementExtensionMethods.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterDoNotImplementExtensionMethods.java @@ -10,6 +10,5 @@ interface B<T> extends A<T> { class MyClass<T> implements B<T> { @Override public void m2() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterEnumConstant.java b/java/java-tests/testData/codeInsight/overrideImplement/afterEnumConstant.java index 973f78f3db99..8efbedc9b649 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterEnumConstant.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterEnumConstant.java @@ -17,7 +17,6 @@ enum E{ E1 { @Override public void foo() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }; public abstract void foo(); diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterErasureWildcard.java b/java/java-tests/testData/codeInsight/overrideImplement/afterErasureWildcard.java index 4c7590955daa..ee49ba66fe5e 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterErasureWildcard.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterErasureWildcard.java @@ -4,6 +4,6 @@ interface Generic<T> { class II implements Generic<?> { public Object foo() { - <selection>return null; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterImplementExtensionMethods.java b/java/java-tests/testData/codeInsight/overrideImplement/afterImplementExtensionMethods.java index 6e86a4ed3d62..0d3c41282638 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterImplementExtensionMethods.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterImplementExtensionMethods.java @@ -5,6 +5,5 @@ interface A<T> { class MyClass<T> implements A<T> { @Override public void m(T t) { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterIncomplete.java b/java/java-tests/testData/codeInsight/overrideImplement/afterIncomplete.java index 2fa121138200..d80beeed94ab 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterIncomplete.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterIncomplete.java @@ -1,5 +1,4 @@ class S implements Runnable { public void run() { - <caret><selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterInterfaceAndAbstractClass.java b/java/java-tests/testData/codeInsight/overrideImplement/afterInterfaceAndAbstractClass.java index b90134bce991..2decb62470ab 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterInterfaceAndAbstractClass.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterInterfaceAndAbstractClass.java @@ -8,7 +8,7 @@ interface B { class C extends A implements B { public F foo() { - <selection>return null; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterLongFinalParameterList.java b/java/java-tests/testData/codeInsight/overrideImplement/afterLongFinalParameterList.java index 3b7a72724ab0..512e937bd8ec 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterLongFinalParameterList.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterLongFinalParameterList.java @@ -11,6 +11,5 @@ abstract class B implements A{ final String pppppppppppp6, final String pppppppppppp7, final String pppppppppppp8) { - <caret><selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterLongParameterList.java b/java/java-tests/testData/codeInsight/overrideImplement/afterLongParameterList.java index a7d899ac22d7..43775c74f60a 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterLongParameterList.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterLongParameterList.java @@ -10,6 +10,5 @@ abstract class B implements A{ String p5, String p6, String p7) { - <caret><selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterMultipleInterfaceInheritance.java b/java/java-tests/testData/codeInsight/overrideImplement/afterMultipleInterfaceInheritance.java index 2c49a914a7b0..509cae5ae801 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterMultipleInterfaceInheritance.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterMultipleInterfaceInheritance.java @@ -11,6 +11,6 @@ interface B class C implements A, B { public String foo() { - <selection>return null; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterOnTheLineWithExistingExpression.java b/java/java-tests/testData/codeInsight/overrideImplement/afterOnTheLineWithExistingExpression.java index 4a4e29890f1d..2685117823dc 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterOnTheLineWithExistingExpression.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterOnTheLineWithExistingExpression.java @@ -7,6 +7,6 @@ class Sub extends Base { @Override void foo() { - <caret><selection>super.foo(); //To change body of overridden methods use File | Settings | File Templates.</selection> + <caret><selection>super.foo();</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterOverrideExtensionMethods.java b/java/java-tests/testData/codeInsight/overrideImplement/afterOverrideExtensionMethods.java index c9cc68b01537..aaf31a506281 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterOverrideExtensionMethods.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterOverrideExtensionMethods.java @@ -5,35 +5,34 @@ interface A<T> { class MyClass<T> implements A<T> { @Override public void m(T t) { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } public MyClass() { - super(); //To change body of overridden methods use File | Settings | File Templates. + super(); } @Override public int hashCode() { - return super.hashCode(); //To change body of overridden methods use File | Settings | File Templates. + return super.hashCode(); } @Override public boolean equals(Object obj) { - return super.equals(obj); //To change body of overridden methods use File | Settings | File Templates. + return super.equals(obj); } @Override protected Object clone() throws CloneNotSupportedException { - return super.clone(); //To change body of overridden methods use File | Settings | File Templates. + return super.clone(); } @Override public String toString() { - return super.toString(); //To change body of overridden methods use File | Settings | File Templates. + return super.toString(); } @Override protected void finalize() throws Throwable { - super.finalize(); //To change body of overridden methods use File | Settings | File Templates. + super.finalize(); } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterRawSuper.java b/java/java-tests/testData/codeInsight/overrideImplement/afterRawSuper.java index 95912a1bd1da..fb2c61ed5e21 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterRawSuper.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterRawSuper.java @@ -20,6 +20,5 @@ interface A<T> { class B implements A { public void foo() { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterResolveTypeParamConflict.java b/java/java-tests/testData/codeInsight/overrideImplement/afterResolveTypeParamConflict.java index 17feef255048..ead6e41dbdc6 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterResolveTypeParamConflict.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterResolveTypeParamConflict.java @@ -5,6 +5,5 @@ abstract class A1<X>{ class B1<T> extends A1<T>{ @Override <T1> void foo(T1 t1, T t) { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterSimple.java b/java/java-tests/testData/codeInsight/overrideImplement/afterSimple.java index 304ee1017746..ded31aae63a4 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterSimple.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterSimple.java @@ -5,6 +5,6 @@ abstract class IX { class XXC extends IX { @Override void foo() { - <caret><selection>super.foo(); //To change body of overridden methods use File | Settings | File Templates.</selection> + <caret><selection>super.foo();</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterSimplifyObjectWildcard.java b/java/java-tests/testData/codeInsight/overrideImplement/afterSimplifyObjectWildcard.java index 0f09d8f63b3a..310c4f6eab74 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterSimplifyObjectWildcard.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterSimplifyObjectWildcard.java @@ -4,7 +4,7 @@ interface Generic<T> { class II implements Generic<Object> { public SomeGeneric<?> foo() { - <selection>return null; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterSubstituteBoundInMethodTypeParam.java b/java/java-tests/testData/codeInsight/overrideImplement/afterSubstituteBoundInMethodTypeParam.java index 47816c480dca..fa1102c946fe 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterSubstituteBoundInMethodTypeParam.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterSubstituteBoundInMethodTypeParam.java @@ -21,6 +21,5 @@ abstract class A<T> { @Override <S extends Throwable> void foo(S s) { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterSubstitutionInTypeParametersList.java b/java/java-tests/testData/codeInsight/overrideImplement/afterSubstitutionInTypeParametersList.java index 1cd672e15a67..ae7841a24ac2 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterSubstitutionInTypeParametersList.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterSubstitutionInTypeParametersList.java @@ -5,6 +5,5 @@ abstract class IX<T> { class XXC<S> extends IX<Throwable> { @Override <S extends Throwable> void foo() { - <caret><selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterTestMissed.java b/java/java-tests/testData/codeInsight/overrideImplement/afterTestMissed.java index e4fad9bee34d..d6b228578cc3 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterTestMissed.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterTestMissed.java @@ -6,6 +6,6 @@ class f{ class ff extends f { @Override String foo() { - <selection>return super.foo(); //To change body of overridden methods use File | Settings | File Templates.</selection> + <selection>return super.foo();</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterTypeParam.java b/java/java-tests/testData/codeInsight/overrideImplement/afterTypeParam.java index bcc6df490039..ff912509dd7b 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterTypeParam.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterTypeParam.java @@ -4,6 +4,5 @@ interface Function<S> { class Bar extends Function<String>{ public void fun(Function<String> function) { - <selection>//To change body of implemented methods use File | Settings | File Templates.</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterWildcard.java b/java/java-tests/testData/codeInsight/overrideImplement/afterWildcard.java index 9c398383c995..b641cf267481 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterWildcard.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterWildcard.java @@ -4,6 +4,6 @@ interface Function<S, R> { class Bar extends Function<String, ?>{ public Object fun(String s) { - <selection>return null; //To change body of implemented methods use File | Settings | File Templates.</selection> + <selection>return null;</selection> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/beforeAnnotation.java b/java/java-tests/testData/codeInsight/overrideImplement/beforeAnnotation.java index 83884ffad04b..6c811763dfd0 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/beforeAnnotation.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/beforeAnnotation.java @@ -4,6 +4,6 @@ class d implements ff { <caret> public Class<? extends Annotation> annotationType() { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } } diff --git a/java/java-tests/testData/codeInsight/template/FinishTemplateVariantWithDot-out.java b/java/java-tests/testData/codeInsight/template/FinishTemplateVariantWithDot-out.java new file mode 100644 index 000000000000..d89c60000cf6 --- /dev/null +++ b/java/java-tests/testData/codeInsight/template/FinishTemplateVariantWithDot-out.java @@ -0,0 +1,8 @@ +import java.io.File; + +class Foo { + { + File file = new File("some.txt"); + System.out.println("file = " + file.<caret>); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/template/FinishTemplateVariantWithDot.java b/java/java-tests/testData/codeInsight/template/FinishTemplateVariantWithDot.java new file mode 100644 index 000000000000..b0d2afc3e573 --- /dev/null +++ b/java/java-tests/testData/codeInsight/template/FinishTemplateVariantWithDot.java @@ -0,0 +1,8 @@ +import java.io.File; + +class Foo { + { + File file = new File("some.txt"); + <caret> + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/find/findInEditor/BasicFind.gold b/java/java-tests/testData/find/findInEditor/BasicFind.gold new file mode 100644 index 000000000000..14e4182499b7 --- /dev/null +++ b/java/java-tests/testData/find/findInEditor/BasicFind.gold @@ -0,0 +1,32 @@ +--- FIND MODEL --- +myStringToFind =a +myStringToReplace = +isReplaceState =false +isWholeWordsOnly =false +isInStringLiterals =false +isInComments =false +isFromCursor =true +isForward =true +isGlobal =true +isRegularExpressions =false +isCaseSensitive =false +isMultipleFiles =false +isPromptOnReplace =true +isReplaceAll =false +isOpenNewTab =false +isOpenInNewTabEnabled =false +isOpenNewTabVisible =false +isProjectScope =true +directoryName =null +isWithSubdirectories =true +fileFilter =null +moduleName =null +customScopeName =null + +-- + +[[<a>]]b +-- +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,java.awt.Color[r=255,g=255,b=0],0,BOXED,null,java.awt.Color[r=0,g=255,b=0]] +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,null,0,ROUNDED_BOX,java.awt.Color[r=0,g=0,b=0],null] +------------ diff --git a/java/java-tests/testData/find/findInEditor/EmacsLikeFallback.gold b/java/java-tests/testData/find/findInEditor/EmacsLikeFallback.gold new file mode 100644 index 000000000000..a2168ba66e2a --- /dev/null +++ b/java/java-tests/testData/find/findInEditor/EmacsLikeFallback.gold @@ -0,0 +1,101 @@ +--- FIND MODEL --- +myStringToFind =a +myStringToReplace = +isReplaceState =false +isWholeWordsOnly =false +isInStringLiterals =false +isInComments =false +isFromCursor =true +isForward =true +isGlobal =true +isRegularExpressions =false +isCaseSensitive =false +isMultipleFiles =false +isPromptOnReplace =true +isReplaceAll =false +isOpenNewTab =false +isOpenInNewTabEnabled =false +isOpenNewTabVisible =false +isProjectScope =true +directoryName =null +isWithSubdirectories =true +fileFilter =null +moduleName =null +customScopeName =null + +-- + +[[<a>]] +[a]b +-- +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,java.awt.Color[r=255,g=255,b=0],0,BOXED,null,java.awt.Color[r=0,g=255,b=0]] +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,null,0,ROUNDED_BOX,java.awt.Color[r=0,g=0,b=0],null] +RangeHighlighter: (2,3); layer:5999; tooltip: null : [null,java.awt.Color[r=255,g=255,b=0],0,BOXED,null,java.awt.Color[r=0,g=255,b=0]] +------------ +--- FIND MODEL --- +myStringToFind =ab +myStringToReplace = +isReplaceState =false +isWholeWordsOnly =false +isInStringLiterals =false +isInComments =false +isFromCursor =true +isForward =true +isGlobal =true +isRegularExpressions =false +isCaseSensitive =false +isMultipleFiles =false +isPromptOnReplace =true +isReplaceAll =false +isOpenNewTab =false +isOpenInNewTabEnabled =false +isOpenNewTabVisible =false +isProjectScope =true +directoryName =null +isWithSubdirectories =true +fileFilter =null +moduleName =null +customScopeName =null + +-- + +a +[[<ab>]] +-- +RangeHighlighter: (2,4); layer:5999; tooltip: null : [null,java.awt.Color[r=255,g=255,b=0],0,BOXED,null,java.awt.Color[r=0,g=255,b=0]] +RangeHighlighter: (2,4); layer:5999; tooltip: null : [null,null,0,ROUNDED_BOX,java.awt.Color[r=0,g=0,b=0],null] +------------ +--- FIND MODEL --- +myStringToFind =a +myStringToReplace = +isReplaceState =false +isWholeWordsOnly =false +isInStringLiterals =false +isInComments =false +isFromCursor =true +isForward =true +isGlobal =true +isRegularExpressions =false +isCaseSensitive =false +isMultipleFiles =false +isPromptOnReplace =true +isReplaceAll =false +isOpenNewTab =false +isOpenInNewTabEnabled =false +isOpenNewTabVisible =false +isProjectScope =true +directoryName =null +isWithSubdirectories =true +fileFilter =null +moduleName =null +customScopeName =null + +-- + +[[<a>]] +[a]b +-- +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,java.awt.Color[r=255,g=255,b=0],0,BOXED,null,java.awt.Color[r=0,g=255,b=0]] +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,null,0,ROUNDED_BOX,java.awt.Color[r=0,g=0,b=0],null] +RangeHighlighter: (2,3); layer:5999; tooltip: null : [null,java.awt.Color[r=255,g=255,b=0],0,BOXED,null,java.awt.Color[r=0,g=255,b=0]] +------------ diff --git a/java/java-tests/testData/find/findInEditor/ReplacementWithEmptyString.gold b/java/java-tests/testData/find/findInEditor/ReplacementWithEmptyString.gold new file mode 100644 index 000000000000..478eb649684d --- /dev/null +++ b/java/java-tests/testData/find/findInEditor/ReplacementWithEmptyString.gold @@ -0,0 +1,128 @@ +--- FIND MODEL --- +myStringToFind = +myStringToReplace = +isReplaceState =false +isWholeWordsOnly =false +isInStringLiterals =false +isInComments =false +isFromCursor =true +isForward =true +isGlobal =true +isRegularExpressions =true +isCaseSensitive =false +isMultipleFiles =false +isPromptOnReplace =true +isReplaceAll =false +isOpenNewTab =false +isOpenInNewTabEnabled =false +isOpenNewTabVisible =false +isProjectScope =true +directoryName =null +isWithSubdirectories =true +fileFilter =null +moduleName =null +customScopeName =null + +-- + +a +-- +------------ +--- FIND MODEL --- +myStringToFind =a +myStringToReplace = +isReplaceState =false +isWholeWordsOnly =false +isInStringLiterals =false +isInComments =false +isFromCursor =true +isForward =true +isGlobal =true +isRegularExpressions =true +isCaseSensitive =false +isMultipleFiles =false +isPromptOnReplace =true +isReplaceAll =false +isOpenNewTab =false +isOpenInNewTabEnabled =false +isOpenNewTabVisible =false +isProjectScope =true +directoryName =null +isWithSubdirectories =true +fileFilter =null +moduleName =null +customScopeName =null + +-- + +[[<a>]] +-- +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,java.awt.Color[r=255,g=255,b=0],0,BOXED,null,java.awt.Color[r=0,g=255,b=0]] +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,null,0,ROUNDED_BOX,java.awt.Color[r=0,g=0,b=0],null] +------------ +--- FIND MODEL --- +myStringToFind =a +myStringToReplace = +isReplaceState =true +isWholeWordsOnly =false +isInStringLiterals =false +isInComments =false +isFromCursor =true +isForward =true +isGlobal =true +isRegularExpressions =true +isCaseSensitive =false +isMultipleFiles =false +isPromptOnReplace =true +isReplaceAll =false +isOpenNewTab =false +isOpenInNewTabEnabled =false +isOpenNewTabVisible =false +isProjectScope =true +directoryName =null +isWithSubdirectories =true +fileFilter =null +moduleName =null +customScopeName =null + +-- +Replacement Preview: <Empty string> +-- + +[[<a>]] +-- +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,java.awt.Color[r=255,g=255,b=0],0,BOXED,null,java.awt.Color[r=0,g=255,b=0]] +RangeHighlighter: (0,1); layer:5999; tooltip: null : [null,null,0,ROUNDED_BOX,java.awt.Color[r=0,g=0,b=0],null] +------------ +--- FIND MODEL --- +myStringToFind =a +myStringToReplace = +isReplaceState =true +isWholeWordsOnly =false +isInStringLiterals =false +isInComments =false +isFromCursor =true +isForward =true +isGlobal =true +isRegularExpressions =true +isCaseSensitive =false +isMultipleFiles =false +isPromptOnReplace =true +isReplaceAll =false +isOpenNewTab =false +isOpenInNewTabEnabled =false +isOpenNewTabVisible =false +isProjectScope =true +directoryName =null +isWithSubdirectories =true +fileFilter =null +moduleName =null +customScopeName =null + +-- + + +-- +Not Found +-- +------------ diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/IsNotNullCheck.java b/java/java-tests/testData/inspection/dataFlow/fixture/IsNotNullCheck.java index 85879eda40a7..6acb0133a0f2 100644 --- a/java/java-tests/testData/inspection/dataFlow/fixture/IsNotNullCheck.java +++ b/java/java-tests/testData/inspection/dataFlow/fixture/IsNotNullCheck.java @@ -5,5 +5,12 @@ public class IsNotNullCheck { if(<warning descr="Condition 'v == null' is always 'false'">v == null</warning>) {} } } + void bar2() { + final Value v = call(); + System.out.println(v.hashCode()); + if (Value.isNotNull(v)) { + + } + } Value call() {return new Value();} } diff --git a/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X.java b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X.java index e22c22c687d3..bcd930a14de4 100644 --- a/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X.java +++ b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X.java @@ -24,7 +24,7 @@ public class X implements Runnable{ } private void g() throws EOFException, FileNotFoundException { - //To change body of created methods use File | Settings | File Templates. + } public int hashCode() { @@ -36,7 +36,7 @@ public class X implements Runnable{ } public void run() { - //To change body of implemented methods use File | Settings | File Templates. + } private void method() { diff --git a/java/java-tests/testData/inspection/redundantTypeArgs/BoundInference.java b/java/java-tests/testData/inspection/redundantTypeArgs/BoundInference.java new file mode 100644 index 000000000000..61bfb5f09f69 --- /dev/null +++ b/java/java-tests/testData/inspection/redundantTypeArgs/BoundInference.java @@ -0,0 +1,31 @@ +import java.util.*; + +class ArraysUtil { + public static <S, T extends S> List<S> asList(T... a) { + List<S> result = new ArrayList<S>(); + result.addAll(Arrays.asList(a)); + return result; + } + + public static <S, T extends S> List<S> asCollection(T... a) { + return ArraysUtil.<S, T>asList(a); + } + + public static void main(String[] args) { + asCollection(); + } +} + +class ArraysUtil1 { + public static <S, T> List<S> asList(T... a) { + return null; + } + + public static List<String> asCollection(Integer... a) { + return ArraysUtil1.<warning descr="Explicit type arguments can be inferred"><String, Integer></warning>asList(a); + } + + public static void main(String[] args) { + asCollection(); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/inspection/redundantTypeArgs/ConditionalExpression.java b/java/java-tests/testData/inspection/redundantTypeArgs/ConditionalExpression.java new file mode 100644 index 000000000000..ee981eae9d1a --- /dev/null +++ b/java/java-tests/testData/inspection/redundantTypeArgs/ConditionalExpression.java @@ -0,0 +1,6 @@ +import java.util.*; +class Bug { + void foo(Double d) { + List<Class<?>> list = Arrays.<Class<?>>asList(d == null ? Object.class : d.getClass()); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/psi/parser-partial/declarations/UnclosedField1.txt b/java/java-tests/testData/psi/parser-partial/declarations/UnclosedField1.txt new file mode 100644 index 000000000000..60f2aefdec44 --- /dev/null +++ b/java/java-tests/testData/psi/parser-partial/declarations/UnclosedField1.txt @@ -0,0 +1,37 @@ +PsiJavaFile:UnclosedField1.java + PsiJavaToken:LBRACE('{') + PsiWhiteSpace(' ') + PsiField:f1 + PsiModifierList: + <empty list> + PsiTypeElement:String + PsiJavaCodeReferenceElement:String + PsiIdentifier:String('String') + PsiReferenceParameterList + <empty list> + PsiWhiteSpace(' ') + PsiIdentifier:f1('f1') + PsiErrorElement:';' expected + <empty list> + PsiWhiteSpace('\n\n ') + PsiField:f2 + PsiModifierList:@Anno + PsiAnnotation + PsiJavaToken:AT('@') + PsiJavaCodeReferenceElement:Anno + PsiIdentifier:Anno('Anno') + PsiReferenceParameterList + <empty list> + PsiAnnotationParameterList + <empty list> + PsiWhiteSpace(' ') + PsiTypeElement:String + PsiJavaCodeReferenceElement:String + PsiIdentifier:String('String') + PsiReferenceParameterList + <empty list> + PsiWhiteSpace(' ') + PsiIdentifier:f2('f2') + PsiJavaToken:SEMICOLON(';') + PsiWhiteSpace(' ') + PsiJavaToken:RBRACE('}')
\ No newline at end of file diff --git a/java/java-tests/testData/psi/parser-partial/declarations/UnclosedField2.txt b/java/java-tests/testData/psi/parser-partial/declarations/UnclosedField2.txt new file mode 100644 index 000000000000..18afb0228483 --- /dev/null +++ b/java/java-tests/testData/psi/parser-partial/declarations/UnclosedField2.txt @@ -0,0 +1,37 @@ +PsiJavaFile:UnclosedField2.java + PsiJavaToken:LBRACE('{') + PsiWhiteSpace(' ') + PsiField:f1 + PsiModifierList: + <empty list> + PsiTypeElement:String + PsiJavaCodeReferenceElement:String + PsiIdentifier:String('String') + PsiReferenceParameterList + <empty list> + PsiWhiteSpace(' ') + PsiIdentifier:f1('f1') + PsiErrorElement:';' expected + <empty list> + PsiWhiteSpace('\n\n ') + PsiField:f2 + PsiModifierList:@Anno + PsiAnnotation + PsiJavaToken:AT('@') + PsiJavaCodeReferenceElement:Anno + PsiIdentifier:Anno('Anno') + PsiReferenceParameterList + <empty list> + PsiAnnotationParameterList + <empty list> + PsiWhiteSpace('\n ') + PsiTypeElement:String + PsiJavaCodeReferenceElement:String + PsiIdentifier:String('String') + PsiReferenceParameterList + <empty list> + PsiWhiteSpace(' ') + PsiIdentifier:f2('f2') + PsiJavaToken:SEMICOLON(';') + PsiWhiteSpace(' ') + PsiJavaToken:RBRACE('}')
\ No newline at end of file diff --git a/java/java-tests/testData/psi/repositoryUse/src15/enums/OurEnumWithConstantsAndStaticFields2.java b/java/java-tests/testData/psi/repositoryUse/src15/enums/OurEnumWithConstantsAndStaticFields2.java index f411f7ff9b8c..cf8ec29e89b7 100644 --- a/java/java-tests/testData/psi/repositoryUse/src15/enums/OurEnumWithConstantsAndStaticFields2.java +++ b/java/java-tests/testData/psi/repositoryUse/src15/enums/OurEnumWithConstantsAndStaticFields2.java @@ -3,12 +3,12 @@ package enums; public abstract enum OurEnumWithConstantsAndStaticFields2 { A { void foo() { - //To change body of implemented methods use File | Settings | File Templates. + } }, B { void foo() { - //To change body of implemented methods use File | Settings | File Templates. + } }, diff --git a/java/java-tests/testData/refactoring/changeSignature/AddException_after.java b/java/java-tests/testData/refactoring/changeSignature/AddException_after.java index a7ea8549c3e7..024a966bac8a 100644 --- a/java/java-tests/testData/refactoring/changeSignature/AddException_after.java +++ b/java/java-tests/testData/refactoring/changeSignature/AddException_after.java @@ -6,7 +6,7 @@ class Test { try { foo(); } catch (Exception e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + e.printStackTrace(); } } } diff --git a/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java.after b/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java.after index ac867389f0f2..33ff88f7b369 100644 --- a/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java.after +++ b/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionSimple.java.after @@ -10,7 +10,7 @@ class ChangeSignatureTest { try { bar(); } catch (Exception e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + e.printStackTrace(); } } }
\ No newline at end of file diff --git a/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java.after b/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java.after index 2b33e2495065..2f6d1dc74109 100644 --- a/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java.after +++ b/java/java-tests/testData/refactoring/changeSignaturePropagation/ExceptionWithOverriding.java.after @@ -10,7 +10,7 @@ class ChangeSignatureTest { try { bar(); } catch (Exception e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + e.printStackTrace(); } } } diff --git a/java/java-tests/testData/refactoring/inlineMethod/InlineRunnableRun.java b/java/java-tests/testData/refactoring/inlineMethod/InlineRunnableRun.java index 11e96b8727fc..4076b43b89a0 100644 --- a/java/java-tests/testData/refactoring/inlineMethod/InlineRunnableRun.java +++ b/java/java-tests/testData/refactoring/inlineMethod/InlineRunnableRun.java @@ -15,7 +15,7 @@ */ class Test { private void bar() { - //To change body of created methods use File | Settings | File Templates. + } public void foo() { diff --git a/java/java-tests/testData/refactoring/inlineMethod/InlineRunnableRun.java.after b/java/java-tests/testData/refactoring/inlineMethod/InlineRunnableRun.java.after index b0ffb0b5d602..de2b500a9812 100644 --- a/java/java-tests/testData/refactoring/inlineMethod/InlineRunnableRun.java.after +++ b/java/java-tests/testData/refactoring/inlineMethod/InlineRunnableRun.java.after @@ -15,7 +15,7 @@ */ class Test { private void bar() { - //To change body of created methods use File | Settings | File Templates. + } public void foo() { diff --git a/java/java-tests/testData/refactoring/inlineMethod/NotAStatement.java b/java/java-tests/testData/refactoring/inlineMethod/NotAStatement.java index f8871bcd6e8a..bb93c28a59e9 100644 --- a/java/java-tests/testData/refactoring/inlineMethod/NotAStatement.java +++ b/java/java-tests/testData/refactoring/inlineMethod/NotAStatement.java @@ -13,7 +13,7 @@ class AAA { class Status { public Status(final String[] strings) { - //To change body of created methods use File | Settings | File Templates. + } boolean hasReadonlyFiles() { diff --git a/java/java-tests/testData/refactoring/inlineMethod/Substitution.java b/java/java-tests/testData/refactoring/inlineMethod/Substitution.java index d490684560f7..253a80efee46 100644 --- a/java/java-tests/testData/refactoring/inlineMethod/Substitution.java +++ b/java/java-tests/testData/refactoring/inlineMethod/Substitution.java @@ -33,7 +33,7 @@ class Computable<O> {} class WeighingComparable<T, Loc> implements Comparable<WeighingComparable<T, Loc>> { public WeighingComparable(final Computable<T> element, final Loc location, final Weigher[] weighers) { - //To change body of created methods use File | Settings | File Templates. + } public int compareTo(@NotNull final WeighingComparable<T, Loc> comparable) { diff --git a/java/java-tests/testData/refactoring/inlineMethod/Substitution.java.after b/java/java-tests/testData/refactoring/inlineMethod/Substitution.java.after index 2d63bdcde203..e33dbf9d0fe3 100644 --- a/java/java-tests/testData/refactoring/inlineMethod/Substitution.java.after +++ b/java/java-tests/testData/refactoring/inlineMethod/Substitution.java.after @@ -28,7 +28,7 @@ class Computable<O> {} class WeighingComparable<T, Loc> implements Comparable<WeighingComparable<T, Loc>> { public WeighingComparable(final Computable<T> element, final Loc location, final Weigher[] weighers) { - //To change body of created methods use File | Settings | File Templates. + } public int compareTo(@NotNull final WeighingComparable<T, Loc> comparable) { diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll1.java b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll1.java index 663a918624d3..86813a684d97 100644 --- a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll1.java +++ b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll1.java @@ -19,7 +19,7 @@ public abstract class PartnerAuthenticationInterceptor { private class PartnerAuthentication { public String serviceGroup() { - return null; //To change body of created methods use File | Settings | File Templates. + return null; } public String type() { diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll1_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll1_after.java index b40cea1f0bd8..6d30cf1c37d0 100644 --- a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll1_after.java +++ b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll1_after.java @@ -19,7 +19,7 @@ public abstract class PartnerAuthenticationInterceptor { private class PartnerAuthentication { public String serviceGroup() { - return null; //To change body of created methods use File | Settings | File Templates. + return null; } public String type() { diff --git a/java/java-tests/testData/refactoring/renameInplace/SuperMethodAnonymousInheritor.java b/java/java-tests/testData/refactoring/renameInplace/SuperMethodAnonymousInheritor.java index d30f2dacbd38..093008824dce 100644 --- a/java/java-tests/testData/refactoring/renameInplace/SuperMethodAnonymousInheritor.java +++ b/java/java-tests/testData/refactoring/renameInplace/SuperMethodAnonymousInheritor.java @@ -8,7 +8,7 @@ class Demo { void method() { MyEventListener<Object> l = new MyEventListener<Object>() { public void ac<caret>tion(MyEvent<Object> event) { - //To change body of implemented methods use File | Settings | File Templates. + } }; } diff --git a/java/java-tests/testData/refactoring/renameInplace/SuperMethodAnonymousInheritor_after.java b/java/java-tests/testData/refactoring/renameInplace/SuperMethodAnonymousInheritor_after.java index ee9f9c67aea5..53241b691c86 100644 --- a/java/java-tests/testData/refactoring/renameInplace/SuperMethodAnonymousInheritor_after.java +++ b/java/java-tests/testData/refactoring/renameInplace/SuperMethodAnonymousInheritor_after.java @@ -8,7 +8,7 @@ class Demo { void method() { MyEventListener<Object> l = new MyEventListener<Object>() { public void xxx(MyEvent<Object> event) { - //To change body of implemented methods use File | Settings | File Templates. + } }; } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java index 75c42d2ae705..2e40ced34999 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java @@ -139,6 +139,9 @@ public class CompleteStatementTest extends EditorActionTestCase { public void testFieldWithInitializer() throws Exception { doTest(); } + public void testFieldBeforeAnnotation() throws Exception { doTest(); } + public void _testMethodBeforeAnnotation() throws Exception { doTest(); } + public void testParenthesized() throws Exception { doTest(); } public void testCompleteBreak() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java index e4a4ca55be6a..bd406117d582 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java @@ -75,16 +75,8 @@ public class KeywordCompletionTest extends LightCompletionTestCase { public void testMethodScope3() throws Exception { doTest(1, "final", "public", "static", "volatile", "abstract", "throws", "instanceof"); } public void testMethodScope4() throws Exception { doTest(6, "final", "try", "for", "while", "return", "throw"); } public void testMethodScope5() throws Exception { doTest(true); } - public void testExtraBracketAfterFinally1() throws Exception { - configureByFile(BASE_PATH + "/" + getTestName(true) + ".java"); - selectItem(myItems[1]); - checkResultByFile(BASE_PATH + "/" + getTestName(true) + "_after.java"); - } - public void testExtraBracketAfterFinally2() throws Exception { - configureByFile(BASE_PATH + "/" + getTestName(true) + ".java"); - selectItem(myItems[1]); - checkResultByFile(BASE_PATH + "/" + getTestName(true) + "_after.java"); - } + public void testExtraBracketAfterFinally1() throws Exception { doTest(false); } + public void testExtraBracketAfterFinally2() throws Exception { doTest(false); } public void testExtendsInCastTypeParameters() throws Exception { doTest(false); } public void testExtendsInCastTypeParameters2() throws Exception { doTest(2, "extends", "super"); } public void testExtendsWithRightContextInClassTypeParameters() throws Exception { doTest(false); } @@ -105,6 +97,7 @@ public class KeywordCompletionTest extends LightCompletionTestCase { public void testNullInMethodCall2() throws Exception { doTest(false); } public void testNewInMethodRefs() throws Exception { doTest(1, "new"); } public void testSpaceAfterInstanceof() throws Exception { doTest(false); } + public void testInstanceofAfterUnresolved() throws Exception { doTest(1, "instanceof"); } public void testAbstractInInterface() throws Exception { doTest(1, "abstract"); } public void testCharInAnnotatedParameter() throws Exception { doTest(1, "char"); } public void testReturnInTernary() throws Exception { doTest(1, "return"); } @@ -112,6 +105,7 @@ public class KeywordCompletionTest extends LightCompletionTestCase { public void testFinalAfterParameterAnno2() throws Exception { doTest(2, "final", "float", "class"); } public void testFinalAfterCase() throws Exception { doTest(3, "final", "float", "class"); } public void testFinalInTryWithResources() throws Exception { doTest(1, "final", "float", "class"); } + public void testNoFinalAfterTryBody() throws Exception { doTest(1, "final", "finally"); } public void testClassInMethod() throws Exception { doTest(2, "class", "char"); } public void testIntInClassArray() throws Throwable { doTest(2, "int", "char", "final"); } public void testIntInClassArray2() throws Throwable { doTest(2, "int", "char", "final"); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java index 37163f203e22..afc3d15e5b5c 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java @@ -177,7 +177,8 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase { public void testContinueInferenceAfterFirstRawResult() { doTest5(false); } public void testDoNotAcceptLowerBoundIfRaw() { doTest5(false); } public void testStaticOverride() { doTest5(false); } - public void testTypeArgumentsGivenOnRawType() { doTest5(false); } + public void testTypeArgumentsGivenOnRawType() { doTest7Incompatibility(false); } + public void testSelectFromTypeParameter() { doTest5(false); } public void testTypeArgumentsGivenOnAnonymousClassCreation() { doTest5(false); } //public void testIDEA94011() { doTest5(false); } public void testDifferentTypeParamsInOverloadedMethods() { doTest5(true); } @@ -235,6 +236,11 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase { public void testIDEA20244() throws Exception { doTest5(false);} public void testIDEA22005() throws Exception { doTest5(false);} + public void testIDEA57877() throws Exception { doTest5(false);} + public void testTypeParamsCyclicInference() throws Exception { doTest5(false);} + public void testCaptureTopLevelWildcardsForConditionalExpression() throws Exception { doTest5(false);} + public void testGenericsOverrideMethodInRawInheritor() throws Exception { doTest5(false);} + public void testIDEA27185(){ doTest(LanguageLevel.JDK_1_6, JavaSdkVersion.JDK_1_6, false); } public void testIDEA67571(){ doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java index b57321456d94..9cffb6dc8e9a 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java @@ -375,6 +375,7 @@ public class LightAdvHighlightingTest extends LightDaemonAnalyzerTestCase { public void testInnerClassConstantReference() { doTest(false, false); } public void testIDEA60875() { doTest(false, false); } public void testIDEA71645() { doTest(false, false); } + public void testNewExpressionClass() { doTest(false, false); } public void testNoEnclosingInstanceWhenStaticNestedInheritsFromContainingClass() throws Exception { doTest(false, false); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy index 1e794b58a631..a1bbee0fddbc 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy @@ -67,7 +67,7 @@ class SomeOuterClassWithLongName { static class Group { public void addSubGroup(Group child) { - <selection>//To change body of created methods use File | Settings | File Templates.</selection> + <selection></selection> } } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy index fa188ff3d216..3868cdbaaeba 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy @@ -266,6 +266,34 @@ class Test { assert foldingModel.getCollapsedRegionAtOffset(text.indexOf("MyAction(")).placeholderText == '(MyAction) () -> { ' } + public void "test closure folding when overriding one method of many"() { + myFixture.addClass('abstract class Runnable { void run() {}; void run2() {} }') + myFixture.addClass('abstract class Runnable2 { void run() {}; void run2() {} }') + def text = """\ +class Test { + void test() { + Runnable r = new Runnable() { + public void run() { + System.out.println(); + } + }; + foo(new Runnable2() { + public void run2() { + System.out.println(); + } + }); + } + + void foo(Object o) {} +} +""" + configure text + def foldingModel = myFixture.editor.foldingModel as FoldingModelImpl + + assert foldingModel.getCollapsedRegionAtOffset(text.indexOf("Runnable("))?.placeholderText == 'run() -> { ' + assert foldingModel.getCollapsedRegionAtOffset(text.indexOf("Runnable2("))?.placeholderText == '(Runnable2) run2() -> { ' + } + public void "test no closure folding when the method throws an unresolved exception"() { def text = """\ class Test { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy index 42ab14bb56a9..372c1802171b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy @@ -43,6 +43,7 @@ public class LiveTemplateTest extends LightCodeInsightFixtureTestCase { @Override protected void tearDown() throws Exception { CodeInsightSettings.instance.COMPLETION_CASE_SENSITIVE = CodeInsightSettings.FIRST_LETTER + CodeInsightSettings.instance.SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS = false if (state != null) { state.gotoEnd(); } @@ -249,6 +250,17 @@ class Foo { assert !state.finished } + public void testFinishTemplateVariantWithDot() { + CodeInsightSettings.instance.SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS = true + configure(); + startTemplate("soutv", "output") + myFixture.type('fil') + assert myFixture.lookupElementStrings == ['file'] + myFixture.type('.') + checkResult() + assert !state.finished + } + public void testAllowTypingRandomExpressionsWithLookupOpen() { configure(); startTemplate("iter", "iterations") diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast18Test.java b/java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast18Test.java index 7dd819d9f836..0a0c5396c6c9 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast18Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast18Test.java @@ -34,6 +34,7 @@ public class RedundantCast18Test extends InspectionTestCase { public void testMethodRefContext() throws Exception { doTest(); } public void testExpectedSupertype() throws Exception { doTest(); } + @Override protected Sdk getTestProjectSdk() { Sdk sdk = IdeaTestUtil.getMockJdk17(); LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_8); diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/RedundantTypeArgsInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/RedundantTypeArgsInspectionTest.java index e5be88660afc..53aba55cf689 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/RedundantTypeArgsInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/RedundantTypeArgsInspectionTest.java @@ -29,4 +29,12 @@ public class RedundantTypeArgsInspectionTest extends JavaCodeInsightFixtureTestC public void testReturnPrimitiveTypes() throws Throwable { // javac non-boxing: IDEA-53984 doTest(); } + + public void testConditionalExpression() throws Throwable { + doTest(); + } + + public void testBoundInference() throws Throwable { + doTest(); + } }
\ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/find/FindInEditorTest.java b/java/java-tests/testSrc/com/intellij/find/FindInEditorTest.java index f3eb8816b98b..cfe9cdde2273 100644 --- a/java/java-tests/testSrc/com/intellij/find/FindInEditorTest.java +++ b/java/java-tests/testSrc/com/intellij/find/FindInEditorTest.java @@ -15,13 +15,13 @@ */ package com.intellij.find; -import com.intellij.find.impl.FindResultImpl; +import com.intellij.find.impl.livePreview.LivePreview; import com.intellij.find.impl.livePreview.LivePreviewController; import com.intellij.find.impl.livePreview.SearchResults; import com.intellij.testFramework.LightCodeInsightTestCase; -import com.intellij.testFramework.LightPlatformCodeInsightTestCase; -import java.util.List; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; public class FindInEditorTest extends LightCodeInsightTestCase { @@ -29,31 +29,61 @@ public class FindInEditorTest extends LightCodeInsightTestCase { private SearchResults mySearchResults; private FindModel myFindModel; + private ByteArrayOutputStream myOutputStream; + @Override protected void setUp() throws Exception { super.setUp(); myFindModel = new FindModel(); + + myOutputStream = new ByteArrayOutputStream(); + LivePreview.ourTestOutput = new PrintStream(myOutputStream); + } + + private void initFind() { + mySearchResults = new SearchResults(getEditor(), getProject()); + myLivePreviewController = new LivePreviewController(mySearchResults, null); myFindModel.addObserver(new FindModel.FindModelObserver() { @Override public void findModelChanged(FindModel findModel) { myLivePreviewController.updateInBackground(myFindModel, true); } }); + myLivePreviewController.on(); } - private void initFind() { - mySearchResults = new SearchResults(getEditor(), getProject()); - myLivePreviewController = new LivePreviewController(mySearchResults, null); - myLivePreviewController.on(); + public void testBasicFind() throws Exception { + configureFromFileText("file.txt", "ab"); + initFind(); + myFindModel.setStringToFind("a"); + checkResults(); } - public void test1() throws Exception { - configureFromFileText("file.txt", "abc"); + public void testEmacsLikeFallback() throws Exception { + configureFromFileText("file.txt", "a\nab"); initFind(); myFindModel.setStringToFind("a"); - type("a"); - List<FindResult> occurrences = mySearchResults.getOccurrences(); - assertContainsElements(occurrences, new FindResultImpl(0, 1)); + myFindModel.setStringToFind("ab"); + myFindModel.setStringToFind("a"); + checkResults(); + } + + public void testReplacementWithEmptyString() throws Exception { + configureFromFileText("file.txt", "a"); + initFind(); + + myFindModel.setRegularExpressions(true); + myFindModel.setStringToFind("a"); + myFindModel.setStringToReplace(""); + myFindModel.setReplaceState(true); + + myLivePreviewController.performReplace(); + checkResults(); + } + + private void checkResults() { + String name = getTestName(false); + assertSameLinesWithFile(getTestDataPath() + "/find/findInEditor/" + name + ".gold", myOutputStream.toString()); } } diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java index 5570590a19f6..deed3fc4a4a8 100644 --- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java +++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java @@ -73,6 +73,8 @@ public class DeclarationParserTest extends JavaParsingTestCase { public void testUnclosedSemicolon() { doParserTest("{ int field }", false, false); } public void testMissingInitializerExpression() { doParserTest("{ int field=; }", false, false); } public void testMultiLineUnclosed() { doParserTest("{ int \n Object o; }", false, false); } + public void testUnclosedField1() { doParserTest("{ String f1\n\n @Anno String f2; }", false, false); } + public void testUnclosedField2() { doParserTest("{ String f1\n\n @Anno\n String f2; }", false, false); } public void testMethodNormal0() { doParserTest("{ void f() {} }", false, false); } public void testMethodNormal1() { doParserTest("{ void f(); }", false, false); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java index 8c619e86fccb..3c6d9fd754f5 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java @@ -18,7 +18,6 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; @@ -101,7 +100,7 @@ public class CopyClassTest extends CodeInsightTestCase { String rootAfter = root + "/after"; VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/')); myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); - PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir, PlatformTestUtil.CVS_FILE_FILTER); + PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir); } public void testPackageHierarchy() throws Exception { @@ -126,6 +125,6 @@ public class CopyClassTest extends CodeInsightTestCase { String rootAfter = root + "/after"; VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/')); myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); - PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir, PlatformTestUtil.CVS_FILE_FILTER); + PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java index 1541af66adec..47754632a760 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java @@ -203,6 +203,6 @@ public class ExtractSuperClassTest extends RefactoringTestCase { String rootAfter = getRoot() + "/after"; VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/')); myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); - IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER); + IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java index b91a6e19e846..46c64079984e 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java @@ -22,7 +22,6 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; @@ -30,6 +29,7 @@ import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.move.moveFilesOrDirectories.JavaMoveFilesOrDirectoriesHandler; import com.intellij.testFramework.IdeaTestUtil; +import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.PsiTestUtil; import java.io.File; @@ -60,10 +60,10 @@ public class MoveClassAndFileTest extends RefactoringTestCase { String rootAfter = root + "/after"; VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/')); myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); - IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER); + PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir); } - private void performAction(String newPackageName, String fileName, String... classNames) throws Exception{ + private void performAction(String newPackageName, String fileName, String... classNames) { final PsiElement[] elements = new PsiElement[classNames.length + 1]; for(int i = 0; i < classNames.length; i++){ String className = classNames[i]; diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java index 4c4a4980a76d..bcaabef58603 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java @@ -17,7 +17,6 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; @@ -103,7 +102,7 @@ public class MoveClassTest extends RefactoringTestCase { String rootAfter = root + "/after"; VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/')); myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); - PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir, PlatformTestUtil.CVS_FILE_FILTER); + PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir); } private void performAction(String[] classNames, String newPackageName) throws Exception{ diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java index 72005dbb59d6..3b894f767ce0 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java @@ -27,6 +27,7 @@ import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.search.ProjectScope; import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProcessor; import com.intellij.testFramework.IdeaTestUtil; +import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.PsiTestUtil; import com.intellij.usageView.UsageInfo; import com.intellij.util.containers.MultiMap; @@ -132,7 +133,7 @@ public class MoveClassToInnerTest extends RefactoringTestCase { String rootAfter = getRoot() + "/after"; VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/')); myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); - IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER); + PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir); } private VirtualFile prepareTest() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameDirectoryTest.groovy b/java/java-tests/testSrc/com/intellij/refactoring/RenameDirectoryTest.groovy new file mode 100644 index 000000000000..401de728337e --- /dev/null +++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameDirectoryTest.groovy @@ -0,0 +1,47 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.refactoring + +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.refactoring.rename.RenameProcessor +import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase +/** + * @author peter + */ +public class RenameDirectoryTest extends JavaCodeInsightFixtureTestCase { + + public void testRenameSrcRootWithTextOccurrences() { + VirtualFile srcRoot = myFixture.tempDirFixture.findOrCreateDir("") + + def fooClass = myFixture.addClass """ +// PsiPackage: +class Foo { + String s1 = "PsiPackage:" +} +""" + myFixture.configureFromExistingVirtualFile(fooClass.containingFile.virtualFile) + + new RenameProcessor(getProject(), psiManager.findDirectory(srcRoot), "newName", true, true).run(); + + assert srcRoot.path.endsWith("newName") + myFixture.checkResult """ +// PsiPackage: +class Foo { + String s1 = "PsiPackage:" +} +""" + } +} diff --git a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java index 27d78094281e..44f927fa87ba 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java @@ -11,6 +11,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; import com.intellij.testFramework.IdeaTestUtil; +import com.intellij.testFramework.PlatformTestUtil; import org.jetbrains.annotations.NonNls; import java.io.File; @@ -163,7 +164,7 @@ public class SafeDeleteTest extends MultiFileTestCase { @Override public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { SafeDeleteTest.this.performAction(qClassName); - IdeaTestUtil.assertDirectoriesEqual(rootAfter, myRootBefore, IdeaTestUtil.CVS_FILE_FILTER); + PlatformTestUtil.assertDirectoriesEqual(rootAfter, myRootBefore); } }); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodMultifileTest.java index af19fc3349b0..9d46f072f338 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodMultifileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodMultifileTest.java @@ -27,6 +27,7 @@ import com.intellij.refactoring.MockInlineMethodOptions; import com.intellij.refactoring.RefactoringTestCase; import com.intellij.refactoring.util.InlineUtil; import com.intellij.testFramework.IdeaTestUtil; +import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.PsiTestUtil; import java.io.File; @@ -61,6 +62,6 @@ public class InlineMethodMultifileTest extends RefactoringTestCase { String rootAfter = getRoot() + "/after"; VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/')); myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); - IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER); + PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java index ff5424fbc45a..de5a9af59284 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java @@ -16,7 +16,6 @@ package com.intellij.refactoring.inline; import com.intellij.JavaTestUtil; -import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiClass; @@ -25,6 +24,7 @@ import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.search.ProjectScope; import com.intellij.refactoring.RefactoringTestCase; import com.intellij.testFramework.IdeaTestUtil; +import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.PsiTestUtil; import com.intellij.usageView.UsageInfo; import com.intellij.util.containers.MultiMap; @@ -68,6 +68,6 @@ public class InlineToAnonymousClassMultifileTest extends RefactoringTestCase { String rootAfter = getRoot() + "/after"; VirtualFile rootDir2 = LocalFileSystem.getInstance().findFileByPath(rootAfter.replace(File.separatorChar, '/')); myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); - IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER); + PlatformTestUtil.assertDirectoriesEqual(rootDir2, rootDir); } } |