MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-05 21:00:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge SwitchStatementWithSingleDefaultInspection into SwitchStatementWithTooFewBranches

Browse Source 
Fixes IDEA-199499 Improve "Replace 'switch' with 'if'" action and make it a quick-fix for "Switch has too few branches"
Now default is not counted as branch in SwitchStatementWithTooFewBranches
This commit is contained in:
Tagir Valeev
2018-09-26 17:01:22 +07:00
parent 22d6343b1e
commit 1b4e5c1e39
32 changed files with 454 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterAllReturns.java Normal file
View File

@@ -0,0 +1,13 @@
// "Replace 'switch' with 'if'" "true"
class X {
int m(String s, boolean r) {
if (r) return 1;
else if ("a".equals(s)) {
return 1;
} else if ("b".equals(s)) {
return 2;
} else {
return 3;
}
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterAllReturns2.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace 'switch' with 'if'" "true"
class X {
int m(String s, boolean r) {
if ("a".equals(s)) {
return 1;
} else if ("b".equals(s)) {
return 2;
}
return 3;
}
}

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterBreakInIf.java
View File

@@ -6,10 +6,7 @@ class X {
if (r) {
return;
}
System.out.println("d");
} else {
System.out.println("d");
}
System.out.println("d");
}
}

17
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterBreakWithLabel.java
View File

@@ -3,16 +3,15 @@ class X {
int m(String s, int x) {
if (x > 0) {
SWITCH:
if ("a".equals(s)) {
System.out.println("a");
for (int i = 0; i < 10; i++) {
System.out.println(i);
if (i == x) return 0;
if (i == x * 2) break;
{
if ("a".equals(s)) {
System.out.println("a");
for (int i = 0; i < 10; i++) {
System.out.println(i);
if (i == x) return 0;
if (i == x * 2) break;
}
}
System.out.println("d");
} else {
System.out.println("d");
}
} else {

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterEmptyDefault.java Normal file
View File

@@ -0,0 +1,9 @@
// "Replace 'switch' with 'if'" "true"
class X {
int m(String s, boolean r) {
//ignore
if ("x".equals(s)) {
System.out.println("foo");
}
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterNoOuterBlock.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace 'switch' with 'if'" "true"
class X {
void m(String s, boolean r) {
if (r) {
if ("a".equals(s)) {
System.out.println("a");
}
System.out.println("d");
}
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterString.java
View File

@@ -4,11 +4,11 @@ class X {
//comment1
//comment4
//comment6
//comment7
//comment8
if ("case1".equals(value)) {//comment2
//comment3
} else if ("case2".equals(value)) {//comment5
} else {//comment7
}
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterUsedOnce.java Normal file
View File

@@ -0,0 +1,12 @@
// "Replace 'switch' with 'if'" "true"
abstract class Test {
abstract Object getObject();
void foo() {
if (RuntimeException.class.equals(getObject().getClass())) {
System.out.println("RuntimeException");
} else {
System.out.println("Other");
}
}
}

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeAllReturns.java Normal file
View File

@@ -0,0 +1,15 @@
// "Replace 'switch' with 'if'" "true"
class X {
int m(String s, boolean r) {
if (r) return 1;
else
swi<caret>tch (s) {
case "a":
return 1;
case "b":
return 2;
default:
return 3;
}
}
}

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeAllReturns2.java Normal file
View File

@@ -0,0 +1,13 @@
// "Replace 'switch' with 'if'" "true"
class X {
int m(String s, boolean r) {
swi<caret>tch (s) {
case "a":
return 1;
case "b":
return 2;
default:
return 3;
}
}
}

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeEmptyDefault.java Normal file
View File

@@ -0,0 +1,13 @@
// "Replace 'switch' with 'if'" "true"
class X {
int m(String s, boolean r) {
switc<caret>h(s) {
case "x":
System.out.println("foo");
break;
default: {
//ignore
}
}
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeNoOuterBlock.java Normal file
View File

@@ -0,0 +1,12 @@
// "Replace 'switch' with 'if'" "true"
class X {
void m(String s, boolean r) {
if (r)
swi<caret>tch (s) {
case "a":
System.out.println("a");
default:
System.out.println("d");
}
}
}

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeUsedOnce.java Normal file
View File

@@ -0,0 +1,15 @@
// "Replace 'switch' with 'if'" "true"
abstract class Test {
abstract Object getObject();
void foo() {
<caret>switch(getObject().getClass()) {
case RuntimeException.class:
System.out.println("RuntimeException");
break;
default:
System.out.println("Other");
break;
}
}
}