Add 'replace with return' quick fix

This change adds a 'replace with return' quick fix and addresses
#2002.

Author: sjamesr

src/com/goide/inspections/GoContinueNotInLoopInspection.java

@@ -19,16 +19,20 @@
 import com.goide.psi.GoContinueStatement;
 import com.goide.psi.GoForStatement;
 import com.goide.psi.GoVisitor;
-import com.intellij.codeInspection.LocalInspectionToolSession;
-import com.intellij.codeInspection.ProblemHighlightType;
-import com.intellij.codeInspection.ProblemsHolder;
+import com.goide.psi.impl.GoElementFactory;
+import com.intellij.codeInspection.*;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Raises an error when a 'continue' statement is found outside of a for loop.
  */
 public class GoContinueNotInLoopInspection extends GoInspectionBase {
+  public static String QUICK_FIX_NAME = "Replace with 'return'";
+
   @NotNull
   @Override
   protected GoVisitor buildGoVisitor(@NotNull final ProblemsHolder holder, @NotNull LocalInspectionToolSession session) {
@@ -37,9 +41,28 @@ protected GoVisitor buildGoVisitor(@NotNull final ProblemsHolder holder, @NotNul
       public void visitContinueStatement(@NotNull GoContinueStatement o) {
         if (PsiTreeUtil.getParentOfType(o.getContinue(), GoForStatement.class) == null) {
           holder
-            .registerProblem(o.getContinue(), "Continue statement not inside a for loop.", ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
+            .registerProblem(o.getContinue(), "Continue statement not inside a for loop.", ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+                             new ReplaceWithReturnQuickFix());
         }
       }
     };
   }
+
+  private static class ReplaceWithReturnQuickFix extends LocalQuickFixBase {
+    private ReplaceWithReturnQuickFix() {
+      super(QUICK_FIX_NAME);
+    }
+
+    @Override
+    public void applyFix(@NotNull final Project project, @NotNull ProblemDescriptor descriptor) {
+      final PsiElement element = descriptor.getPsiElement();
+      if (element == null) return;
+      new WriteCommandAction.Simple(project, getName(), element.getContainingFile()) {
+        @Override
+        protected void run() throws Throwable {
+          element.replace(GoElementFactory.createReturnStatement(project));
+        }
+      }.execute();
+    }
+  }
 }

src/com/goide/psi/impl/GoElementFactory.java

@@ -38,6 +38,12 @@ private static GoFile createFileFromText(@NotNull Project project, @NotNull Stri
     return (GoFile)PsiFileFactory.getInstance(project).createFileFromText("a.go", GoLanguage.INSTANCE, text);
   }
 
+  @NotNull
+  public static PsiElement createReturnStatement(@NotNull Project project) {
+    GoFile file = createFileFromText(project, "package main\nfunc _() { return; }");
+    return PsiTreeUtil.findChildOfType(file, GoReturnStatement.class);
+  }
+
   @NotNull
   public static PsiElement createIdentifierFromText(@NotNull Project project, String text) {
     GoFile file = createFileFromText(project, "package " + text);

testData/quickfixes/continue-outside-loop/simple-after.go

@@ -0,0 +1,5 @@
+package continue_outside_loop
+
+func _() {
+	return
+}

testData/quickfixes/continue-outside-loop/simple.go

@@ -0,0 +1,5 @@
+package continue_outside_loop
+
+func _() {
+	c<caret>ontinue
+}

tests/com/goide/quickfix/GoContinueNotInLoopQuickFixTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.goide.quickfix;
+
+import com.goide.inspections.GoContinueNotInLoopInspection;
+import com.goide.inspections.GoRenameToBlankQuickFix;
+import org.jetbrains.annotations.NotNull;
+
+public class GoContinueNotInLoopQuickFixTest extends GoQuickFixTestBase {
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    myFixture.enableInspections(GoContinueNotInLoopInspection.class);
+  }
+
+  @NotNull
+  @Override
+  protected String getBasePath() {
+    return "quickfixes/continue-outside-loop";
+  }
+
+  public void testSimple()      { doTest(GoContinueNotInLoopInspection.QUICK_FIX_NAME);      }
+}