issue #31: Convert from/to ternary - 2ifelse hints

* updated description too
markiewb · May 14, 2014 · 773cb8d · 773cb8d
1 parent b92096b
commit 773cb8d
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -226,7 +226,9 @@
 &lt;li&gt;"Remove "public abstract" modifiers from method declarations within interfaces" (since 1.1)&lt;/li&gt;
 &lt;li&gt;"Change modifiers" (since 1.2)&lt;/li&gt;
 &lt;li&gt;"Convert char to string and back" (since 1.2)&lt;/li&gt;
+&lt;li&gt;"Convert number in literal to number and back" (since 1.2)&lt;/li&gt;
 &lt;li&gt;"Convert to StringUtils.isBlank()/StringUtils.isNotBlank()/StringUtils.isEmpty()" (since 1.2)&lt;/li&gt;
+&lt;li&gt;"Convert from if/else to ternary and back" (since 1.2)&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;h2&gt;Example:&lt;/h2&gt;
@@ -240,6 +242,7 @@
 &lt;li&gt;[&lt;a href="https://github.com/markiewb/nb-additional-hints/issues/9"&gt;New Hint&lt;/a&gt;]: Convert from char and string and back&lt;/li&gt;
 &lt;li&gt;[&lt;a href="https://github.com/markiewb/nb-additional-hints/issues/10"&gt;New Hint&lt;/a&gt;]: Convert number in literal to number and back&lt;/li&gt;
 &lt;li&gt;[&lt;a href="https://github.com/markiewb/nb-additional-hints/issues/12"&gt;New Hint&lt;/a&gt;]: Convert to StringUtils.isBlank()/StringUtils.isNotBlank()/StringUtils.isEmpty()&lt;/li&gt;
+&lt;li&gt;[&lt;a href="https://github.com/markiewb/nb-additional-hints/issues/31"&gt;New Hint&lt;/a&gt;]: Convert from if/else to ternary and back&lt;/li&gt;
 &lt;li&gt;[&lt;a href="https://github.com/markiewb/nb-additional-hints/issues/29"&gt;Updated Hint&lt;/a&gt;]: "Convert to assertTrue/assertFalse" now supports junit.framework.Assert too&lt;/li&gt;
 &lt;li&gt;[&lt;a href="https://github.com/markiewb/nb-additional-hints/issues/20"&gt;Updated Hint&lt;/a&gt;]: "Replace +..." hints can now be configured&lt;/li&gt;
 &lt;/ul&gt;

