diff --git a/java/java-tests/testData/codeInsight/completeStatement/AddMissingParen.java b/java/java-tests/testData/codeInsight/completeStatement/AddMissingParen.java new file mode 100644 index 000000000000..daaf1b249455 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/AddMissingParen.java @@ -0,0 +1,7 @@ + +class Foo { + abstract void a(); + { + a(; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/AddMissingParen_after.java b/java/java-tests/testData/codeInsight/completeStatement/AddMissingParen_after.java new file mode 100644 index 000000000000..3cf8eb4381a0 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/AddMissingParen_after.java @@ -0,0 +1,8 @@ + +class Foo { + abstract void a(); + + { + a(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/AddMissingSemicolon.java b/java/java-tests/testData/codeInsight/completeStatement/AddMissingSemicolon.java new file mode 100644 index 000000000000..8653358d9e78 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/AddMissingSemicolon.java @@ -0,0 +1,7 @@ + +class Foo { + abstract void a(); + { + a() + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/AddMissingSemicolon_after.java b/java/java-tests/testData/codeInsight/completeStatement/AddMissingSemicolon_after.java new file mode 100644 index 000000000000..3cf8eb4381a0 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/AddMissingSemicolon_after.java @@ -0,0 +1,8 @@ + +class Foo { + abstract void a(); + + { + a(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/AfterFor.java b/java/java-tests/testData/codeInsight/completeStatement/AfterFor.java new file mode 100644 index 000000000000..edd3a944951b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/AfterFor.java @@ -0,0 +1,6 @@ +public class Foo { + { + for(int i = 0; i < 100; i++) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/AfterFor_after.java b/java/java-tests/testData/codeInsight/completeStatement/AfterFor_after.java new file mode 100644 index 000000000000..9d15392727c8 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/AfterFor_after.java @@ -0,0 +1,7 @@ +public class Foo { + { + for(int i = 0; i < 100; i++) { + } + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/AtBlockEnd.java b/java/java-tests/testData/codeInsight/completeStatement/AtBlockEnd.java new file mode 100644 index 000000000000..f16359454a6b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/AtBlockEnd.java @@ -0,0 +1,7 @@ +public class Foo { + { + for(int i = 0; i < 100; i++) { + x = 3; + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/AtBlockEnd_after.java b/java/java-tests/testData/codeInsight/completeStatement/AtBlockEnd_after.java new file mode 100644 index 000000000000..f83fa8a5d5f8 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/AtBlockEnd_after.java @@ -0,0 +1,8 @@ +public class Foo { + { + for(int i = 0; i < 100; i++) { + x = 3; + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/BeforeFor.java b/java/java-tests/testData/codeInsight/completeStatement/BeforeFor.java new file mode 100644 index 000000000000..1b61cf5c2239 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/BeforeFor.java @@ -0,0 +1,6 @@ +public class Foo { + { + for (int i = 0; i < 100; i++) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/BeforeFor_after.java b/java/java-tests/testData/codeInsight/completeStatement/BeforeFor_after.java new file mode 100644 index 000000000000..dc6562b13392 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/BeforeFor_after.java @@ -0,0 +1,7 @@ +public class Foo { + { + + for (int i = 0; i < 100; i++) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/BeforeStatement.java b/java/java-tests/testData/codeInsight/completeStatement/BeforeStatement.java new file mode 100644 index 000000000000..a475f8b6cb1b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/BeforeStatement.java @@ -0,0 +1,5 @@ +public class Foo { + { + x = 3; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/BeforeStatement_after.java b/java/java-tests/testData/codeInsight/completeStatement/BeforeStatement_after.java new file mode 100644 index 000000000000..bcee224f3e4f --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/BeforeStatement_after.java @@ -0,0 +1,6 @@ +public class Foo { + { + + x = 3; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Block.java b/java/java-tests/testData/codeInsight/completeStatement/Block.java new file mode 100644 index 000000000000..dbc20af995d9 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Block.java @@ -0,0 +1,6 @@ + +class Foo { + { + if (x) { + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Block1.java b/java/java-tests/testData/codeInsight/completeStatement/Block1.java new file mode 100644 index 000000000000..17b9443422f7 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Block1.java @@ -0,0 +1,6 @@ +public class Foo { + { + { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Block1_after.java b/java/java-tests/testData/codeInsight/completeStatement/Block1_after.java new file mode 100644 index 000000000000..dc8bd2ed3936 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Block1_after.java @@ -0,0 +1,7 @@ +public class Foo { + { + { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Block_after.java b/java/java-tests/testData/codeInsight/completeStatement/Block_after.java new file mode 100644 index 000000000000..bfaf383f3348 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Block_after.java @@ -0,0 +1,8 @@ + +class Foo { + { + if (x) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/BraceFixeNewLine.java b/java/java-tests/testData/codeInsight/completeStatement/BraceFixeNewLine.java new file mode 100644 index 000000000000..cfc79f4929b3 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/BraceFixeNewLine.java @@ -0,0 +1,9 @@ +public class test { + void f() { + int k1 = 1; + int k2 = 2; + int[] array = new int[]{k1, k2 + + System.out.print(k1); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/BraceFixeNewLine_after.java b/java/java-tests/testData/codeInsight/completeStatement/BraceFixeNewLine_after.java new file mode 100644 index 000000000000..7a129a9e7cd4 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/BraceFixeNewLine_after.java @@ -0,0 +1,9 @@ +public class test { + void f() { + int k1 = 1; + int k2 = 2; + int[] array = new int[]{k1, k2}; + + System.out.print(k1); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CdrEndlessLoop.java b/java/java-tests/testData/codeInsight/completeStatement/CdrEndlessLoop.java new file mode 100644 index 000000000000..e22162240a48 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CdrEndlessLoop.java @@ -0,0 +1,5 @@ +public class Test { + public int foo(int i) { + int ii = foo(0 + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CdrEndlessLoop_after.java b/java/java-tests/testData/codeInsight/completeStatement/CdrEndlessLoop_after.java new file mode 100644 index 000000000000..b690a469b8f6 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CdrEndlessLoop_after.java @@ -0,0 +1,5 @@ +public class Test { + public int foo(int i) { + int ii = foo(0); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteBreak.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteBreak.java new file mode 100644 index 000000000000..5d95b11b6fa5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteBreak.java @@ -0,0 +1,8 @@ + +class Foo { + { + if (x) { + break + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteBreak_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteBreak_after.java new file mode 100644 index 000000000000..78ee45d13c93 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteBreak_after.java @@ -0,0 +1,8 @@ + +class Foo { + { + if (x) { + break; + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCall.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCall.java new file mode 100644 index 000000000000..b13eca1d3b2b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCall.java @@ -0,0 +1,6 @@ + +public class Foo { + { + foo(x); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCall_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCall_after.java new file mode 100644 index 000000000000..1c714c27b0e5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCall_after.java @@ -0,0 +1,7 @@ + +public class Foo { + { + foo(x); + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCatch.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatch.java new file mode 100644 index 000000000000..6cd92794d4e0 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatch.java @@ -0,0 +1,8 @@ + +class Foo { + { + try { + + } catch + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchBody.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchBody.java new file mode 100644 index 000000000000..adf423f8f087 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchBody.java @@ -0,0 +1,8 @@ + +class Foo { + { + try { + + } catch (a b) + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchBody_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchBody_after.java new file mode 100644 index 000000000000..15b3344cd5bb --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchBody_after.java @@ -0,0 +1,10 @@ + +class Foo { + { + try { + + } catch (a b) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchLParen.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchLParen.java new file mode 100644 index 000000000000..001be055d4e5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchLParen.java @@ -0,0 +1,8 @@ + +class Foo { + { + try { + + } catch ( + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchLParen_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchLParen_after.java new file mode 100644 index 000000000000..7c4d09330153 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchLParen_after.java @@ -0,0 +1,9 @@ + +class Foo { + { + try { + + } catch () { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchWithExpression.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchWithExpression.java new file mode 100644 index 000000000000..ffd4f3c78dbf --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchWithExpression.java @@ -0,0 +1,8 @@ + +class Foo { + { + try { + + } catch (a + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchWithExpression_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchWithExpression_after.java new file mode 100644 index 000000000000..0b43a4e7b760 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatchWithExpression_after.java @@ -0,0 +1,9 @@ + +class Foo { + { + try { + + } catch (a) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteCatch_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatch_after.java new file mode 100644 index 000000000000..7c4d09330153 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteCatch_after.java @@ -0,0 +1,9 @@ + +class Foo { + { + try { + + } catch () { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteElseIf.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteElseIf.java new file mode 100644 index 000000000000..a7e2e116c48b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteElseIf.java @@ -0,0 +1,9 @@ +public class Test { + public void foo(int x) { + if (x > 0) { + System.out.println("true"); + } else { + System.out.println("true"); + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteElseIf_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteElseIf_after.java new file mode 100644 index 000000000000..3a4ec51d5061 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteElseIf_after.java @@ -0,0 +1,10 @@ +public class Test { + public void foo(int x) { + if (x > 0) { + System.out.println("true"); + } else { + System.out.println("true"); + } + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIf.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIf.java new file mode 100644 index 000000000000..1e44cdcd8a93 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIf.java @@ -0,0 +1,6 @@ + +class Foo { + { + if (a + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeyword.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeyword.java new file mode 100644 index 000000000000..c225798984d3 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeyword.java @@ -0,0 +1,6 @@ + +class foo { + { + if + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeywordStatementGoesToThen.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeywordStatementGoesToThen.java new file mode 100644 index 000000000000..18a11101a8a0 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeywordStatementGoesToThen.java @@ -0,0 +1,8 @@ + +class foo { + { + if foo(); + } + + void foo() {} +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeywordStatementGoesToThen_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeywordStatementGoesToThen_after.java new file mode 100644 index 000000000000..8a554d09ad2a --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeywordStatementGoesToThen_after.java @@ -0,0 +1,10 @@ + +class foo { + { + if () { + foo(); + } + } + + void foo() {} +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeyword_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeyword_after.java new file mode 100644 index 000000000000..fb645d281d6c --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfKeyword_after.java @@ -0,0 +1,7 @@ + +class foo { + { + if () { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle.java new file mode 100644 index 000000000000..14f8ca76b2f3 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle.java @@ -0,0 +1,7 @@ + +class Foo +{ + { + if (a + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle2.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle2.java new file mode 100644 index 000000000000..048bb12eb970 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle2.java @@ -0,0 +1,9 @@ + +class Foo +{ + { + if (a) + { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle2_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle2_after.java new file mode 100644 index 000000000000..53e37bd185b7 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle2_after.java @@ -0,0 +1,10 @@ + +class Foo +{ + { + if (a) + { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle_after.java new file mode 100644 index 000000000000..53e37bd185b7 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfNextLineBraceStyle_after.java @@ -0,0 +1,10 @@ + +class Foo +{ + { + if (a) + { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfStatementGoesToThen.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfStatementGoesToThen.java new file mode 100644 index 000000000000..def4f52c0666 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfStatementGoesToThen.java @@ -0,0 +1,8 @@ + +class foo { + { + if (foo(); + } + + void foo() {} +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIfStatementGoesToThen_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfStatementGoesToThen_after.java new file mode 100644 index 000000000000..8a554d09ad2a --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIfStatementGoesToThen_after.java @@ -0,0 +1,10 @@ + +class foo { + { + if () { + foo(); + } + } + + void foo() {} +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteIf_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteIf_after.java new file mode 100644 index 000000000000..4ea34f88167c --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteIf_after.java @@ -0,0 +1,8 @@ + +class Foo { + { + if (a) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteStringLiteral.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteStringLiteral.java new file mode 100644 index 000000000000..80e87d87446f --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteStringLiteral.java @@ -0,0 +1,5 @@ +public class Foo { + public void foo() { + String s = "abcdef"; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/CompleteStringLiteral_after.java b/java/java-tests/testData/codeInsight/completeStatement/CompleteStringLiteral_after.java new file mode 100644 index 000000000000..7109341a7591 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/CompleteStringLiteral_after.java @@ -0,0 +1,6 @@ +public class Foo { + public void foo() { + String s = "abcdef"; + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ElseIf.java b/java/java-tests/testData/codeInsight/completeStatement/ElseIf.java new file mode 100644 index 000000000000..4596f766546c --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ElseIf.java @@ -0,0 +1,7 @@ +class Test { + { + if(x) { + x(); + } else if() + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ElseIf_after.java b/java/java-tests/testData/codeInsight/completeStatement/ElseIf_after.java new file mode 100644 index 000000000000..4b92ec0095bc --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ElseIf_after.java @@ -0,0 +1,8 @@ +class Test { + { + if(x) { + x(); + } else if () { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/EmptyBeforeReturn.java b/java/java-tests/testData/codeInsight/completeStatement/EmptyBeforeReturn.java new file mode 100644 index 000000000000..57f4cb5f44f0 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/EmptyBeforeReturn.java @@ -0,0 +1,7 @@ + +class Foo { + public void foo() { + + return; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/EmptyBeforeReturn_after.java b/java/java-tests/testData/codeInsight/completeStatement/EmptyBeforeReturn_after.java new file mode 100644 index 000000000000..c63b38441da5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/EmptyBeforeReturn_after.java @@ -0,0 +1,8 @@ + +class Foo { + public void foo() { + + + return; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/EmptyLine.java b/java/java-tests/testData/codeInsight/completeStatement/EmptyLine.java new file mode 100644 index 000000000000..cbfabb6894ae --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/EmptyLine.java @@ -0,0 +1,6 @@ + +public class Foo { + { + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/EmptyLine_after.java b/java/java-tests/testData/codeInsight/completeStatement/EmptyLine_after.java new file mode 100644 index 000000000000..859f7284d7e5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/EmptyLine_after.java @@ -0,0 +1,7 @@ + +public class Foo { + { + + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ErrorNavigation.java b/java/java-tests/testData/codeInsight/completeStatement/ErrorNavigation.java new file mode 100644 index 000000000000..62d6f40f5291 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ErrorNavigation.java @@ -0,0 +1,8 @@ + +class foo { + { + if (a) { + do + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ErrorNavigation_after.java b/java/java-tests/testData/codeInsight/completeStatement/ErrorNavigation_after.java new file mode 100644 index 000000000000..6275434adb49 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ErrorNavigation_after.java @@ -0,0 +1,9 @@ + +class foo { + { + if (a) { + do { + } while (); + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Field.java b/java/java-tests/testData/codeInsight/completeStatement/Field.java new file mode 100644 index 000000000000..7e6390c33ffe --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Field.java @@ -0,0 +1,3 @@ +public class Test { + String s +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/FieldWithInitializer.java b/java/java-tests/testData/codeInsight/completeStatement/FieldWithInitializer.java new file mode 100644 index 000000000000..12d281982f5f --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/FieldWithInitializer.java @@ -0,0 +1,3 @@ +public class Test { + String s = +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/FieldWithInitializer_after.java b/java/java-tests/testData/codeInsight/completeStatement/FieldWithInitializer_after.java new file mode 100644 index 000000000000..eb062b51a46b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/FieldWithInitializer_after.java @@ -0,0 +1,3 @@ +public class Test { + String s = ; +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Field_after.java b/java/java-tests/testData/codeInsight/completeStatement/Field_after.java new file mode 100644 index 000000000000..9d11574faa3c --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Field_after.java @@ -0,0 +1,3 @@ +public class Test { + String s; +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/FollowedByComment.java b/java/java-tests/testData/codeInsight/completeStatement/FollowedByComment.java new file mode 100644 index 000000000000..6a7de20a3c45 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/FollowedByComment.java @@ -0,0 +1,6 @@ +public class Foo { + public void foo() { + foo( + // some line comment + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/FollowedByComment_after.java b/java/java-tests/testData/codeInsight/completeStatement/FollowedByComment_after.java new file mode 100644 index 000000000000..209898fbdac0 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/FollowedByComment_after.java @@ -0,0 +1,6 @@ +public class Foo { + public void foo() { + foo(); + // some line comment + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/For.java b/java/java-tests/testData/codeInsight/completeStatement/For.java new file mode 100644 index 000000000000..f6d6b2d1e98c --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/For.java @@ -0,0 +1,7 @@ + +class Foo { + { + for (int i = 0; i < 100; i++) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ForBlock.java b/java/java-tests/testData/codeInsight/completeStatement/ForBlock.java new file mode 100644 index 000000000000..9644a7594e16 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ForBlock.java @@ -0,0 +1,6 @@ + +class Foo { + { + for (int i = 0; i < 100; i++) + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ForBlock_after.java b/java/java-tests/testData/codeInsight/completeStatement/ForBlock_after.java new file mode 100644 index 000000000000..3761fa219a74 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ForBlock_after.java @@ -0,0 +1,8 @@ + +class Foo { + { + for (int i = 0; i < 100; i++) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ForEach.java b/java/java-tests/testData/codeInsight/completeStatement/ForEach.java new file mode 100644 index 000000000000..fd6745a222be --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ForEach.java @@ -0,0 +1,6 @@ +class Foo { + { + List list; + for (String s:list) + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ForEach_after.java b/java/java-tests/testData/codeInsight/completeStatement/ForEach_after.java new file mode 100644 index 000000000000..7c9a7e74087b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ForEach_after.java @@ -0,0 +1,8 @@ +class Foo { + { + List list; + for (String s : list) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ForIncrementExpressionAndBody.java b/java/java-tests/testData/codeInsight/completeStatement/ForIncrementExpressionAndBody.java new file mode 100644 index 000000000000..b2a81c77a384 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ForIncrementExpressionAndBody.java @@ -0,0 +1,6 @@ + +class foo { + { + for (int i = 0; i < 5; s.toString( + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ForIncrementExpressionAndBody_after.java b/java/java-tests/testData/codeInsight/completeStatement/ForIncrementExpressionAndBody_after.java new file mode 100644 index 000000000000..7c4d7740f443 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ForIncrementExpressionAndBody_after.java @@ -0,0 +1,8 @@ + +class foo { + { + for (int i = 0; i < 5; s.toString()) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/For_after.java b/java/java-tests/testData/codeInsight/completeStatement/For_after.java new file mode 100644 index 000000000000..3761fa219a74 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/For_after.java @@ -0,0 +1,8 @@ + +class Foo { + { + for (int i = 0; i < 100; i++) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ForceBlock.java b/java/java-tests/testData/codeInsight/completeStatement/ForceBlock.java new file mode 100644 index 000000000000..4387335e323b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ForceBlock.java @@ -0,0 +1,9 @@ + +public class Foo { + { + int a; + a = 1; + if (a == 1) + a = 2; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ForceBlock_after.java b/java/java-tests/testData/codeInsight/completeStatement/ForceBlock_after.java new file mode 100644 index 000000000000..f9403d32b842 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ForceBlock_after.java @@ -0,0 +1,11 @@ + +public class Foo { + { + int a; + a = 1; + if (a == 1) { + + } + a = 2; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEA22125.java b/java/java-tests/testData/codeInsight/completeStatement/IDEA22125.java new file mode 100644 index 000000000000..07cfd385934d --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEA22125.java @@ -0,0 +1,6 @@ + +public class Junk { + public static void main(String[] args) { + int i = 1 // comment + } +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEA22125_after.java b/java/java-tests/testData/codeInsight/completeStatement/IDEA22125_after.java new file mode 100644 index 000000000000..61fca2462f1b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEA22125_after.java @@ -0,0 +1,6 @@ + +public class Junk { + public static void main(String[] args) { + int i = 1; // comment + } +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEA22385.java b/java/java-tests/testData/codeInsight/completeStatement/IDEA22385.java new file mode 100644 index 000000000000..590512233c12 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEA22385.java @@ -0,0 +1,6 @@ +import static java.util.* + +public class Junk { + public static void main(String[] args) { + } +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEA22385_after.java b/java/java-tests/testData/codeInsight/completeStatement/IDEA22385_after.java new file mode 100644 index 000000000000..d0d446bcfc3a --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEA22385_after.java @@ -0,0 +1,6 @@ +import static java.util.*; + +public class Junk { + public static void main(String[] args) { + } +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1093.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1093.java new file mode 100644 index 000000000000..df7ef88e6901 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1093.java @@ -0,0 +1,6 @@ +class Foo { + public static void foo(int x) { + public static void bar(int x, int y) { + System.out.println(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1093_after.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1093_after.java new file mode 100644 index 000000000000..f4dae50e902a --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1093_after.java @@ -0,0 +1,8 @@ +class Foo { + public static void foo(int x) { + + } + public static void bar(int x, int y) { + System.out.println(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV13019.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV13019.java new file mode 100644 index 000000000000..256e613f74a2 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV13019.java @@ -0,0 +1,5 @@ + +class T +{ + public static void main(String[] args) +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV13019_after.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV13019_after.java new file mode 100644 index 000000000000..fd8d9097650c --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV13019_after.java @@ -0,0 +1,8 @@ + +class T +{ + public static void main(String[] args) + { + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1710.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1710.java new file mode 100644 index 000000000000..3ca6f16d9e05 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1710.java @@ -0,0 +1,3 @@ +public class Foo { + public void foo() throws Exception +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1710_after.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1710_after.java new file mode 100644 index 000000000000..6cbea9a7d26b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV1710_after.java @@ -0,0 +1,5 @@ +public class Foo { + public void foo() throws Exception { + + } +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV20713.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV20713.java new file mode 100644 index 000000000000..de38a6469c6a --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV20713.java @@ -0,0 +1,8 @@ + +class T { + void test(Object a) { + if (true) + if (a != null) + System.out.println("a = " + a.toString()); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV20713_after.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV20713_after.java new file mode 100644 index 000000000000..b3699dda8872 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV20713_after.java @@ -0,0 +1,10 @@ + +class T { + void test(Object a) { + if (true) { + + } + if (a != null) + System.out.println("a = " + a.toString()); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV40479.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV40479.java new file mode 100644 index 000000000000..dda24cd103fa --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV40479.java @@ -0,0 +1,6 @@ + +public class Junk { + public static void main(String[] args) { + int[] arr = new int[]{1,2,3} + } +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV40479_after.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV40479_after.java new file mode 100644 index 000000000000..c61c4caa18c1 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV40479_after.java @@ -0,0 +1,6 @@ + +public class Junk { + public static void main(String[] args) { + int[] arr = new int[]{1, 2, 3}; + } +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV434.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV434.java new file mode 100644 index 000000000000..976b0aeca059 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV434.java @@ -0,0 +1,6 @@ +class Foo { + { + if (true) + System.out.println(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IDEADEV434_after.java b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV434_after.java new file mode 100644 index 000000000000..519d2df0a9f5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IDEADEV434_after.java @@ -0,0 +1,8 @@ +class Foo { + { + if (true) { + + } + System.out.println(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/If.java b/java/java-tests/testData/codeInsight/completeStatement/If.java new file mode 100644 index 000000000000..5b272e135323 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/If.java @@ -0,0 +1,7 @@ +public class Foo { + { + if (x) + { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/If_after.java b/java/java-tests/testData/codeInsight/completeStatement/If_after.java new file mode 100644 index 000000000000..b601e262a9ad --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/If_after.java @@ -0,0 +1,7 @@ +public class Foo { + { + if (x) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InComment.java b/java/java-tests/testData/codeInsight/completeStatement/InComment.java new file mode 100644 index 000000000000..f1a576fcf48d --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InComment.java @@ -0,0 +1,6 @@ + +public class Test { + /** + public void foo() { + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InComment2.java b/java/java-tests/testData/codeInsight/completeStatement/InComment2.java new file mode 100644 index 000000000000..48246d39bba2 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InComment2.java @@ -0,0 +1,8 @@ + +public class Test { + /** + * abcdefgh + */ + public void foo() { + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InComment2_after.java b/java/java-tests/testData/codeInsight/completeStatement/InComment2_after.java new file mode 100644 index 000000000000..e04aeae419fb --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InComment2_after.java @@ -0,0 +1,9 @@ + +public class Test { + /** + * abcdefgh + * + */ + public void foo() { + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InComment3.java b/java/java-tests/testData/codeInsight/completeStatement/InComment3.java new file mode 100644 index 000000000000..5902e287c24e --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InComment3.java @@ -0,0 +1,6 @@ + +public class Test { + public void foo() { + // Some comment + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InComment3_after.java b/java/java-tests/testData/codeInsight/completeStatement/InComment3_after.java new file mode 100644 index 000000000000..7b662e15e977 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InComment3_after.java @@ -0,0 +1,7 @@ + +public class Test { + public void foo() { + // Some comment + // + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InComment4.java b/java/java-tests/testData/codeInsight/completeStatement/InComment4.java new file mode 100644 index 000000000000..07f8bbecd246 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InComment4.java @@ -0,0 +1,7 @@ + +public class Test { + public void foo() { + /* + System.out.println("foo"); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InComment4_after.java b/java/java-tests/testData/codeInsight/completeStatement/InComment4_after.java new file mode 100644 index 000000000000..a9f5247032bb --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InComment4_after.java @@ -0,0 +1,9 @@ + +public class Test { + public void foo() { + /* + + */ + System.out.println("foo"); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InComment_after.java b/java/java-tests/testData/codeInsight/completeStatement/InComment_after.java new file mode 100644 index 000000000000..307d206e7997 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InComment_after.java @@ -0,0 +1,8 @@ + +public class Test { + /** + * + */ + public void foo() { + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InPreceedingBlanks.java b/java/java-tests/testData/codeInsight/completeStatement/InPreceedingBlanks.java new file mode 100644 index 000000000000..372c5c93ad01 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InPreceedingBlanks.java @@ -0,0 +1,6 @@ +public class Test { + { + x = 2; + foo(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InPreceedingBlanks_after.java b/java/java-tests/testData/codeInsight/completeStatement/InPreceedingBlanks_after.java new file mode 100644 index 000000000000..fde9a343136d --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InPreceedingBlanks_after.java @@ -0,0 +1,7 @@ +public class Test { + { + x = 2; + + foo(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IncompleteCall.java b/java/java-tests/testData/codeInsight/completeStatement/IncompleteCall.java new file mode 100644 index 000000000000..57b03ac8a666 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IncompleteCall.java @@ -0,0 +1,7 @@ + +public class Foo { + { + foo( + foo(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IncompleteCall_after.java b/java/java-tests/testData/codeInsight/completeStatement/IncompleteCall_after.java new file mode 100644 index 000000000000..608de1eeac93 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IncompleteCall_after.java @@ -0,0 +1,7 @@ + +public class Foo { + { + foo(); + foo(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IncompleteElseIf.java b/java/java-tests/testData/codeInsight/completeStatement/IncompleteElseIf.java new file mode 100644 index 000000000000..127d3ed5d2a1 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IncompleteElseIf.java @@ -0,0 +1,8 @@ +class Foo { + boolean a; + { + if (a) { + } else + a = 2; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/IncompleteElseIf_after.java b/java/java-tests/testData/codeInsight/completeStatement/IncompleteElseIf_after.java new file mode 100644 index 000000000000..eb6478527b9c --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/IncompleteElseIf_after.java @@ -0,0 +1,11 @@ +class Foo { + boolean a; + + { + if (a) { + } else { + + } + a = 2; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Indentation.java b/java/java-tests/testData/codeInsight/completeStatement/Indentation.java new file mode 100644 index 000000000000..de56ed5fc202 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Indentation.java @@ -0,0 +1,8 @@ + +class foo { + { + if (a) { + if(a + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Indentation_after.java b/java/java-tests/testData/codeInsight/completeStatement/Indentation_after.java new file mode 100644 index 000000000000..511ed3d9e6f5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Indentation_after.java @@ -0,0 +1,10 @@ + +class foo { + { + if (a) { + if (a) { + + } + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InterfaceMethodSemicolon.java b/java/java-tests/testData/codeInsight/completeStatement/InterfaceMethodSemicolon.java new file mode 100644 index 000000000000..987ec95fa433 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InterfaceMethodSemicolon.java @@ -0,0 +1,4 @@ +interface InterfaceMethodSemicolon { + void foo(String s) + Object bar(); +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/InterfaceMethodSemicolon_after.java b/java/java-tests/testData/codeInsight/completeStatement/InterfaceMethodSemicolon_after.java new file mode 100644 index 000000000000..ed67b8df1c29 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/InterfaceMethodSemicolon_after.java @@ -0,0 +1,4 @@ +interface InterfaceMethodSemicolon { + void foo(String s); + Object bar(); +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Method.java b/java/java-tests/testData/codeInsight/completeStatement/Method.java new file mode 100644 index 000000000000..c8eadab3ea28 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Method.java @@ -0,0 +1,3 @@ +public class Test { + void foo( +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Method_after.java b/java/java-tests/testData/codeInsight/completeStatement/Method_after.java new file mode 100644 index 000000000000..d1ce3947b600 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Method_after.java @@ -0,0 +1,5 @@ +public class Test { + void foo() { + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/NewInParentheses.java b/java/java-tests/testData/codeInsight/completeStatement/NewInParentheses.java new file mode 100644 index 000000000000..7483ed6e61dd --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/NewInParentheses.java @@ -0,0 +1,6 @@ + +class foo { + { + Object d = ( ( String ) new String() + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/NewInParentheses_after.java b/java/java-tests/testData/codeInsight/completeStatement/NewInParentheses_after.java new file mode 100644 index 000000000000..0bdd9c0d5a21 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/NewInParentheses_after.java @@ -0,0 +1,6 @@ + +class foo { + { + Object d = ((String) new String()); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/NoBlockReturn.java b/java/java-tests/testData/codeInsight/completeStatement/NoBlockReturn.java new file mode 100644 index 000000000000..fecc7a7f7de4 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/NoBlockReturn.java @@ -0,0 +1,5 @@ +public class Test { + public void foo() { + if (i) return; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/NoBlockReturn_after.java b/java/java-tests/testData/codeInsight/completeStatement/NoBlockReturn_after.java new file mode 100644 index 000000000000..05e0c3432fe4 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/NoBlockReturn_after.java @@ -0,0 +1,6 @@ +public class Test { + public void foo() { + if (i) return; + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/NoErrors.java b/java/java-tests/testData/codeInsight/completeStatement/NoErrors.java new file mode 100644 index 000000000000..413189a1fe2f --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/NoErrors.java @@ -0,0 +1,6 @@ + +public class Test { + public void foo() { + int x = 2; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/NoErrors_after.java b/java/java-tests/testData/codeInsight/completeStatement/NoErrors_after.java new file mode 100644 index 000000000000..43dc309a7abe --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/NoErrors_after.java @@ -0,0 +1,7 @@ + +public class Test { + public void foo() { + int x = 2; + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/NonAbstractMethodWithSemicolon.java b/java/java-tests/testData/codeInsight/completeStatement/NonAbstractMethodWithSemicolon.java new file mode 100644 index 000000000000..9d0e938dfe2e --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/NonAbstractMethodWithSemicolon.java @@ -0,0 +1,4 @@ + +public class Foo { + void foo(); +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/NonAbstractMethodWithSemicolon_after.java b/java/java-tests/testData/codeInsight/completeStatement/NonAbstractMethodWithSemicolon_after.java new file mode 100644 index 000000000000..b9845cd0e883 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/NonAbstractMethodWithSemicolon_after.java @@ -0,0 +1,6 @@ + +public class Foo { + void foo() { + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Parenthesized.java b/java/java-tests/testData/codeInsight/completeStatement/Parenthesized.java new file mode 100644 index 000000000000..68c3c777155d --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Parenthesized.java @@ -0,0 +1,6 @@ + +class Foo { + { + tx2 = (long) (vcx + vw + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Parenthesized_after.java b/java/java-tests/testData/codeInsight/completeStatement/Parenthesized_after.java new file mode 100644 index 000000000000..cecc090aecc5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Parenthesized_after.java @@ -0,0 +1,6 @@ + +class Foo { + { + tx2 = (long) (vcx + vw); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Return.java b/java/java-tests/testData/codeInsight/completeStatement/Return.java new file mode 100644 index 000000000000..89d1b52323cc --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Return.java @@ -0,0 +1,7 @@ +public class Test { + public void foo() { + if(x) { + return; + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ReturnFromNonVoid.java b/java/java-tests/testData/codeInsight/completeStatement/ReturnFromNonVoid.java new file mode 100644 index 000000000000..d7e25678fa34 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ReturnFromNonVoid.java @@ -0,0 +1,6 @@ + +public class Foo { + public int foo() { + return + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ReturnFromNonVoid_after.java b/java/java-tests/testData/codeInsight/completeStatement/ReturnFromNonVoid_after.java new file mode 100644 index 000000000000..cbdb9b85e16d --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ReturnFromNonVoid_after.java @@ -0,0 +1,6 @@ + +public class Foo { + public int foo() { + return; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ReturnFromVoid.java b/java/java-tests/testData/codeInsight/completeStatement/ReturnFromVoid.java new file mode 100644 index 000000000000..97a1dfb6f33a --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ReturnFromVoid.java @@ -0,0 +1,7 @@ + +class Test { + void test(Object o) { + if (o == null) return + String foo = "foo"; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/ReturnFromVoid_after.java b/java/java-tests/testData/codeInsight/completeStatement/ReturnFromVoid_after.java new file mode 100644 index 000000000000..b57605949df9 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/ReturnFromVoid_after.java @@ -0,0 +1,7 @@ + +class Test { + void test(Object o) { + if (o == null) return; + String foo = "foo"; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Return_after.java b/java/java-tests/testData/codeInsight/completeStatement/Return_after.java new file mode 100644 index 000000000000..9c07eb931f50 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Return_after.java @@ -0,0 +1,8 @@ +public class Test { + public void foo() { + if(x) { + return; + } + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR11147.java b/java/java-tests/testData/codeInsight/completeStatement/SCR11147.java new file mode 100644 index 000000000000..75020fc82ccc --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR11147.java @@ -0,0 +1,9 @@ + +public class Foo { + { + int x = 0; + if (x == 0) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR11147_after.java b/java/java-tests/testData/codeInsight/completeStatement/SCR11147_after.java new file mode 100644 index 000000000000..5c426980db18 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR11147_after.java @@ -0,0 +1,10 @@ + +public class Foo { + { + int x = 0; + if (x == 0) { + + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR22904.java b/java/java-tests/testData/codeInsight/completeStatement/SCR22904.java new file mode 100644 index 000000000000..8c4c47fbb39b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR22904.java @@ -0,0 +1,4 @@ +interface Test { + void foo(String s) + Object bar(); +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR22904_after.java b/java/java-tests/testData/codeInsight/completeStatement/SCR22904_after.java new file mode 100644 index 000000000000..a10695c74ef6 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR22904_after.java @@ -0,0 +1,4 @@ +interface Test { + void foo(String s); + Object bar(); +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR30227.java b/java/java-tests/testData/codeInsight/completeStatement/SCR30227.java new file mode 100644 index 000000000000..584905459999 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR30227.java @@ -0,0 +1,16 @@ +public abstract class A { + abstract void f(boolean b); + + A IMPL = new A() { + void f(boolean b) { + if (b) + f(true); + else { + f(false); + f(false); + } + for(int i = 0; i < 5; i++) + f(true); + } + }; +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR30227_after.java b/java/java-tests/testData/codeInsight/completeStatement/SCR30227_after.java new file mode 100644 index 000000000000..af9f9bb177df --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR30227_after.java @@ -0,0 +1,16 @@ +public abstract class A { + abstract void f(boolean b); + + A IMPL = new A() { + void f(boolean b) { + if (b) + f(true); + else { + f(false); + f(false); + } + for (int i = 0; i < 5; i++) + f(true); + } + }; +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR36110.java b/java/java-tests/testData/codeInsight/completeStatement/SCR36110.java new file mode 100644 index 000000000000..b70a7ed4c21b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR36110.java @@ -0,0 +1,8 @@ +public enum TransactionAttributeType { +MANDATORY, +REQUIRED, +REQUIRESNEW, +SUPPORTS, +NOTSUPPORTED, +NEVER +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR36110_after.java b/java/java-tests/testData/codeInsight/completeStatement/SCR36110_after.java new file mode 100644 index 000000000000..dadb291315f5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR36110_after.java @@ -0,0 +1,8 @@ +public enum TransactionAttributeType { +MANDATORY, +REQUIRED, +REQUIRESNEW, +SUPPORTS, +NOTSUPPORTED, + NEVER, +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR37331.java b/java/java-tests/testData/codeInsight/completeStatement/SCR37331.java new file mode 100644 index 000000000000..21fad2187229 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR37331.java @@ -0,0 +1,6 @@ + +public class Junk { + public static void main(String[] args) { + String s = ( + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/SCR37331_after.java b/java/java-tests/testData/codeInsight/completeStatement/SCR37331_after.java new file mode 100644 index 000000000000..2381adb6b6a5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SCR37331_after.java @@ -0,0 +1,6 @@ + +public class Junk { + public static void main(String[] args) { + String s = (); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/StartNewBlock.java b/java/java-tests/testData/codeInsight/completeStatement/StartNewBlock.java new file mode 100644 index 000000000000..77469fbaefe6 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/StartNewBlock.java @@ -0,0 +1,6 @@ + +public class Foo { + { + if (x) {foo(); + } +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/StartNewBlock_after.java b/java/java-tests/testData/codeInsight/completeStatement/StartNewBlock_after.java new file mode 100644 index 000000000000..a033317ff00f --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/StartNewBlock_after.java @@ -0,0 +1,8 @@ + +public class Foo { + { + if (x) { + foo(); + } + } +} diff --git a/java/java-tests/testData/codeInsight/completeStatement/StringLiteral.java b/java/java-tests/testData/codeInsight/completeStatement/StringLiteral.java new file mode 100644 index 000000000000..5848d3ec301c --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/StringLiteral.java @@ -0,0 +1,6 @@ + +class foo { + { + String s = "a + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/StringLiteral_after.java b/java/java-tests/testData/codeInsight/completeStatement/StringLiteral_after.java new file mode 100644 index 000000000000..b76baf554d45 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/StringLiteral_after.java @@ -0,0 +1,6 @@ + +class foo { + { + String s = "a"; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/SwitchKeyword.java b/java/java-tests/testData/codeInsight/completeStatement/SwitchKeyword.java new file mode 100644 index 000000000000..dbfbef32507d --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SwitchKeyword.java @@ -0,0 +1,6 @@ + +class foo { + { + switch + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/SwitchKeywordWithCondition.java b/java/java-tests/testData/codeInsight/completeStatement/SwitchKeywordWithCondition.java new file mode 100644 index 000000000000..3787360057dd --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SwitchKeywordWithCondition.java @@ -0,0 +1,6 @@ + +class foo { + { + switch (i + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/SwitchKeywordWithCondition_after.java b/java/java-tests/testData/codeInsight/completeStatement/SwitchKeywordWithCondition_after.java new file mode 100644 index 000000000000..908ab9fed721 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SwitchKeywordWithCondition_after.java @@ -0,0 +1,8 @@ + +class foo { + { + switch (i) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/SwitchKeyword_after.java b/java/java-tests/testData/codeInsight/completeStatement/SwitchKeyword_after.java new file mode 100644 index 000000000000..01d1cd246705 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/SwitchKeyword_after.java @@ -0,0 +1,7 @@ + +class foo { + { + switch () { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Synchronized.java b/java/java-tests/testData/codeInsight/completeStatement/Synchronized.java new file mode 100644 index 000000000000..d3fd2efe1b5a --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Synchronized.java @@ -0,0 +1,5 @@ +public class Test { + public void foo() { + synchronized(this) + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Synchronized_after.java b/java/java-tests/testData/codeInsight/completeStatement/Synchronized_after.java new file mode 100644 index 000000000000..bcad9ff3f389 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Synchronized_after.java @@ -0,0 +1,7 @@ +public class Test { + public void foo() { + synchronized (this) { + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Throw.java b/java/java-tests/testData/codeInsight/completeStatement/Throw.java new file mode 100644 index 000000000000..ac0adcf1fb38 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Throw.java @@ -0,0 +1,7 @@ +public class Test { + { + if(x) { + throw new Exception(); + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Throw_after.java b/java/java-tests/testData/codeInsight/completeStatement/Throw_after.java new file mode 100644 index 000000000000..472fc7869e94 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Throw_after.java @@ -0,0 +1,8 @@ +public class Test { + { + if(x) { + throw new Exception(); + } + + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Try1.java b/java/java-tests/testData/codeInsight/completeStatement/Try1.java new file mode 100644 index 000000000000..1987cf42ba24 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Try1.java @@ -0,0 +1,8 @@ +public class Foo { + { + try { + } + catch(Exception e) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/Try1_after.java b/java/java-tests/testData/codeInsight/completeStatement/Try1_after.java new file mode 100644 index 000000000000..e38445253e7b --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/Try1_after.java @@ -0,0 +1,9 @@ +public class Foo { + { + try { + + } + catch(Exception e) { + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/TwoStatementsInLine.java b/java/java-tests/testData/codeInsight/completeStatement/TwoStatementsInLine.java new file mode 100644 index 000000000000..0748ba29f9cd --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/TwoStatementsInLine.java @@ -0,0 +1,7 @@ + +class Foo { + { + x = 3; + x = 2 y = 4; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completeStatement/TwoStatementsInLine_after.java b/java/java-tests/testData/codeInsight/completeStatement/TwoStatementsInLine_after.java new file mode 100644 index 000000000000..66956f15d458 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completeStatement/TwoStatementsInLine_after.java @@ -0,0 +1,7 @@ + +class Foo { + { + x = 3; + x = 2; y = 4; + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java new file mode 100644 index 000000000000..0323fe9e45dd --- /dev/null +++ b/java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java @@ -0,0 +1,221 @@ +package com.intellij.codeInsight; + +import com.intellij.JavaTestUtil; +import com.intellij.openapi.actionSystem.IdeActions; +import com.intellij.openapi.roots.LanguageLevelProjectExtension; +import com.intellij.pom.java.LanguageLevel; +import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.codeStyle.CodeStyleSettings; +import com.intellij.psi.codeStyle.CodeStyleSettingsManager; +import com.intellij.testFramework.EditorActionTestCase; +import com.intellij.testFramework.TestDataPath; + +/** + * @author max + */ +@TestDataPath("$CONTENT_ROOT/testData") +public class CompleteStatementTest extends EditorActionTestCase { + public void testAddMissingSemicolon() throws Exception { doTest(); } + + public void testAddMissingParen() throws Exception { doTest(); } + + public void testCompleteIf() throws Exception { doTest(); } + + public void testCompleteIfKeyword() throws Exception { doTest(); } + + public void testCompleteIfStatementGoesToThen() throws Exception { doTest(); } + + public void testCompleteIfKeywordStatementGoesToThen() throws Exception { doTest(); } + + public void testIndentation() throws Exception { doTest(); } + + public void testErrorNavigation() throws Exception { doTest(); } + + public void testStringLiteral() throws Exception { doTest(); } + + public void testCompleteCatch() throws Exception { doTest(); } + + public void testCompleteCatchLParen() throws Exception { doTest(); } + + public void testCompleteCatchWithExpression() throws Exception { doTest(); } + + public void testCompleteCatchBody() throws Exception { doTest(); } + + public void testSCR11147() throws Exception { doTest(); } + + public void testNoErrors() throws Exception { doTest(); } + + public void testThrow() throws Exception { doTest(); } + + public void testReturn() throws Exception { doTest(); } + + public void testEmptyLine() throws Exception { doTest(); } + + public void testBlock() throws Exception { doTest(); } + + public void testTwoStatementsInLine() throws Exception { doTest(); } + + public void testFor() throws Exception { doTest(); } + + public void testForEach() throws Exception { doTest(); } + + public void testForBlock() throws Exception { doTest(); } + + public void testForIncrementExpressionAndBody() throws Exception { doTest(); } + + public void testEmptyBeforeReturn() throws Exception { doTest(); } + + public void testIf() throws Exception { doTest(); } + + public void testBeforeStatement() throws Exception { doTest(); } + + public void testTry1() throws Exception { doTest(); } + + public void testBlock1() throws Exception { doTest(); } + + public void testAfterFor() throws Exception { doTest(); } + + public void testBeforeFor() throws Exception { doTest(); } + + public void testAtBlockEnd() throws Exception { doTest(); } + + public void testForceBlock() throws Exception { doTest(); } + + public void testElseIf() throws Exception { doTest(); } + + public void testIncompleteElseIf() throws Exception { doTest(); } + + public void testField() throws Exception { doTest(); } + + public void testMethod() throws Exception { doTest(); } + + public void testCompleteElseIf() throws Exception { doTest(); } + + public void testCompleteStringLiteral() throws Exception { + doTest(); + } + + public void testNonAbstractMethodWithSemicolon() throws Exception { doTest(); } + + public void testReturnFromNonVoid() throws Exception { doTest(); } + + public void testReturnFromVoid() throws Exception { doTest(); } + + public void testIncompleteCall() throws Exception { doTest(); } + + public void testCompleteCall() throws Exception { doTest(); } + + public void testStartNewBlock() throws Exception { doTest(); } + + public void testInPreceedingBlanks() throws Exception { doTest(); } + + public void testNoBlockReturn() throws Exception { doTest(); } + + public void testInComment() throws Exception { doTest(); } + + public void testInComment2() throws Exception { doTest(); } + public void testInComment3() throws Exception { doTest(); } + public void testInComment4() throws Exception { doTest(); } + + public void testSCR22904() throws Exception { doTest(); } + public void testSCR30227() throws Exception { doTest(); } + + public void testFieldWithInitializer() throws Exception { doTest(); } + + public void testParenthesized() throws Exception { doTest(); } + + public void testCompleteBreak() throws Exception { + doTest(); + } + + public void testCompleteIfNextLineBraceStyle() throws Exception { + CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); + settings.BRACE_STYLE = CodeStyleSettings.NEXT_LINE; + doTest(); + settings.BRACE_STYLE = CodeStyleSettings.END_OF_LINE; + } + + public void testCompleteIfNextLineBraceStyle2() throws Exception { + CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); + settings.BRACE_STYLE = CodeStyleSettings.NEXT_LINE; + doTest(); + settings.BRACE_STYLE = CodeStyleSettings.END_OF_LINE; + } + + public void testSCR36110() throws Exception { + JavaPsiFacade facade = JavaPsiFacade.getInstance(getProject()); + LanguageLevel old = LanguageLevelProjectExtension.getInstance(facade.getProject()).getLanguageLevel(); + LanguageLevelProjectExtension.getInstance(facade.getProject()).setLanguageLevel(LanguageLevel.JDK_1_5); + doTest(); + LanguageLevelProjectExtension.getInstance(facade.getProject()).setLanguageLevel(old); + } + + public void testSCR37331() throws Exception { doTest(); } + public void testIDEADEV434() throws Exception { + CodeStyleSettingsManager.getSettings(getProject()).KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = true; + doTest(); + CodeStyleSettingsManager.getSettings(getProject()).KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = false; + doTest(); + } + + public void testIDEADEV1093() throws Exception { doTest(); } + + public void testIDEADEV1710() throws Exception { doTest(); } + + public void testInterfaceMethodSemicolon() throws Exception { doTest(); } + + public void testSynchronized() throws Exception { doTest(); } + + public void testCdrEndlessLoop() throws Exception { doTest(); } + + public void testFollowedByComment() throws Exception { doTest(); } + + public void testBraceFixeNewLine() throws Exception { doTest(); } + + public void testSwitchKeyword() throws Exception { doTest(); } + + public void testSwitchKeywordWithCondition() throws Exception { doTest(); } + + public void testNewInParentheses() throws Exception { doTest(); } + + public void testIDEADEV20713() throws Exception { doTest(); } + + public void testIDEA22125() throws Exception { doTest(); } + + public void testIDEA22385() throws Exception { doTest(); } + + public void testIDEADEV40479() throws Exception { doTest(); } + + public void testIDEADEV13019() throws Exception { + CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); + settings.BRACE_STYLE = CodeStyleSettings.NEXT_LINE; + settings.METHOD_BRACE_STYLE = CodeStyleSettings.NEXT_LINE; + settings.CLASS_BRACE_STYLE = CodeStyleSettings.NEXT_LINE; + try { + doTest(); + } + finally { + settings.BRACE_STYLE = CodeStyleSettings.END_OF_LINE; + settings.METHOD_BRACE_STYLE = CodeStyleSettings.END_OF_LINE; + settings.CLASS_BRACE_STYLE = CodeStyleSettings.END_OF_LINE; + } + } + + private void doTest() throws Exception { + doTest("java"); + } + + private void doTest(String ext) throws Exception { + String path = "/codeInsight/completeStatement/"; + doFileTest(path + getTestName(false) + "." + ext, path + getTestName(false) + "_after." + ext, true); + } + + protected String getActionId() { + return IdeActions.ACTION_EDITOR_COMPLETE_STATEMENT; + } + + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath(); + } +} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java index c88a10e44616..89dac789b5e9 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java @@ -11,9 +11,11 @@ import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.testFramework.PsiTestUtil; +import com.intellij.testFramework.TestDataPath; import java.io.File; +@TestDataPath("$CONTENT_ROOT/testData") public class ClassNameCompletionTest extends CompletionTestCase { private static final String BASE_PATH = "/codeInsight/completion/className/"; protected boolean myOldSetting; @@ -125,7 +127,7 @@ public class ClassNameCompletionTest extends CompletionTestCase { configureByFile(path + "/implements2-source.java"); performAction(); checkResultByFile(path + "/implements2-result.java"); - + configureByFile(path + "/implements3-source.java"); performAction(); checkResultByFile(path + "/implements3-result.java"); @@ -144,7 +146,7 @@ public class ClassNameCompletionTest extends CompletionTestCase { configureByFile(path + "/test8-source.java"); performAction(); checkResultByFile(path + "/test8-result.java"); - + configureByFile(path + "/test9-source.java"); performAction(); checkResultByFile(path + "/test9-result.java"); @@ -187,7 +189,7 @@ public class ClassNameCompletionTest extends CompletionTestCase { performAction(); checkResultByFile(path + "/methodCall1-result.java"); } - + public void testInVariableDeclarationType() throws Throwable { final String path = BASE_PATH + "/nameCompletion/java"; configureByFile(path + "/varType-source.java"); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionSortingTestCase.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionSortingTestCase.java index 4d7ae04269db..e3edc69a9ace 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionSortingTestCase.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionSortingTestCase.java @@ -10,6 +10,7 @@ import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.codeInsight.lookup.impl.LookupImpl; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; +import com.intellij.testFramework.TestDataPath; import javax.swing.*; import java.util.ArrayList; @@ -19,6 +20,7 @@ import java.util.List; /** * @author peter */ +@TestDataPath("$CONTENT_ROOT/testData") public abstract class CompletionSortingTestCase extends LightCompletionTestCase { @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors"}) protected CompletionSortingTestCase(CompletionType type) { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionStyleTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionStyleTest.java index bfff24fee7d2..f8862f4417a3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionStyleTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionStyleTest.java @@ -10,6 +10,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.statistics.StatisticsManager; import com.intellij.psi.statistics.impl.StatisticsManagerImpl; import com.intellij.testFramework.LightCodeInsightTestCase; +import com.intellij.testFramework.TestDataPath; /** * Created by IntelliJ IDEA. @@ -18,6 +19,7 @@ import com.intellij.testFramework.LightCodeInsightTestCase; * Time: 15:44:18 * To change this template use Options | File Templates. */ +@TestDataPath("$CONTENT_ROOT/testData") public class CompletionStyleTest extends LightCodeInsightTestCase{ private static final String BASE_PATH = "/codeInsight/completion/style";