From ec3fb1e06285c0467a7a20360ca80453bc7635d4 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Fri, 31 May 2013 07:45:51 -0700 Subject: Snapshot 568f05589922685b8c8f9a2f2f465043b8128542 from master branch of git://git.jetbrains.org/idea/community.git Change-Id: I47fe8cb5d8a3c9876cd4c313dca1a8cc531288ec --- .../normal/MethodCallBeforeAnnotation.java | 6 +++ .../normal/MethodCallBeforeAnnotation_After.java | 6 +++ .../completion/normal/MethodNoPairBrace_after.java | 2 +- ...ethodWithLeftParTailTypeNoPairBrace_after2.java | 2 +- .../completion/smartType/NewByteArray2.java | 10 ++++ .../smartType/NoTailWhenNoPairBracket-out.java | 2 +- .../smartType/NoTailWhenNoPairBracket2-out.java | 2 +- .../advHighlighting7/IDEA78916.java | 10 ++++ .../genericsHighlighting/IDEA105846.java | 1 + .../genericsHighlighting/IDEA106964.java | 12 +++++ .../genericsHighlighting/IDEA107782.java | 15 ++++++ .../genericsHighlighting/IDEA107957.java | 37 +++++++++++++ .../lambda/completion/normal/SelfStaticsOnly.java | 14 +++++ .../lambda/interfaceMethods/StaticMethodCalls.java | 25 +++++++++ .../lambda/methodRef/RefOnArrayDeclaration.java | 13 +++++ .../lambda/methodRef/VarargsMethodRef.java | 26 +++++++++ .../createPropertyFromUsage/afterFieldExist.java | 2 +- .../createPropertyFromUsage/afterSimple.java | 2 +- .../quickFix/iterateOver/before4.java | 6 +++ .../replaceWithTernaryOperator/afterChain.java | 2 +- .../quickFix/varTypeFromCall/after1.java | 2 +- .../varTypeFromCall/after2TypeParamsInOneCall.java | 2 +- .../afterAnotherParamTypeChange.java | 2 +- .../quickFix/varTypeFromCall/afterBoxing.java | 2 +- .../quickFix/varTypeFromCall/afterCompound.java | 2 +- .../quickFix/varTypeFromCall/afterMixed.java | 2 +- .../quickFix/varTypeFromCall/before1.java | 2 +- .../before2TypeParamsInOneCall.java | 2 +- .../beforeAnotherParamTypeChange.java | 2 +- .../quickFix/varTypeFromCall/beforeBoxing.java | 2 +- .../beforeChangeSignatureAvailable.java | 2 +- .../quickFix/varTypeFromCall/beforeCompound.java | 2 +- .../quickFix/varTypeFromCall/beforeMixed.java | 2 +- .../quickFix/variableArrayType/after1.java | 2 +- .../quickFix/variableArrayType/after2.java | 2 +- .../quickFix/variableArrayType/after3.java | 2 +- .../quickFix/variableArrayType/after4.java | 2 +- .../quickFix/variableArrayType/after5.java | 2 +- .../quickFix/variableArrayType/after6.java | 2 +- .../quickFix/variableArrayType/after9.java | 2 +- .../quickFix/variableArrayType/before1.java | 2 +- .../quickFix/variableArrayType/before2.java | 2 +- .../quickFix/variableArrayType/before3.java | 2 +- .../quickFix/variableArrayType/before4.java | 2 +- .../quickFix/variableArrayType/before5.java | 2 +- .../quickFix/variableArrayType/before6.java | 2 +- .../quickFix/variableArrayType/before7.java | 2 +- .../quickFix/variableArrayType/before8.java | 2 +- .../quickFix/variableArrayType/before9.java | 2 +- .../quickFix/variableParameterizedType/after1.java | 2 +- .../variableParameterizedType/before1.java | 2 +- .../variableParameterizedType/before2.java | 2 +- .../quickFix/variableType/after1.java | 2 +- .../quickFix/variableType/after2.java | 2 +- .../quickFix/variableType/after3.java | 2 +- .../quickFix/variableType/after4.java | 2 +- .../quickFix/variableType/after5.java | 2 +- .../quickFix/variableType/afterInCall.java | 2 +- .../quickFix/variableType/before1.java | 2 +- .../quickFix/variableType/before2.java | 2 +- .../quickFix/variableType/before3.java | 2 +- .../quickFix/variableType/before4.java | 2 +- .../quickFix/variableType/before5.java | 2 +- .../quickFix/variableType/beforeInCall.java | 2 +- .../quickFix/variableType/beforeInLibCall.java | 2 +- .../javaMethodsOverridingStatistics/Methods.java | 30 +++++++++++ .../javaMethodsOverridingStatistics/Methods2.java | 31 +++++++++++ .../javaMethodsOverridingStatistics/Methods3.java | 39 ++++++++++++++ .../javaMethodsOverridingStatistics/Methods4.java | 40 ++++++++++++++ .../javaMethodsOverridingStatistics/Methods5.java | 63 ++++++++++++++++++++++ .../invertIfCondition/afterParenthesis.java | 10 ++++ .../invertIfCondition/beforeParenthesis.java | 9 ++++ .../testData/codeInsight/javadocIG/literal.html | 2 + .../testData/codeInsight/javadocIG/literal.java | 6 +++ .../overrideImplement/afterRawInheritance.java | 11 ++++ .../overrideImplement/beforeRawInheritance.java | 8 +++ 76 files changed, 482 insertions(+), 52 deletions(-) create mode 100644 java/java-tests/testData/codeInsight/completion/normal/MethodCallBeforeAnnotation.java create mode 100644 java/java-tests/testData/codeInsight/completion/normal/MethodCallBeforeAnnotation_After.java create mode 100644 java/java-tests/testData/codeInsight/completion/smartType/NewByteArray2.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA106964.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA107782.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA107957.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/completion/normal/SelfStaticsOnly.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/StaticMethodCalls.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/VarargsMethodRef.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/iterateOver/before4.java create mode 100644 java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods.java create mode 100644 java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods2.java create mode 100644 java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods3.java create mode 100644 java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods4.java create mode 100644 java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods5.java create mode 100644 java/java-tests/testData/codeInsight/invertIfCondition/afterParenthesis.java create mode 100644 java/java-tests/testData/codeInsight/invertIfCondition/beforeParenthesis.java create mode 100644 java/java-tests/testData/codeInsight/javadocIG/literal.html create mode 100644 java/java-tests/testData/codeInsight/javadocIG/literal.java create mode 100644 java/java-tests/testData/codeInsight/overrideImplement/afterRawInheritance.java create mode 100644 java/java-tests/testData/codeInsight/overrideImplement/beforeRawInheritance.java (limited to 'java/java-tests/testData/codeInsight') diff --git a/java/java-tests/testData/codeInsight/completion/normal/MethodCallBeforeAnnotation.java b/java/java-tests/testData/codeInsight/completion/normal/MethodCallBeforeAnnotation.java new file mode 100644 index 000000000000..2cb308ff53e0 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/normal/MethodCallBeforeAnnotation.java @@ -0,0 +1,6 @@ +class MyClass { + String hc = this. + + @Annotation + public void myAnnotatedMethod() {} +} diff --git a/java/java-tests/testData/codeInsight/completion/normal/MethodCallBeforeAnnotation_After.java b/java/java-tests/testData/codeInsight/completion/normal/MethodCallBeforeAnnotation_After.java new file mode 100644 index 000000000000..71da13a48a8b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/normal/MethodCallBeforeAnnotation_After.java @@ -0,0 +1,6 @@ +class MyClass { + String hc = this.toString() + + @Annotation + public void myAnnotatedMethod() {} +} diff --git a/java/java-tests/testData/codeInsight/completion/normal/MethodNoPairBrace_after.java b/java/java-tests/testData/codeInsight/completion/normal/MethodNoPairBrace_after.java index c976d92117e9..b7841df3ff15 100644 --- a/java/java-tests/testData/codeInsight/completion/normal/MethodNoPairBrace_after.java +++ b/java/java-tests/testData/codeInsight/completion/normal/MethodNoPairBrace_after.java @@ -3,6 +3,6 @@ class MyClass { void foo() {} { - foo( + foo(); } } \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/normal/MethodWithLeftParTailTypeNoPairBrace_after2.java b/java/java-tests/testData/codeInsight/completion/normal/MethodWithLeftParTailTypeNoPairBrace_after2.java index c976d92117e9..b7841df3ff15 100644 --- a/java/java-tests/testData/codeInsight/completion/normal/MethodWithLeftParTailTypeNoPairBrace_after2.java +++ b/java/java-tests/testData/codeInsight/completion/normal/MethodWithLeftParTailTypeNoPairBrace_after2.java @@ -3,6 +3,6 @@ class MyClass { void foo() {} { - foo( + foo(); } } \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NewByteArray2.java b/java/java-tests/testData/codeInsight/completion/smartType/NewByteArray2.java new file mode 100644 index 000000000000..646b1081aa1e --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/smartType/NewByteArray2.java @@ -0,0 +1,10 @@ +public class Bug17 { + + private void f(byte[] d) { + } + + private void g() { + f(new ); + } + +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NoTailWhenNoPairBracket-out.java b/java/java-tests/testData/codeInsight/completion/smartType/NoTailWhenNoPairBracket-out.java index 6d72b12564fd..3580d9cd6b9b 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/NoTailWhenNoPairBracket-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/NoTailWhenNoPairBracket-out.java @@ -1,6 +1,6 @@ class A { { String x; - Class c = x.getClass( + Class c = x.getClass() } } \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NoTailWhenNoPairBracket2-out.java b/java/java-tests/testData/codeInsight/completion/smartType/NoTailWhenNoPairBracket2-out.java index 5dbeaa6dfecc..63fd0d5fda0f 100644 --- a/java/java-tests/testData/codeInsight/completion/smartType/NoTailWhenNoPairBracket2-out.java +++ b/java/java-tests/testData/codeInsight/completion/smartType/NoTailWhenNoPairBracket2-out.java @@ -1,6 +1,6 @@ class A { { - Class c = this.xxxxx( + Class c = this.xxxxx() } Class xxxxx() {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java index 214a3aec4bd6..fa1ed556fe86 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/IDEA78916.java @@ -35,4 +35,14 @@ abstract class EnumPrivateMethodTest2 { public abstract void execute(); private void firstMethod() {} +} + +class Test { + private class Foo { + private Foo() {} + + { + new Foo(){}; + } + } } \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA105846.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA105846.java index 8b9c700484c9..04d39bd4c2ce 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA105846.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA105846.java @@ -1,5 +1,6 @@ class MyClass { public static void main(Class clazz){ clazz = (Class) clazz.getSuperclass(); + clazz = clazz.getSuperclass(); } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA106964.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA106964.java new file mode 100644 index 000000000000..8c8603ebb770 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA106964.java @@ -0,0 +1,12 @@ +import java.io.Serializable; + +public abstract class Test { + + abstract T test(Class cls); + + abstract T test(Serializable type); + + private void call(){ + String s = test(String[].class); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA107782.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA107782.java new file mode 100644 index 000000000000..a078c65ddf22 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA107782.java @@ -0,0 +1,15 @@ +public class Test { + { + final MyResult hello = parseXML(new Parser()); + } + public > R parseXML(P parser) { + R result = null; + return result; + } +} +class MyResult {} + +class AbstractParser {} +interface Result {} +class Parser extends AbstractParser implements Result {} + diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA107957.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA107957.java new file mode 100644 index 000000000000..1228be1a48b7 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA107957.java @@ -0,0 +1,37 @@ +class Test1 { + + private static final Foo test = new Foo().method(Boolean.TRUE); + + public static void main(String[] args) { + System.out.println(test); + } + + public static class Foo { + public Foo method(boolean arg) { + return null; + } + + public > Foo method(T arg) { + return null; + } + } +} + +class Test2 { + + private static final Foo test = Foo.method(Boolean.TRUE); + + public static void main(String[] args) { + System.out.println(test); + } + + public static class Foo { + public static Foo method(boolean arg) { + return null; + } + + public static > Foo method(T arg) { + return null; + } + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/completion/normal/SelfStaticsOnly.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/completion/normal/SelfStaticsOnly.java new file mode 100644 index 000000000000..b9f90eb26b39 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/completion/normal/SelfStaticsOnly.java @@ -0,0 +1,14 @@ +interface Function { + public R apply(T t); + + static Function baz() { + return k -> k; + } +} + +interface IFunction extends Function { + static void bar() {} + static void ba() { + ba + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/StaticMethodCalls.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/StaticMethodCalls.java new file mode 100644 index 000000000000..0c517e99a7c7 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/StaticMethodCalls.java @@ -0,0 +1,25 @@ + +class Bug { + + interface Function { + public R apply(T t); + + static Function identity() { + return k -> k; + } + } + + interface IFunction extends Function { + static void a() { + Function identity = identity(); + } + } + + public void foo() { + Function f = Function.identity(); + + Function g = f.identity(); + + Function h = IFunction.identity(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/RefOnArrayDeclaration.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/RefOnArrayDeclaration.java index 3ed7e3ef5863..0fa9c841bad5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/RefOnArrayDeclaration.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/RefOnArrayDeclaration.java @@ -45,3 +45,16 @@ class OnArrayTest { ObjectArrayReturnType a5 = Foo[]::new; } } + + +class IDEA106973 { + interface Function { + R apply(T t); + } + + { + Function a = String[] :: new; + Function a1 = String[] :: new; + Function a2 = String[] :: new; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/VarargsMethodRef.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/VarargsMethodRef.java new file mode 100644 index 000000000000..7edfd281125b --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/VarargsMethodRef.java @@ -0,0 +1,26 @@ +import java.util.List; + +class Test { + void a(List range1, List range2) { + zip(range1, range2, Test::asList); + I1 i = Test :: asList; + } + + public static List zip(List a, + List b, + BiFunction zipper) { + return null; + } + + public interface BiFunction { + R apply(T t, U u); + } + + public static List asList(T... a) { + return null; + } + + interface I1 { + List a(T... t); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createPropertyFromUsage/afterFieldExist.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createPropertyFromUsage/afterFieldExist.java index e9baac3ecec6..f20329a07a2c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createPropertyFromUsage/afterFieldExist.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createPropertyFromUsage/afterFieldExist.java @@ -6,7 +6,7 @@ class Calculator { setI(0); } - public void setI(int i) { + void setI(int i) { this.i = i; } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createPropertyFromUsage/afterSimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createPropertyFromUsage/afterSimple.java index b28d93da9668..69c33ebbf512 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createPropertyFromUsage/afterSimple.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createPropertyFromUsage/afterSimple.java @@ -6,7 +6,7 @@ class Calculator { setI(0); } - public void setI(int i) { + void setI(int i) { this.i = i; } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/iterateOver/before4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/iterateOver/before4.java new file mode 100644 index 000000000000..a355f5bccf9a --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/iterateOver/before4.java @@ -0,0 +1,6 @@ +// "Iterate" "false" +class Test { + void foo() { + java.lang.this + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/afterChain.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/afterChain.java index 7d3370d33743..cd556b8e20c5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/afterChain.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithTernaryOperator/afterChain.java @@ -5,6 +5,6 @@ import java.lang.Integer; class A{ void test(){ Integer integer = null; - int i = integer != null ? integer.toString().length() : 0; + int i = integer != null ? integer.toString().length() : 0; } } \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after1.java index a89027da2136..f5d44dbe1839 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after1.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'List'" "true" +// "Change variable 'list' type to 'List'" "true" public class Test { void foo() { List list = new List<>(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after2TypeParamsInOneCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after2TypeParamsInOneCall.java index 622c3e2ee5ad..a7a54e2f5314 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after2TypeParamsInOneCall.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/after2TypeParamsInOneCall.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'Lost'" "true" +// "Change variable 'list' type to 'Lost'" "true" public class Test { void foo() { Lost list = new Lost<>(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterAnotherParamTypeChange.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterAnotherParamTypeChange.java index 1b85916f8be8..fbae0b98b25b 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterAnotherParamTypeChange.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterAnotherParamTypeChange.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'Lost'" "true" +// "Change variable 'list' type to 'Lost'" "true" public class Test { void foo() { Lost list = new Lost<>(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterBoxing.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterBoxing.java index 1b438506e6b7..0818ad2a9ac3 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterBoxing.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterBoxing.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'List'" "true" +// "Change variable 'list' type to 'List'" "true" public class Test { void foo() { List list = new List<>(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterCompound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterCompound.java index a6e6d60528af..67cc9ed9f6bd 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterCompound.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterCompound.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'Lost'" "true" +// "Change variable 'list' type to 'Lost'" "true" public class Test { void foo() { Lost list = new Lost<>(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterMixed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterMixed.java index 802baaf854cf..ce1f568e7cc5 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterMixed.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/afterMixed.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'Lost'" "true" +// "Change variable 'list' type to 'Lost'" "true" public class Test { void foo() { Lost list = new Lost<>(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before1.java index c14b8344e1e5..d35d424c2488 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before1.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'List'" "true" +// "Change variable 'list' type to 'List'" "true" public class Test { void foo() { List list = new List(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before2TypeParamsInOneCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before2TypeParamsInOneCall.java index ee27ed36ef87..9dd0ab113f92 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before2TypeParamsInOneCall.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/before2TypeParamsInOneCall.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'Lost'" "true" +// "Change variable 'list' type to 'Lost'" "true" public class Test { void foo() { Lost list = new Lost(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeAnotherParamTypeChange.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeAnotherParamTypeChange.java index 61e868401f9d..f4558d127cd1 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeAnotherParamTypeChange.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeAnotherParamTypeChange.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'Lost'" "true" +// "Change variable 'list' type to 'Lost'" "true" public class Test { void foo() { Lost list = new Lost(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeBoxing.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeBoxing.java index 1d02b919f259..88778caa7dbe 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeBoxing.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeBoxing.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'List'" "true" +// "Change variable 'list' type to 'List'" "true" public class Test { void foo() { List list = new List(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeChangeSignatureAvailable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeChangeSignatureAvailable.java index 9f5ec3b360f3..a2206b0dffa0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeChangeSignatureAvailable.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeChangeSignatureAvailable.java @@ -1,4 +1,4 @@ -// "Change 'var' type to 'Foo" "false" +// "Change variable 'var' type to 'Foo" "false" public class Test { void foo() { final Foo var = new Foo(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeCompound.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeCompound.java index aa2eb0c34b5b..7f2dc11db7b0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeCompound.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeCompound.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'Lost'" "true" +// "Change variable 'list' type to 'Lost'" "true" public class Test { void foo() { Lost list = new Lost(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeMixed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeMixed.java index b0d6caba242e..074e647bb666 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeMixed.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/varTypeFromCall/beforeMixed.java @@ -1,4 +1,4 @@ -// "Change 'list' type to 'Lost'" "true" +// "Change variable 'list' type to 'Lost'" "true" public class Test { void foo() { Lost list = new Lost(); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after1.java index b7f7e63beada..06c81a45122c 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after1.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'int[][]'" "true" +// "Change variable 'test' type to 'int[][]'" "true" class A { void m() { final int[][] test = {new int[]{1}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after2.java index 1cadb610b614..2f4ebd38f60e 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after2.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'int[][]'" "true" +// "Change variable 'test' type to 'int[][]'" "true" class A { void m() { int[][] test = new int[][]{{1}, {2}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after3.java index 1cadb610b614..2f4ebd38f60e 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after3.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'int[][]'" "true" +// "Change variable 'test' type to 'int[][]'" "true" class A { void m() { int[][] test = new int[][]{{1}, {2}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after4.java index 89ddf94292b8..0a68cc26922b 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after4.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'int[][]'" "true" +// "Change variable 'test' type to 'int[][]'" "true" class A { void m() { int[][] test = new int[][]{{1}, {2}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after5.java index 8893a91e69fc..9534a4f00263 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after5.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after5.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'char[]'" "true" +// "Change variable 'test' type to 'char[]'" "true" class A { void m() { final char[] test = new char[]{'a'}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after6.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after6.java index 0debead314ba..5aec9e239fda 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after6.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after6.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'char[]'" "true" +// "Change variable 'test' type to 'char[]'" "true" class A { void m() { final char[] test = {'a'}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after9.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after9.java index a74a518b53d2..896709fd6d48 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after9.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/after9.java @@ -1,4 +1,4 @@ -// "Change 'myArr' type to 'char[][]'" "true" +// "Change field 'myArr' type to 'char[][]'" "true" class A extends B { void m() { myArr = new char[][]{{'a'}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before1.java index 34cc492c381b..e61ec518d591 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before1.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'int[][]'" "true" +// "Change variable 'test' type to 'int[][]'" "true" class A { void m() { final Long[][] test = {new int[]{1}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before2.java index be9e287fb8a0..e79fc74e9c35 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before2.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'int[][]'" "true" +// "Change variable 'test' type to 'int[][]'" "true" class A { void m() { Long[][][] test = new Long[]{{1}, {2}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before3.java index 35e45cda3fc9..c191198e9fd1 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before3.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'int[][]'" "true" +// "Change variable 'test' type to 'int[][]'" "true" class A { void m() { Long[] test = new Long[]{{1}, {2}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before4.java index 007800e9a14a..4fa4be453cd1 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before4.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'int[][]'" "true" +// "Change variable 'test' type to 'int[][]'" "true" class A { void m() { Long test = new Long[][][][]{{1}, {2}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before5.java index a048c226b3b7..f9e177a3d536 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before5.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before5.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'char[]'" "true" +// "Change variable 'test' type to 'char[]'" "true" class A { void m() { final Long[] test = new Long[]{'a'}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before6.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before6.java index 2e5b97facb56..be8d3f8eb2c3 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before6.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before6.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'char[]'" "true" +// "Change variable 'test' type to 'char[]'" "true" class A { void m() { final Long[] test = {'a'}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before7.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before7.java index 769d8702ef27..ca5e5eae12ce 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before7.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before7.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'char[]'" "false" +// "Change variable 'test' type to 'char[]'" "false" class A { void m() { final Long[] test = {'a', 1}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before8.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before8.java index 0d64ee5c9fcf..cd07ae809cc0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before8.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before8.java @@ -1,4 +1,4 @@ -// "Change 'test' type to 'char[][]'" "false" +// "Change variable 'test' type to 'char[][]'" "false" class A { void m() { final Long[] test = {{'a'}, {1}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before9.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before9.java index de6366635241..24cc6b333e0a 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before9.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableArrayType/before9.java @@ -1,4 +1,4 @@ -// "Change 'myArr' type to 'char[][]'" "true" +// "Change field 'myArr' type to 'char[][]'" "true" class A extends B { void m() { myArr = new String[][]{{'a'}}; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/after1.java index ea910a376e26..7c815dc671df 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/after1.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'a.i.ii'" "true" +// "Change variable 'i' type to 'a.i.ii'" "true" class a { class i { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before1.java index defc656a39bc..74da8a65c2a8 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before1.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'a.i.ii'" "true" +// "Change variable 'i' type to 'a.i.ii'" "true" class a { class i { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before2.java index 88cad2eb3182..c3533aa3a2d9 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType/before2.java @@ -1,4 +1,4 @@ -// "Change 's' type to 'O.f'" "false" +// "Change variable 's' type to 'O.f'" "false" class O { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after1.java index a588bf7ca6cb..4a73de6bc448 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after1.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'double'" "true" +// "Change variable 'i' type to 'double'" "true" import java.io.*; class a { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after2.java index 3ee033ef199f..d2f02dbe44b1 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after2.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'java.lang.String'" "true" +// "Change variable 'i' type to 'java.lang.String'" "true" import java.io.*; class a { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after3.java index 61d52c1f5fba..e29ef26f5e40 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after3.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'char'" "true" +// "Change variable 'i' type to 'char'" "true" import java.io.*; class a { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after4.java index d7b4163a314c..4b4f439c9357 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after4.java @@ -1,4 +1,4 @@ -// "Change 's' type to 'java.lang.Runnable'" "true" +// "Change field 's' type to 'java.lang.Runnable'" "true" class a { Runnable s = new Runnable() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after5.java index 6a7f841ed917..84d685079ce1 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after5.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after5.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'java.lang.String'" "true" +// "Change parameter 'i' type to 'java.lang.String'" "true" class Base { void foo(String i) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterInCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterInCall.java index 35b290412756..f70713593395 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterInCall.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/afterInCall.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'java.lang.String'" "true" +// "Change parameter 'i' type to 'java.lang.String'" "true" class Ex{ void foo(String i) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before1.java index 4e8742b2e9b4..245c148c0db9 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before1.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'double'" "true" +// "Change variable 'i' type to 'double'" "true" import java.io.*; class a { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before2.java index 6b80da62b6d8..9591611b1755 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before2.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before2.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'java.lang.String'" "true" +// "Change variable 'i' type to 'java.lang.String'" "true" import java.io.*; class a { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before3.java index f94ad9a32c8b..de69713a5141 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before3.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before3.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'char'" "true" +// "Change variable 'i' type to 'char'" "true" import java.io.*; class a { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before4.java index 6265e56ae49f..b93daef185e9 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before4.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before4.java @@ -1,4 +1,4 @@ -// "Change 's' type to 'java.lang.Runnable'" "true" +// "Change field 's' type to 'java.lang.Runnable'" "true" class a { String s = new Runnable() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before5.java index 7ead73836998..e2ce5b4c3de7 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before5.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before5.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'java.lang.String'" "true" +// "Change parameter 'i' type to 'java.lang.String'" "true" class Base { void foo(int i) {} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInCall.java index 92a32c9c2ab3..4c4999a6492a 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInCall.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInCall.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'java.lang.String'" "true" +// "Change parameter 'i' type to 'java.lang.String'" "true" class Ex{ void foo(int i) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInLibCall.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInLibCall.java index 337af8a3215b..62fde5e18e26 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInLibCall.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/beforeInLibCall.java @@ -1,4 +1,4 @@ -// "Change 'i' type to 'long'" "false" +// "Change parameter 'i' type to 'long'" "false" class M extends Thread { @Override diff --git a/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods.java b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods.java new file mode 100644 index 000000000000..b7c36e935e7b --- /dev/null +++ b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods.java @@ -0,0 +1,30 @@ +import java.lang.Override; +import java.lang.String; + +class BaseClass { + public void method() { + //do nothing + } + + public void method2() { + + } +} + +class ClassEx1 extends BaseClass { + @Override + public void method() { + } +} + +class ClassEx2 extends BaseClass { + public void method() { + } + + public void method(String aString) { + } +} + +class MyClass extends BaseClass { + +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods2.java b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods2.java new file mode 100644 index 000000000000..931d40b80e48 --- /dev/null +++ b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods2.java @@ -0,0 +1,31 @@ +import java.lang.Override; +import java.lang.String; + +class BaseClass { + public void method() { + //do nothing + } + + public void method(String s) { + //do nothing + } +} + +class ClassEx1 extends BaseClass { + @Override + public void method() { + } + + @Override + public void method(String s) { + } +} + +class ClassEx2 extends BaseClass { + public void method() { + } +} + +class MyClass extends BaseClass { + +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods3.java b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods3.java new file mode 100644 index 000000000000..d79ab2f7a32a --- /dev/null +++ b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods3.java @@ -0,0 +1,39 @@ +import java.lang.Override; +import java.lang.String; + +class BaseClass { + public void method() { + //do nothing + } + + public void method(String s) { + //do nothing + } +} + +class ClassEx1 extends BaseClass { + @Override + public void method() { + } + + @Override + public void method(String s) { + } + + public void method2() { + } +} + +class ClassEx11 extends ClassEx1 { + public void method2() { + } +} + +class ClassEx2 extends BaseClass { + public void method() { + } +} + +class MyClass extends ClassEx1 { + +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods4.java b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods4.java new file mode 100644 index 000000000000..0295f9f94058 --- /dev/null +++ b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods4.java @@ -0,0 +1,40 @@ +import java.lang.Override; +import java.lang.String; + +class BaseClass { + public void method() { + //do nothing + } + + public void method(String s) { + //do nothing + } +} + +class ClassEx1 extends BaseClass { + @Override + public void method(String s) { + } + + public void method2() { + } +} + +class ClassEx11 extends ClassEx1 { + public void method2() { + } +} + +class ClassEx2 extends BaseClass { + public void method() { + } +} + +class ClassEx3 extends BaseClass { + public void method() { + } +} + +class MyClass extends ClassEx1 { + +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods5.java b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods5.java new file mode 100644 index 000000000000..a330bf3ddc39 --- /dev/null +++ b/java/java-tests/testData/codeInsight/generation/javaMethodsOverridingStatistics/Methods5.java @@ -0,0 +1,63 @@ +import java.lang.Override; +import java.lang.String; + +class BaseClass { + public void method() { + //do nothing + } + + public void method(String s) { + //do nothing + } +} + +class ClassEx2 extends BaseClass { + public void method() { + } +} + +class ClassEx3 extends BaseClass { + public void method() { + } +} + +class ClassEx1 extends BaseClass { + @Override + public void method(String s) { + } + + public void method2() { + } +} + +class ClassEx11 extends ClassEx1 { + @Override + public void method(String s) { + } + + public void method2() { + } +} + +class ClassEx12 extends ClassEx1 { + @Override + public void method(String s) { + } + + public void method2() { + } +} + +class ClassEx13 extends ClassEx1 { + @Override + public void method(String s) { + } + + public void method2() { + } +} + + +class MyClass extends ClassEx1 { + +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/invertIfCondition/afterParenthesis.java b/java/java-tests/testData/codeInsight/invertIfCondition/afterParenthesis.java new file mode 100644 index 000000000000..19bb3770a235 --- /dev/null +++ b/java/java-tests/testData/codeInsight/invertIfCondition/afterParenthesis.java @@ -0,0 +1,10 @@ +// "Invert If Condition" "true" +class A { + public boolean foo(boolean a, boolean b, boolean c, boolean d) { + + if ((a || b) && !c && !d) { + return true; + } + return false; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/invertIfCondition/beforeParenthesis.java b/java/java-tests/testData/codeInsight/invertIfCondition/beforeParenthesis.java new file mode 100644 index 000000000000..269790ebcd0b --- /dev/null +++ b/java/java-tests/testData/codeInsight/invertIfCondition/beforeParenthesis.java @@ -0,0 +1,9 @@ +// "Invert If Condition" "true" +class A { + public boolean foo(boolean a, boolean b, boolean c, boolean d) { + + if (!(a || b) || c || d) + return false; + return true; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/javadocIG/literal.html b/java/java-tests/testData/codeInsight/javadocIG/literal.html new file mode 100644 index 000000000000..bc3d26589fed --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/literal.html @@ -0,0 +1,2 @@ + Foo
int foo
+ foo<> \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/javadocIG/literal.java b/java/java-tests/testData/codeInsight/javadocIG/literal.java new file mode 100644 index 000000000000..a6413f50fef7 --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/literal.java @@ -0,0 +1,6 @@ +class Foo { + /** + * foo{@literal <>} + */ + int foo; +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/overrideImplement/afterRawInheritance.java b/java/java-tests/testData/codeInsight/overrideImplement/afterRawInheritance.java new file mode 100644 index 000000000000..75297f76f92b --- /dev/null +++ b/java/java-tests/testData/codeInsight/overrideImplement/afterRawInheritance.java @@ -0,0 +1,11 @@ +class Obj {} +abstract class A1{ + abstract void foo(Obj x); +} + +class B1 extends A1{ + @Override + void foo(Obj x) { + + } +} diff --git a/java/java-tests/testData/codeInsight/overrideImplement/beforeRawInheritance.java b/java/java-tests/testData/codeInsight/overrideImplement/beforeRawInheritance.java new file mode 100644 index 000000000000..f546cae063b9 --- /dev/null +++ b/java/java-tests/testData/codeInsight/overrideImplement/beforeRawInheritance.java @@ -0,0 +1,8 @@ +class Obj {} +abstract class A1{ + abstract void foo(Obj x); +} + +class B1 extends A1{ + +} -- cgit v1.2.3