diff options
Diffstat (limited to 'java/java-tests/testData')
43 files changed, 279 insertions, 118 deletions
diff --git a/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation.java b/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation.java index 60897adf5440..c09cfc1e8a9b 100644 --- a/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation.java +++ b/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation.java @@ -1,5 +1,6 @@ public class Test { - private String s + + private String s<caret> @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 index 904bae91fca0..47664ef44b8e 100644 --- a/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation_after.java +++ b/java/java-tests/testData/codeInsight/completeStatement/FieldBeforeAnnotation_after.java @@ -1,4 +1,5 @@ public class Test { + private String s;<caret> @Deprecated private String foo; diff --git a/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation.java b/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation.java index af7100e9182b..0cec1a5498e3 100644 --- a/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation.java +++ b/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation.java @@ -1,5 +1,6 @@ public class Test { - private String s() + + private String s()<caret> @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 index 6abd1bbfeee7..5a5583f137a5 100644 --- a/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation_after.java +++ b/java/java-tests/testData/codeInsight/completeStatement/MethodBeforeAnnotation_after.java @@ -1,4 +1,5 @@ public class Test { + private String s() { <caret> } 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 3b364480ad60..4fcd91f86610 100644 --- a/java/java-tests/testData/codeInsight/completion/normal/ClassNameAnonymous_after.java +++ b/java/java-tests/testData/codeInsight/completion/normal/ClassNameAnonymous_after.java @@ -3,6 +3,7 @@ class Foo { Zzoo l = new Zzoo() { @Override public void run() { + <caret> } } } 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 4f77648a4cb5..aa1a86617802 100644 --- a/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInner_after.java +++ b/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInner_after.java @@ -3,6 +3,7 @@ class Foo { Zzoo l = new Zzoo() { @Override public void run() { + <caret> } } } 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 c8e336a29bc3..82ba62f6edd8 100644 --- a/java/java-tests/testData/codeInsight/completion/normal/ImplementViaCompletion_after.java +++ b/java/java-tests/testData/codeInsight/completion/normal/ImplementViaCompletion_after.java @@ -5,5 +5,6 @@ interface Foo<T> { public class A implements Foo<String> { @Override public void run(String s, int myInt) { + <caret> } } 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 7271ebe2f368..22dd5a334aec 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/AnonymousNoPairBracket-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/AnonymousNoPairBracket-out.java @@ -3,6 +3,7 @@ public class Bar { new Thread(new Runnable() { @Override public void run() { + <caret> } }) } 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 d8946b14a664..72d48393aa5e 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/InsertOverride-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/InsertOverride-out.java @@ -3,6 +3,7 @@ class C { Runnable r = new Runnable() { @Override public void run() { + <caret> } }; } 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 4f5e39715b8c..d59022ff5c6c 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractClassWithConstructorArgs-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractClassWithConstructorArgs-out.java @@ -4,6 +4,7 @@ public class Main { Bar b = new Bar() { @Override void update() { + <caret> } }; } 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 f9d65197a509..207a0f14837b 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractInsideAnonymous-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/NewAbstractInsideAnonymous-out.java @@ -6,6 +6,7 @@ public class Foo { Goo<String> g = new Goo<String>() { @Override void foo() { + <caret> } }; } 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 4e97010530e8..38024980a233 100644 --- a/java/java-tests/testData/codeInsight/createSubclass/innerClassImplement/after/Test.java +++ b/java/java-tests/testData/codeInsight/createSubclass/innerClassImplement/after/Test.java @@ -11,6 +11,7 @@ public class Test { @Override void bar() { + } } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java new file mode 100644 index 000000000000..214a3aec4bd6 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java @@ -0,0 +1,38 @@ +enum EnumPrivateMethodTest { + FIRST { + @Override + public void execute() { + this.<error descr="'firstMethod()' has private access in 'EnumPrivateMethodTest'">firstMethod</error>(); + } + }; + + public abstract void execute(); + + private void firstMethod() {} +} + +abstract class EnumPrivateMethodTest1 { + EnumPrivateMethodTest1 FIRST = new EnumPrivateMethodTest1() { + @Override + public void execute() { + this.<error descr="'firstMethod()' has private access in 'EnumPrivateMethodTest1'">firstMethod</error>(); + } + }; + + public abstract void execute(); + + private void firstMethod() {} +} + +abstract class EnumPrivateMethodTest2 { + EnumPrivateMethodTest2 FIRST = new EnumPrivateMethodTest2() { + @Override + public void execute() { + firstMethod(); + } + }; + + public abstract void execute(); + + private void firstMethod() {} +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57259.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57259.java new file mode 100644 index 000000000000..fbf2bd11bdff --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57259.java @@ -0,0 +1,8 @@ +class A<T extends A.B> { + class B extends A<B> {} +} + +class C<T> { + class D extends C<T> {} + <T extends C<String>.D> void foo(){} +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IllegalForwardReferenceInTypeParameterDefinition.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IllegalForwardReferenceInTypeParameterDefinition.java new file mode 100644 index 000000000000..cbc96adeadc9 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IllegalForwardReferenceInTypeParameterDefinition.java @@ -0,0 +1,2 @@ +class A<T extends <error descr="Illegal forward reference">S</error>, S> { +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InheritedWithDifferentArgsInTypeParams.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InheritedWithDifferentArgsInTypeParams.java new file mode 100644 index 000000000000..2adff2f8f495 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InheritedWithDifferentArgsInTypeParams.java @@ -0,0 +1,24 @@ +interface IA<T> {} +interface IB<T> extends IA<T> {} + +class A { + <<error descr="'IA' cannot be inherited with different type arguments: 'java.lang.Integer' and 'java.lang.String'"></error>T extends IA<Integer> & IB<String>> void foo(){} +} + + + +interface IA1<T> {} +interface IB1<T> extends IA1<T> {} + +class A1 { + <<error descr="'IA1' cannot be inherited with different type arguments: 'java.lang.Object' and 'capture<?>'"></error>T extends IA1<Object> & IB1<?>> void foo(){} +} + +interface IA2<T> {} +interface IB2<T> extends IA2<T[]> {} + +class A2 { + <T extends IA2<Object[]> & IB2<?>> void foo(){} +} + + diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType.java new file mode 100644 index 000000000000..bbb565f10f6f --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType.java @@ -0,0 +1,43 @@ +interface I{ + <T extends Iterable<String>> void foo(); +} + +abstract class A<S> implements I { + public abstract <T extends Iterable<String>> void foo(); + <T extends A> void bar(T x){ + A a = null; + a.<Iterable<String>> foo(); + x.<Iterable<String>> foo(); + } +} + +abstract class B<S> { + public abstract <T extends Iterable<String>> void foo(); + <T extends B> void bar(T x){ + B a = null; + a.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo(); + x.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo(); + } +} + +abstract class C<S> { + public abstract <T extends Iterable<String>> void foo(); + <T extends C & I> void bar(T x){ + x.<Iterable<String>> foo(); + } +} + +//--------------------------------------------------------------- +interface I1 { + void foo(); +} + + +abstract class B1<S> { + public abstract <T extends Iterable<String>> void foo(); + <T extends B1 & I1> void bar(T x){ + B1 a = null; + a.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo(); + x.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo(); + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType17.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType17.java new file mode 100644 index 000000000000..f586b18a8a1d --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/TypeArgumentsOnRawType17.java @@ -0,0 +1,43 @@ +interface I{ + <T extends Iterable<String>> void foo(); +} + +abstract class A<S> implements I { + public abstract <T extends Iterable<String>> void foo(); + <T extends A> void bar(T x){ + A a = null; + a.<Iterable<String>> foo(); + x.<Iterable<String>> foo(); + } +} + +abstract class B<S> { + public abstract <T extends Iterable<String>> void foo(); + <T extends B> void bar(T x){ + B a = null; + a.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo(); + x.<Iterable<String>> foo(); + } +} + +abstract class C<S> { + public abstract <T extends Iterable<String>> void foo(); + <T extends C & I> void bar(T x){ + x.<Iterable<String>> foo(); + } +} + +//--------------------------------------------------------------- +interface I1 { + void foo(); +} + + +abstract class B1<S> { + public abstract <T extends Iterable<String>> void foo(); + <T extends B1 & I1> void bar(T x){ + B1 a = null; + a.<error descr="Type arguments given on a raw method"><Iterable<String>></error> foo(); + x.<Iterable<String>> foo(); + } +} 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 9caf9c84fbad..4b053096d1ae 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after1.java @@ -5,6 +5,7 @@ class a implements Runnable { } public void run() { + <caret> } } 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 a0f5015d8ead..06604cb981c3 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/after6.java @@ -5,6 +5,7 @@ class a implements b<String> { } public void g(b<String> t) { + <caret> } } interface b<T> { 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 2b5d7f27057c..df358cd3c362 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterAbstractMethod.java @@ -6,5 +6,6 @@ abstract class Test { class TImple extends Test { @Override void foo() { + <caret> } }
\ 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 94c822617276..2d998570d26c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterSkipUnresolvedNullable.java @@ -8,5 +8,6 @@ abstract class Test { class TImple extends Test { @Override public void foo(@Nullable String a) { + <caret> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/invertIfCondition/afterContinue3.java b/java/java-tests/testData/codeInsight/invertIfCondition/afterContinue3.java new file mode 100644 index 000000000000..be835ee8b2a8 --- /dev/null +++ b/java/java-tests/testData/codeInsight/invertIfCondition/afterContinue3.java @@ -0,0 +1,20 @@ +// "Invert If Condition" "true" +class B { + public static void foo() { + for (int i = 0; i < 10; i++) { + if (i % 2 == 0) { + if (i != 0) { + + System.out.println("!= 0"); + continue; + } + else { + System.out.println("== 0"); + continue; + } + } + + System.out.println("i = " + i); + } + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/invertIfCondition/afterContinue4.java b/java/java-tests/testData/codeInsight/invertIfCondition/afterContinue4.java new file mode 100644 index 000000000000..461672c90383 --- /dev/null +++ b/java/java-tests/testData/codeInsight/invertIfCondition/afterContinue4.java @@ -0,0 +1,16 @@ +// "Invert If Condition" "true" +class B { + public static void foo() { + for (int i = 0; i < 10; i++) { + if (i % 2 == 0) { + if (i != 0) { + + System.out.println("!= 0"); + } + else { + System.out.println("== 0"); + } + } + } + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/invertIfCondition/beforeContinue3.java b/java/java-tests/testData/codeInsight/invertIfCondition/beforeContinue3.java new file mode 100644 index 000000000000..339b3de105ae --- /dev/null +++ b/java/java-tests/testData/codeInsight/invertIfCondition/beforeContinue3.java @@ -0,0 +1,18 @@ +// "Invert If Condition" "true" +class B { + public static void foo() { + for (int i = 0; i < 10; i++) { + if (i % 2 == 0) { + <caret>if (i == 0) { + System.out.println("== 0"); + continue; + } + + System.out.println("!= 0"); + continue; + } + + System.out.println("i = " + i); + } + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/invertIfCondition/beforeContinue4.java b/java/java-tests/testData/codeInsight/invertIfCondition/beforeContinue4.java new file mode 100644 index 000000000000..d2c904a6b372 --- /dev/null +++ b/java/java-tests/testData/codeInsight/invertIfCondition/beforeContinue4.java @@ -0,0 +1,15 @@ +// "Invert If Condition" "true" +class B { + public static void foo() { + for (int i = 0; i < 10; i++) { + if (i % 2 == 0) { + <caret>if (i == 0) { + System.out.println("== 0"); + continue; + } + + System.out.println("!= 0"); + } + } + } +}
\ 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 d4c43d983e83..58c96a0ae290 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterDoNotImplementExtensionMethods.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterDoNotImplementExtensionMethods.java @@ -10,5 +10,6 @@ interface B<T> extends A<T> { class MyClass<T> implements B<T> { @Override public void m2() { + <caret> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterEnumConstant.java b/java/java-tests/testData/codeInsight/overrideImplement/afterEnumConstant.java index 8efbedc9b649..e01e890b777b 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterEnumConstant.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterEnumConstant.java @@ -17,6 +17,7 @@ enum E{ E1 { @Override public void foo() { + <caret> } }; public abstract void foo(); diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterImplementExtensionMethods.java b/java/java-tests/testData/codeInsight/overrideImplement/afterImplementExtensionMethods.java index 0d3c41282638..93b1bc215225 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterImplementExtensionMethods.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterImplementExtensionMethods.java @@ -5,5 +5,6 @@ interface A<T> { class MyClass<T> implements A<T> { @Override public void m(T t) { + <caret> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterIncomplete.java b/java/java-tests/testData/codeInsight/overrideImplement/afterIncomplete.java index d80beeed94ab..6b2edbcedf42 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterIncomplete.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterIncomplete.java @@ -1,4 +1,5 @@ class S implements Runnable { public void run() { + <caret> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterLongFinalParameterList.java b/java/java-tests/testData/codeInsight/overrideImplement/afterLongFinalParameterList.java index 512e937bd8ec..df1d66407410 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterLongFinalParameterList.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterLongFinalParameterList.java @@ -11,5 +11,6 @@ abstract class B implements A{ final String pppppppppppp6, final String pppppppppppp7, final String pppppppppppp8) { + <caret> } }
\ 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 43775c74f60a..3c68f49ee9ab 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterLongParameterList.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterLongParameterList.java @@ -10,5 +10,6 @@ abstract class B implements A{ String p5, String p6, String p7) { + <caret> } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterOverrideExtensionMethods.java b/java/java-tests/testData/codeInsight/overrideImplement/afterOverrideExtensionMethods.java index aaf31a506281..43c9a16301ce 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterOverrideExtensionMethods.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterOverrideExtensionMethods.java @@ -5,6 +5,7 @@ interface A<T> { class MyClass<T> implements A<T> { @Override public void m(T t) { + <caret> } public MyClass() { diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterRawSuper.java b/java/java-tests/testData/codeInsight/overrideImplement/afterRawSuper.java index fb2c61ed5e21..d850e4a9f328 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterRawSuper.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterRawSuper.java @@ -20,5 +20,6 @@ interface A<T> { class B implements A { public void foo() { + <caret> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterResolveTypeParamConflict.java b/java/java-tests/testData/codeInsight/overrideImplement/afterResolveTypeParamConflict.java index ead6e41dbdc6..6dae27eec05d 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterResolveTypeParamConflict.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterResolveTypeParamConflict.java @@ -5,5 +5,6 @@ abstract class A1<X>{ class B1<T> extends A1<T>{ @Override <T1> void foo(T1 t1, T t) { + <caret> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterSubstituteBoundInMethodTypeParam.java b/java/java-tests/testData/codeInsight/overrideImplement/afterSubstituteBoundInMethodTypeParam.java index fa1102c946fe..4460d521e7b7 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterSubstituteBoundInMethodTypeParam.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterSubstituteBoundInMethodTypeParam.java @@ -21,5 +21,6 @@ abstract class A<T> { @Override <S extends Throwable> void foo(S s) { + <caret> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterSubstitutionInTypeParametersList.java b/java/java-tests/testData/codeInsight/overrideImplement/afterSubstitutionInTypeParametersList.java index ae7841a24ac2..71f41457d50d 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterSubstitutionInTypeParametersList.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterSubstitutionInTypeParametersList.java @@ -5,5 +5,6 @@ abstract class IX<T> { class XXC<S> extends IX<Throwable> { @Override <S extends Throwable> void foo() { + <caret> } } diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterTypeParam.java b/java/java-tests/testData/codeInsight/overrideImplement/afterTypeParam.java index ff912509dd7b..007c4e44eea6 100644 --- a/java/java-tests/testData/codeInsight/overrideImplement/afterTypeParam.java +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterTypeParam.java @@ -4,5 +4,6 @@ interface Function<S> { class Bar extends Function<String>{ public void fun(Function<String> function) { + <caret> } }
\ No newline at end of file diff --git a/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/expected.xml b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/expected.xml index 8a0d3d38518e..46addf64a834 100644 --- a/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/expected.xml +++ b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/expected.xml @@ -14,105 +14,4 @@ <problem_class>Default File Template Usage</problem_class> <description>Default File template</description> </problem> - - <problem> - <file>X.java</file> - <line>17</line> - <package>x</package> - <class> - <name>X</name> - <display_name>X</display_name> - </class> - <problem_class>Default File Template Usage</problem_class> - <description>Default File template</description> -</problem> - -<problem> - <file>X.java</file> - <line>22</line> - <package>x</package> - <class> - <name>X</name> - <display_name>X</display_name> - </class> - <problem_class>Default File Template Usage</problem_class> - <description>Default File template</description> -</problem> - -<problem> - <file>X.java</file> - <line>31</line> - <method> - <name>int hashCode()</name> - <display_name>hashCode()</display_name> - <package>x</package> - <class> - <name>X</name> - <display_name>X</display_name> - </class> - </method> - <problem_class>Default File Template Usage</problem_class> - <description>Default File template</description> -</problem> - -<problem> - <file>X.java</file> - <line>27</line> - <method> - <name>void g()</name> - <display_name>g()</display_name> - <package>x</package> - <class> - <name>X</name> - <display_name>X</display_name> - </class> - </method> - <problem_class>Default File Template Usage</problem_class> - <description>Default File template</description> -</problem> - -<problem> - <file>X.java</file> - <line>35</line> - <method> - <name>String toString()</name> - <display_name>toString()</display_name> - <package>x</package> - <class> - <name>X</name> - <display_name>X</display_name> - </class> - </method> - <problem_class>Default File Template Usage</problem_class> - <description>Default File template</description> -</problem> - -<problem> - <file>X.java</file> - <line>39</line> - <method> - <name>void run()</name> - <display_name>run()</display_name> - <package>x</package> - <class> - <name>X</name> - <display_name>X</display_name> - </class> - </method> - <problem_class>Default File Template Usage</problem_class> - <description>Default File template</description> -</problem> - - <problem> - <file>X.java</file> - <line>63</line> - <package>x</package> - <class> - <name>X</name> - <display_name>X</display_name> - </class> - <problem_class>Default File Template Usage</problem_class> - <description>Default File template</description> - </problem> - </problems>
\ No newline at end of file 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 bcd930a14de4..c77b8f372e74 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 @@ -2,11 +2,7 @@ package x; import java.io.*; /** - * Created with IntelliJ IDEA. - * User: Alexey - * Date: 02.12.2005 - * Time: 0:24:14 - * To change this template use File | Settings | File Templates. + * Created by Alexey on 02.12.2005. */ public class X implements Runnable{ File f; //kkj lkkl jjkuufdffffjkkjjh kjh kjhj kkjh kjh i k kj kj klj lkj lkj lkjl kj klkl kl @@ -14,12 +10,12 @@ public class X implements Runnable{ try { f=null; } catch (Exception e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + e.printStackTrace(); } try { g(); } catch (Exception ex) { - ex.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + ex.printStackTrace(); } } @@ -28,11 +24,11 @@ public class X implements Runnable{ } public int hashCode() { - return super.hashCode(); //To change body of overridden methods use File | Settings | File Templates. + return super.hashCode(); } public String toString() { - return super.toString(); //To change body of overridden methods use File | Settings | File Templates. + return super.toString(); } public void run() { @@ -60,7 +56,7 @@ public class X implements Runnable{ try { g(); } catch (EOFException | FileNotFoundException ex) { - ex.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + ex.printStackTrace(); } } } diff --git a/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X2.java b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X2.java index 2c43737e9a7a..89efeb89d00b 100644 --- a/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X2.java +++ b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X2.java @@ -2,11 +2,7 @@ package x; import java.io.*; /** - * Created with IntelliJ IDEA. - * User: Alexey - * Date: 02.12.2005 - * Time: 0:24:14 - * To change this template use File | Settings | File Templates. + * Created by Alexey on 02.12.2005. */ public class X2 { } diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllFromLiteral.java b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllFromLiteral.java new file mode 100644 index 000000000000..1516ee3b8a6e --- /dev/null +++ b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllFromLiteral.java @@ -0,0 +1,6 @@ +class B { + public static void foo(boolean f) { + Object[] objs = new Object[0]; + System.out.println(objs[<caret>9] != null ? Integer.valueOf(objs[9].toString()) : null); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllFromLiteral_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllFromLiteral_after.java new file mode 100644 index 000000000000..0694e9bca315 --- /dev/null +++ b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/replaceAllFromLiteral_after.java @@ -0,0 +1,9 @@ +class B { + + public static final int NINE = 9; + + public static void foo(boolean f) { + Object[] objs = new Object[0]; + System.out.println(objs[NINE] != null ? Integer.valueOf(objs[NINE].toString()) : null); + } +}
\ No newline at end of file |