Change in the For*Intention and ifIntention to generate through templates.

jhsx · jhsx · commit 04fc79a1ad64 · 2014-03-21T09:55:15.000Z
diff --git a/src/ro/redeul/google/go/intentions/statements/BaseBoolStatement.java b/src/ro/redeul/google/go/intentions/statements/BaseBoolStatement.java
diff --git a/src/ro/redeul/google/go/intentions/statements/ConvertStatementToForRangeIntention.java b/src/ro/redeul/google/go/intentions/statements/ConvertStatementToForRangeIntention.java
@@ -1,13 +1,13 @@
 package ro.redeul.google.go.intentions.statements;
 
-import com.intellij.openapi.editor.Document;
+import com.intellij.codeInsight.template.impl.TemplateImpl;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.PsiWhiteSpace;
 import org.jetbrains.annotations.NotNull;
+import ro.redeul.google.go.editor.TemplateUtil;
 import ro.redeul.google.go.intentions.Intention;
 import ro.redeul.google.go.intentions.IntentionExecutionException;
 import ro.redeul.google.go.lang.psi.expressions.GoExpr;
@@ -24,8 +24,9 @@
 import ro.redeul.google.go.lang.psi.utils.GoTypeUtils;
 import ro.redeul.google.go.util.GoUtil;
 
+import java.util.ArrayList;
+
 import static ro.redeul.google.go.lang.psi.utils.GoPsiUtils.findParentOfType;