diff --git a/src/main/java/de/markiewb/netbeans/plugins/hints/ternary/ToTernary.java b/src/main/java/de/markiewb/netbeans/plugins/hints/ternary/ToTernary.java
@@ -15,9 +15,13 @@
  */
 @NbBundle.Messages({
     "DN_ToTernaryReturn=Convert to ternary return",
-    "DESC_ToTernaryReturn=Converts if statement to ternary return statement. <br>For example: <tt>if ($cond) {return $a;} else {return $b;}</tt> will be transformed to <tt>return ($cond)?$a:$b;</tt><p>Provided by <a href=\"https://github.com/markiewb/nb-additional-hints\">nb-additional-hints</a> plugin</p>",
+    "DESC_ToTernaryReturn=Converts if statement to ternary return statement. <p>For example: <tt>if ($cond) {return $a;} else {return $b;}</tt> will be transformed to <tt>return ($cond) ? $a : $b;</tt></p><p>Provided by <a href=\"https://github.com/markiewb/nb-additional-hints\">nb-additional-hints</a> plugin</p>",
+    "DN_ToIfElseReturn=Convert to if/else return",
+    "DESC_ToIfElseReturn=Converts ternary return statement to if/else statement. <p>For example: <tt>return ($cond) ? $a : $b;</tt> will be transformed to <tt>if ($cond) {return $a;} else {return $b;}</tt></p><p>Provided by <a href=\"https://github.com/markiewb/nb-additional-hints\">nb-additional-hints</a> plugin</p>",
     "DN_ToTernaryAssign=Convert to ternary assignment",
-    "DESC_ToTernaryAssign=Converts if statement to ternary assignment statement. <br>For example: <tt>if ($cond) {$var = $a;}else {$var = $b;}</tt> will be transformed to <tt>$var=($cond)?$a:$b;</tt><p>Provided by <a href=\"https://github.com/markiewb/nb-additional-hints\">nb-additional-hints</a> plugin</p>",})
+    "DESC_ToTernaryAssign=Converts if statement to ternary assignment statement. <p>For example: <tt>if ($cond) {$var = $a;} else {$var = $b;}</tt> will be transformed to <tt>$var = ($cond) ? $a : $b;</tt></p><p>Provided by <a href=\"https://github.com/markiewb/nb-additional-hints\">nb-additional-hints</a> plugin</p>",
+    "DN_ToIfElseAssign=Convert to if/else assignment",
+    "DESC_ToIfElseAssign=Converts ternary assignment statement to if/else statement. <p>For example: <tt>$var = ($cond) ? $a : $b;</tt> will be transformed to <tt>if ($cond) {$var = $a;} else {$var = $b;}</tt></p><p>Provided by <a href=\"https://github.com/markiewb/nb-additional-hints\">nb-additional-hints</a> plugin</p>",})
 public class ToTernary {
 
     @TriggerPattern(value = "if ($cond) {return $a;} else {return $b;}")
@@ -28,11 +32,27 @@ public static ErrorDescription toTernaryReturn(HintContext ctx) {
         return ErrorDescriptionFactory.forName(ctx, ctx.getPath(), Bundle.ERR_ToTernaryReturn(), fix);
     }
 
+    @TriggerPattern(value = "return ($cond)?$a:$b;")
+    @Hint(displayName = "#DN_ToIfElseReturn", description = "#DESC_ToIfElseReturn", category = "suggestions", hintKind = Hint.Kind.ACTION, severity = Severity.HINT)
+    @NbBundle.Messages("ERR_ToIfElseReturn=Convert to if/else return")
+    public static ErrorDescription toIfElseReturn(HintContext ctx) {
+        Fix fix = org.netbeans.spi.java.hints.JavaFixUtilities.rewriteFix(ctx, Bundle.ERR_ToIfElseReturn(), ctx.getPath(), "if ($cond) {return $a;} else {return $b;}");
+        return ErrorDescriptionFactory.forName(ctx, ctx.getPath(), Bundle.ERR_ToIfElseReturn(), fix);
+    }
+
     @TriggerPattern(value = "if ($cond) {$var = $a;}else {$var = $b;}")
     @Hint(displayName = "#DN_ToTernaryAssign", description = "#DESC_ToTernaryAssign", category = "suggestions", hintKind = Hint.Kind.ACTION, severity = Severity.HINT)
     @NbBundle.Messages("ERR_ToTernaryAssign=Convert to ternary assignment")
     public static ErrorDescription toTernaryAssign(HintContext ctx) {
         Fix fix = org.netbeans.spi.java.hints.JavaFixUtilities.rewriteFix(ctx, Bundle.ERR_ToTernaryAssign(), ctx.getPath(), "$var=($cond)?$a:$b;");
         return ErrorDescriptionFactory.forName(ctx, ctx.getPath(), Bundle.ERR_ToTernaryAssign(), fix);
     }
+
+    @TriggerPattern(value = "$var=($cond)?$a:$b;")
+    @Hint(displayName = "#DN_ToIfElseAssign", description = "#DESC_ToIfElseAssign", category = "suggestions", hintKind = Hint.Kind.ACTION, severity = Severity.HINT)
+    @NbBundle.Messages("ERR_ToIfElseAssign=Convert to if/else assignment")
+    public static ErrorDescription toIfElseAssign(HintContext ctx) {
+        Fix fix = org.netbeans.spi.java.hints.JavaFixUtilities.rewriteFix(ctx, Bundle.ERR_ToIfElseAssign(), ctx.getPath(), "if ($cond) {$var = $a;}else {$var = $b;}");
+        return ErrorDescriptionFactory.forName(ctx, ctx.getPath(), Bundle.ERR_ToIfElseAssign(), fix);
+    }
 }
diff --git a/src/test/java/de/markiewb/netbeans/plugins/hints/ternary/ToTernaryTest.java b/src/test/java/de/markiewb/netbeans/plugins/hints/ternary/ToTernaryTest.java
@@ -36,6 +36,30 @@ public void testToTernaryReturn() throws Exception {
                         + "}\n");
 
     }
+
+    @Test
+    public void testToIfElseReturn() throws Exception {
+        HintTest.create()
+                .setCaretMarker('|')
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public static int main(String[] args) {\n"
+                        + "        return (tr|ue) ? 1 : 0;\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(ToTernary.class)
+                .findWarning("3:18-3:18:hint:" + Bundle.ERR_ToIfElseReturn())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    public static int main(String[] args) {\n"
+                        + "        if (true) { return 1; } else { return 0; }\n"
+                        + "    }\n"
+                        + "}\n");
+
+    }
+
     @Test
     public void testToTernaryAssign() throws Exception {
         HintTest.create()
@@ -60,5 +84,29 @@ public void testToTernaryAssign() throws Exception {
                         + "}\n");
 
     }
+    @Test
+    public void testToIfElseAssign() throws Exception {
+        HintTest.create()
+                .setCaretMarker('|')
+                .input("package test;\n"
+                        + "public class Test {\n"
+                        + "    public static void main(String[] args) {\n"
+                        + "        int s;\n"
+                        + "        s = (t|rue) ? 1 : 0;\n"
+                        + "    }\n"
+                        + "}\n")
+                .run(ToTernary.class)
+                .findWarning("4:14-4:14:hint:" + Bundle.ERR_ToIfElseAssign())
+                .applyFix()
+                .assertCompilable()
+                .assertOutput("package test;\n"
+                        + "public class Test {\n"
+                        + "    public static void main(String[] args) {\n"
+                        + "        int s;\n"
+                        + "        if (true) { s = 1; } else { s = 0; }\n"
+                        + "    }\n"
+                        + "}\n");
+
+    }
 
 }
diff --git a/src/test/java/example/ToTernary.java b/src/test/java/example/ToTernary.java
@@ -0,0 +1,20 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package example;
+
+/**
+ *
+ * @author markiewb
+ */
+public class ToTernary {
+
+    static int s;
+
+    public static int main(String[] args) {
+        s = (true) ? 1 : 0;
+        return (true) ? 1 : 0;
+    }
+}