From 968d14a5db58af3a7dc1c8389a20d5dd3f8162dc Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 21 Feb 2017 21:25:26 +0100 Subject: [PATCH] Revert testdata changes: Proper focus requests through the IDE focus subsystem. Part II. --- .../advHighlighting/Unreachable.java | 1 + .../EnumWithAbstractMethods.java | 1 + .../EnumWithAbstractMethods.java | 1 + .../extractMethod/TypeParamsList.java | 1 + .../extractMethod/TypeParamsList_after.java | 1 + .../IfStatementWithIdenticalBranches.java | 17 ++--------------- .../TestCaseWithConstructorInspection2.java | 16 +--------------- 7 files changed, 8 insertions(+), 30 deletions(-) diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/Unreachable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/Unreachable.java index 2cedd96888c6..63d879b477cf 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/Unreachable.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/Unreachable.java @@ -211,6 +211,7 @@ interface ii {} } } } + ; } void cf8() { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/EnumWithAbstractMethods.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/EnumWithAbstractMethods.java index ecab51f881b8..1abae6b17a2d 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/EnumWithAbstractMethods.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/EnumWithAbstractMethods.java @@ -5,6 +5,7 @@ C { void foo() {} } + ; abstract void foo(); } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/EnumWithAbstractMethods.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/EnumWithAbstractMethods.java index ecab51f881b8..1abae6b17a2d 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/EnumWithAbstractMethods.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/EnumWithAbstractMethods.java @@ -5,6 +5,7 @@ C { void foo() {} } + ; abstract void foo(); } diff --git a/java/java-tests/testData/refactoring/extractMethod/TypeParamsList.java b/java/java-tests/testData/refactoring/extractMethod/TypeParamsList.java index 2666e03c2295..e752fbf74a49 100644 --- a/java/java-tests/testData/refactoring/extractMethod/TypeParamsList.java +++ b/java/java-tests/testData/refactoring/extractMethod/TypeParamsList.java @@ -6,5 +6,6 @@ class Test { System.out.println(variable); } } + ; } } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethod/TypeParamsList_after.java b/java/java-tests/testData/refactoring/extractMethod/TypeParamsList_after.java index 091fe750b7a7..8c545b8d08fa 100644 --- a/java/java-tests/testData/refactoring/extractMethod/TypeParamsList_after.java +++ b/java/java-tests/testData/refactoring/extractMethod/TypeParamsList_after.java @@ -6,6 +6,7 @@ class Test { newMethod(variable); } } + ; } private void newMethod(T variable) { diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/if_statement_with_identical_branches/IfStatementWithIdenticalBranches.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/if_statement_with_identical_branches/IfStatementWithIdenticalBranches.java index ddf04ea32a30..89b141cfdf73 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/if_statement_with_identical_branches/IfStatementWithIdenticalBranches.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/if_statement_with_identical_branches/IfStatementWithIdenticalBranches.java @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package com.siyeh.igtest.controlflow.if_statement_with_identical_branches; import java.util.Collection; @@ -192,6 +177,8 @@ class NotADup { void n(int i) { if (i == 0) { System.out.println(((i))); + ; + ; { } } diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/test_case_with_constructor/TestCaseWithConstructorInspection2.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/test_case_with_constructor/TestCaseWithConstructorInspection2.java index e9b1876c483b..5da309358cb4 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/test_case_with_constructor/TestCaseWithConstructorInspection2.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/test_case_with_constructor/TestCaseWithConstructorInspection2.java @@ -1,18 +1,3 @@ -/* - * Copyright 2000-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package com.siyeh.igtest.junit; import junit.framework.TestCase; @@ -22,6 +7,7 @@ public class TestCaseWithConstructorInspection2 extends TestCase public TestCaseWithConstructorInspection2() { super(); + ; if (false) { System.out.println(); }