-import static ro.redeul.google.go.util.EditorUtil.reformatPositions;
 
 public class ConvertStatementToForRangeIntention extends Intention {
 
@@ -78,15 +79,19 @@ protected boolean satisfiedBy(PsiElement element) {
     @Override
     protected void processIntention(@NotNull PsiElement element, Editor editor)
             throws IntentionExecutionException {
-        Document document = editor.getDocument();
+
+
         TextRange textRange = statement.getTextRange();
-        RangeMarker range = document.createRangeMarker(textRange.getStartOffset(), textRange.getEndOffset());
-        document.deleteString(textRange.getStartOffset(), textRange.getEndOffset());
+        ArrayList<String> arguments = new ArrayList<String>();
+
+
+        StringBuilder templateString = new StringBuilder();
 
-        StringBuilder iFString = new StringBuilder();
         String k = "k";
         String v = "v";
+
         int i = 0;
+
         while (GoUtil.TestDeclVar(expr, k)) {
             k = String.format("k%d", i);
             i++;
@@ -98,19 +103,13 @@ protected void processIntention(@NotNull PsiElement element, Editor editor)
             i++;
         }
 
-        iFString.append("for ")
-                .append(k)
-                .append(",")
-                .append(v)
-                .append(":= range ")
-                .append(expr.getText())
-                .append("{");
 
-        document.insertString(textRange.getStartOffset(), iFString.toString() + "}");
+        arguments.add(k);
+        arguments.add(v);
+
+        TemplateImpl template = TemplateUtil.createTemplate(String.format("for $v0$,$v1$ := range %s{$END$}", expr.getText()));
+        TemplateUtil.runTemplate(editor, textRange, arguments, template);
 
-        if (editor != null)
-            editor.getCaretModel().moveToOffset(textRange.getStartOffset() + 15 + v.length() + k.length() + expr.getTextLength());
-        reformatPositions(statement.getContainingFile(), range);
     }
 
 }
diff --git a/src/ro/redeul/google/go/intentions/statements/ConvertStatementToForWhileIntention.java b/src/ro/redeul/google/go/intentions/statements/ConvertStatementToForWhileIntention.java
@@ -1,28 +1,9 @@
 package ro.redeul.google.go.intentions.statements;
 
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.RangeMarker;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import org.jetbrains.annotations.NotNull;
-import ro.redeul.google.go.intentions.IntentionExecutionException;
-
-import static ro.redeul.google.go.util.EditorUtil.reformatPositions;
-
-public class ConvertStatementToForWhileIntention extends BaseBoolStatement {
+public class ConvertStatementToForWhileIntention extends ConvertStatementToIfIntention {
 
     @Override
-    protected void processIntention(@NotNull PsiElement element, Editor editor)
-            throws IntentionExecutionException {
-        Document document = editor.getDocument();
-        TextRange textRange = statement.getTextRange();
-        RangeMarker range = document.createRangeMarker(textRange.getStartOffset(), textRange.getEndOffset());
-        document.deleteString(textRange.getStartOffset(), textRange.getEndOffset());
-
-        document.insertString(textRange.getStartOffset(), "for " + expr.getText() + "{" + "}");
-        if (editor != null) editor.getCaretModel().moveToOffset(textRange.getStartOffset() + 5 + expr.getTextLength());
-        reformatPositions(statement.getContainingFile(), range);
+    protected String getKeyword() {
+        return "for";
     }
-
 }
diff --git a/src/ro/redeul/google/go/intentions/statements/ConvertStatementToIfIntention.java b/src/ro/redeul/google/go/intentions/statements/ConvertStatementToIfIntention.java
@@ -1,29 +1,94 @@
 package ro.redeul.google.go.intentions.statements;
 
-import com.intellij.openapi.editor.Document;
+import com.intellij.codeInsight.template.impl.TemplateImpl;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiWhiteSpace;
 import org.jetbrains.annotations.NotNull;
+import ro.redeul.google.go.editor.TemplateUtil;
+import ro.redeul.google.go.intentions.Intention;
 import ro.redeul.google.go.intentions.IntentionExecutionException;
+import ro.redeul.google.go.lang.psi.GoPsiElement;
+import ro.redeul.google.go.lang.psi.expressions.GoExpr;
+import ro.redeul.google.go.lang.psi.expressions.binary.GoLogicalAndExpression;
+import ro.redeul.google.go.lang.psi.expressions.binary.GoLogicalOrExpression;
+import ro.redeul.google.go.lang.psi.expressions.binary.GoRelationalExpression;
+import ro.redeul.google.go.lang.psi.expressions.literals.GoLiteralIdentifier;
+import ro.redeul.google.go.lang.psi.expressions.primary.GoLiteralExpression;
+import ro.redeul.google.go.lang.psi.statements.GoExpressionStatement;
+import ro.redeul.google.go.lang.psi.types.GoPsiType;
+import ro.redeul.google.go.lang.psi.types.GoPsiTypeName;
+import ro.redeul.google.go.lang.psi.typing.GoType;
+import ro.redeul.google.go.lang.psi.typing.GoTypePsiBacked;
+import ro.redeul.google.go.lang.psi.utils.GoTypeUtils;
+import ro.redeul.google.go.util.GoUtil;
 
-import static ro.redeul.google.go.util.EditorUtil.reformatPositions;
+import java.util.ArrayList;
 
+import static ro.redeul.google.go.lang.psi.utils.GoPsiUtils.findParentOfType;
 
-public class ConvertStatementToIfIntention extends BaseBoolStatement {
 
+public class ConvertStatementToIfIntention extends Intention {
+
+
+    protected GoExpressionStatement statement;
+    protected GoExpr expr;
+
+    @Override
+    protected boolean satisfiedBy(PsiElement element) {
+        statement = element instanceof GoExpressionStatement ? (GoExpressionStatement) element : findParentOfType(element, GoExpressionStatement.class);
+        if (statement == null && element instanceof PsiWhiteSpace && element.getPrevSibling() instanceof GoExpressionStatement) {
+            statement = (GoExpressionStatement) element.getPrevSibling();
+        }
+        if (statement != null) {
+            expr = statement.getExpression();
+            if (expr != null) {
+                if (expr instanceof GoRelationalExpression
+                        || expr instanceof GoLogicalAndExpression
+                        || expr instanceof GoLogicalOrExpression)
+                    return true;
+
+                for (GoType goType : expr.getType()) {
+                    if (goType != null) {
+                        if (goType instanceof GoTypePsiBacked) {
+                            GoPsiType psiType = GoTypeUtils.resolveToFinalType(((GoTypePsiBacked) goType).getPsiType());
+                            if (psiType instanceof GoPsiTypeName)
+                                return psiType.getText().equals("bool") && ((GoPsiTypeName) psiType).isPrimitive();
+                        }
+                    }
+                }
+                if (expr instanceof GoLiteralExpression) {
+                    PsiElement literal = ((GoLiteralExpression) expr).getLiteral();
+                    if (literal instanceof GoLiteralIdentifier) {
+                        literal = GoUtil.ResolveTypeOfVarDecl((GoPsiElement) literal);
+                        if (literal.getText().equals("true") || literal.getText().equals("false")) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    protected String getKeyword() {
+        return "if";
+    }
 
     @Override
     protected void processIntention(@NotNull PsiElement element, Editor editor)
             throws IntentionExecutionException {
-        Document document = editor.getDocument();
+
         TextRange textRange = statement.getTextRange();
-        RangeMarker range = document.createRangeMarker(textRange.getStartOffset(), textRange.getEndOffset());
-        document.deleteString(textRange.getStartOffset(), textRange.getEndOffset());
-        document.insertString(textRange.getStartOffset(), "if " + expr.getText() + "{" + "}");
-        if (editor != null) editor.getCaretModel().moveToOffset(textRange.getStartOffset() + 4 + expr.getTextLength());
-        reformatPositions(statement.getContainingFile(), range);
+
+        GoType[] types = expr.getType();
+        TemplateImpl template;
+
+        template = TemplateUtil.createTemplate(String.format("%s %s {$END$}", getKeyword(), expr.getText()));
+
+        TemplateUtil.runTemplate(editor, textRange, new ArrayList<String>(), template);
+
     }
 
 }
diff --git a/testdata/intentions/statements/convertStatementToForRangeIntention/callMapExpression.test b/testdata/intentions/statements/convertStatementToForRangeIntention/callMapExpression.test
@@ -11,5 +11,5 @@ func GetMap()map[string]string{
     return map[string]string{}
 }
 func main() {
-    for k,v:= range GetMap(){<caret>}
+	for k, v := range GetMap() {<caret>}
 }
diff --git a/testdata/intentions/statements/convertStatementToForRangeIntention/callSliceExpression.test b/testdata/intentions/statements/convertStatementToForRangeIntention/callSliceExpression.test
@@ -11,5 +11,5 @@ func GetSlice()[]string{
     return []string{}
 }
 func main() {
-    for k,v:= range GetSlice(){<caret>}
+	for k, v := range GetSlice() {<caret>}
 }
diff --git a/testdata/intentions/statements/convertStatementToForRangeIntention/subTypeExpression.test b/testdata/intentions/statements/convertStatementToForRangeIntention/subTypeExpression.test
@@ -19,5 +19,5 @@ func GetSlice()Values{
 }
 func main() {
     slice:=GetSlice()
-    for k,v:= range slice{<caret>}
+	for k, v := range slice {<caret>}
 }
diff --git a/testdata/intentions/statements/convertStatementToForRangeIntention/subTypeInRangeValExpression.test b/testdata/intentions/statements/convertStatementToForRangeIntention/subTypeInRangeValExpression.test
@@ -22,6 +22,6 @@ func GetSlice()Values{
 func main() {
     slice:=GetSlice()
     for k,v:= range slice{
-        for k0,v0:= range v{<caret>}
+		for k0, v0 := range v {<caret>}
     }
 }
diff --git a/testdata/intentions/statements/convertStatementToForRangeIntention/varSliceExpression.test b/testdata/intentions/statements/convertStatementToForRangeIntention/varSliceExpression.test
@@ -13,5 +13,5 @@ func GetSlice()[]string{
 }
 func main() {
     slice:=GetSlice()
-    for k,v:= range slice{<caret>}
+	for k, v := range slice {<caret>}
 }
diff --git a/testdata/intentions/statements/convertStatementToForRangeIntention/variadicSliceExpression.test b/testdata/intentions/statements/convertStatementToForRangeIntention/variadicSliceExpression.test
@@ -8,7 +8,7 @@ func main() {
 -----
 package main
 func VariadicFn(str_list ...string){
-    for k,v:= range str_list{<caret>}
+	for k, v := range str_list {<caret>}
 }
 func main() {
     VariadicFn("str_1","str_2")
diff --git a/testdata/intentions/statements/convertStatementToIfIntention/callExpression.test b/testdata/intentions/statements/convertStatementToIfIntention/callExpression.test
@@ -11,5 +11,5 @@ func IsValid()bool{
     return false
 }
 func main() {
-    if IsValid(){<caret>}
+	if IsValid() {<caret>}
 }
diff --git a/testdata/intentions/statements/convertStatementToIfIntention/logicalExpression.test b/testdata/intentions/statements/convertStatementToIfIntention/logicalExpression.test
@@ -7,5 +7,5 @@ func main() {
 package main
 
 func main() {
-    if (1+2)==3||true{<caret>}
+	if (1+2) == 3 || true {<caret>}
 }
diff --git a/testdata/intentions/statements/convertStatementToIfIntention/simpleExpression.test b/testdata/intentions/statements/convertStatementToIfIntention/simpleExpression.test
@@ -7,5 +7,5 @@ func main() {
 package main
 
 func main() {
-    if true==true{<caret>}
+	if true == true {<caret>}
 }
diff --git a/testdata/intentions/statements/convertStatementToIfIntention/varExpression.test b/testdata/intentions/statements/convertStatementToIfIntention/varExpression.test
@@ -9,5 +9,5 @@ package main
 
 func main() {
     var isValid = true
-    if isValid{<caret>}
+	if isValid {<caret>}
 }

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ func GetMap()map[string]string{`
`11`	`11`	`return map[string]string{}`
`12`	`12`	`}`
`13`	`13`	`func main() {`
`14`		`- for k,v:= range GetMap(){<caret>}`
	`14`	`+ for k, v := range GetMap() {<caret>}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ func GetSlice()[]string{`
`11`	`11`	`return []string{}`
`12`	`12`	`}`
`13`	`13`	`func main() {`
`14`		`- for k,v:= range GetSlice(){<caret>}`
	`14`	`+ for k, v := range GetSlice() {<caret>}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ func GetSlice()Values{`
`19`	`19`	`}`
`20`	`20`	`func main() {`
`21`	`21`	`slice:=GetSlice()`
`22`		`- for k,v:= range slice{<caret>}`
	`22`	`+ for k, v := range slice {<caret>}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ func GetSlice()Values{`
`22`	`22`	`func main() {`
`23`	`23`	`slice:=GetSlice()`
`24`	`24`	`for k,v:= range slice{`
`25`		`- for k0,v0:= range v{<caret>}`
	`25`	`+ for k0, v0 := range v {<caret>}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ func GetSlice()[]string{`
`13`	`13`	`}`
`14`	`14`	`func main() {`
`15`	`15`	`slice:=GetSlice()`
`16`		`- for k,v:= range slice{<caret>}`
	`16`	`+ for k, v := range slice {<caret>}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ func main() {`
`8`	`8`	`-----`
`9`	`9`	`package main`
`10`	`10`	`func VariadicFn(str_list ...string){`
`11`		`- for k,v:= range str_list{<caret>}`
	`11`	`+ for k, v := range str_list {<caret>}`
`12`	`12`	`}`
`13`	`13`	`func main() {`
`14`	`14`	`VariadicFn("str_1","str_2")`