also handle boolean conditions for #905

eclipse-archived · May 3, 2015 · 383a113 · 383a113
1 parent 2dd0acb
commit 383a113
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/...ylon.eclipse.ui/src/com/redhat/ceylon/eclipse/code/correct/ConvertSwitchToIfProposal.java b/...ylon.eclipse.ui/src/com/redhat/ceylon/eclipse/code/correct/ConvertSwitchToIfProposal.java
@@ -183,7 +183,7 @@ static void addConvertIfToSwitchProposal(
                             Tree.Type t = ic.getType();
                             int start = t.getStartIndex();
                             int len = t.getStopIndex()-start+1;
-                            type = doc.get(start, len);
+                            type = "is " + doc.get(start, len);
                         }
                         catch (Exception e) {
                             e.printStackTrace();
@@ -193,7 +193,7 @@ static void addConvertIfToSwitchProposal(
                     else if (condition instanceof Tree.ExistsCondition) {
                         Tree.ExistsCondition ec = 
                                 (Tree.ExistsCondition) condition;
-                        type = ec.getNot() ? "Null" : "Object";
+                        type = ec.getNot() ? "null" : "is Object";
                         try {
                             Tree.Statement v = ec.getVariable();
                             int start = v.getStartIndex();
@@ -205,6 +205,21 @@ else if (condition instanceof Tree.ExistsCondition) {
                             return;
                         }
                     }
+                    else if (condition instanceof Tree.BooleanCondition) {
+                        Tree.BooleanCondition ec = 
+                                (Tree.BooleanCondition) condition;
+                        type = "true";
+                        try {
+                            Tree.Expression e = ec.getExpression();
+                            int start = e.getStartIndex();
+                            int len = e.getStopIndex()-start+1;
+                            var = doc.get(start, len);
+                        }
+                        catch (Exception e) {
+                            e.printStackTrace();
+                            return;
+                        }
+                    }
                     else {
                         return;
                     }
@@ -215,7 +230,7 @@ else if (condition instanceof Tree.ExistsCondition) {
                     tfc.addEdit(new ReplaceEdit(is.getStartIndex(),
                             cl.getStopIndex()-is.getStartIndex()+1, 
                             "switch (" + var + ")" + newline +
-                            "case (is " + type +")"));
+                            "case (" + type +")"));
                     Tree.ElseClause ec = is.getElseClause();
                     if (ec==null) {
                         tfc.addEdit(new InsertEdit(is.getStopIndex()+1,