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

IDEA-270441 IJ-CR-12027 convert switch to if: fix "null" class name for local Enums

Browse Source 
GitOrigin-RevId: bd6d592522e497f7897c92799333630d611dc6e1
This commit is contained in:
Alexandr Suhinin
2021-07-20 10:46:10 +03:00
committed by intellij-monorepo-bot
parent 0bf2802f19
commit 8496dd3b7f
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java
View File

@@ -375,7 +375,9 @@ public class ConvertSwitchToIfIntention implements IntentionActionWithFixAllOpti
if (aClass == null) {
return commentTracker.text(value);
}
return aClass.getQualifiedName() + '.' + commentTracker.text(referenceExpression);
String qualifiedName = aClass.getQualifiedName();
String className = qualifiedName != null ? qualifiedName : aClass.getName();
return className + '.' + commentTracker.text(referenceExpression);
}
private static void dumpBody(SwitchStatementBranch branch, @NonNls StringBuilder out, CommentTracker commentTracker) {

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

@@ -0,0 +1,11 @@
// "Replace 'switch' with 'if'" "true"
class Test {
void test() {
enum P {
s;
}
P p = null;
if (p == P.s) {
}
}
}

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

@@ -0,0 +1,13 @@
// "Replace 'switch' with 'if'" "true"
class Test {
void test() {
enum P {
s;
}
P p = null;
<caret>switch (p) {
case s -> {}
default -> {}
}
}
}