Merge pull request #2025 from sjamesr/continue_fixups

fix 'continue not in a loop' inspector

Author: ignatov

src/com/goide/inspections/GoContinueNotInLoopInspection.java

@@ -18,6 +18,7 @@
 
 import com.goide.psi.GoContinueStatement;
 import com.goide.psi.GoForStatement;
+import com.goide.psi.GoFunctionLit;
 import com.goide.psi.GoVisitor;
 import com.goide.psi.impl.GoElementFactory;
 import com.intellij.codeInspection.*;
@@ -39,9 +40,9 @@ protected GoVisitor buildGoVisitor(@NotNull final ProblemsHolder holder, @NotNul
     return new GoVisitor() {
       @Override
       public void visitContinueStatement(@NotNull GoContinueStatement o) {
-        if (PsiTreeUtil.getParentOfType(o, GoForStatement.class) == null) {
-          holder.registerProblem(o, "Continue statement not inside a for loop.", ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                                 new ReplaceWithReturnQuickFix());
+        if (!(PsiTreeUtil.getParentOfType(o, GoForStatement.class, GoFunctionLit.class) instanceof GoForStatement)) {
+          holder.registerProblem(o, "Continue statement not inside a for loop.",
+                                 ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new ReplaceWithReturnQuickFix());
         }
       }
     };

testData/highlighting/continue.go

@@ -5,6 +5,10 @@ import "fmt"
 func _() {
 	for i := 0; i < 10; i++ {
 		fmt.Printf("%d\n", i)
+		f := func() {
+			<error>continue</error>
+		}
+        f()
 		continue
 	}
 
@@ -13,4 +17,16 @@ func _() {
 	if 1 > 0 {
 		<error>continue</error>
 	}
+
+    for i := 0; i < 10; i++ {
+		defer func() {
+			<error>continue</error>
+		}()
+
+		go func() {
+			<error>continue</error>
+		}()
+
+		continue
+	}
 }