softBuiltDeveloper
diff --git a/‎python-checks/src/main/java/org/sonar/python/checks/NestedControlFlowDepthCheck.java‎
Lines changed: 22 additions & 10 deletions b/‎python-checks/src/main/java/org/sonar/python/checks/NestedControlFlowDepthCheck.java‎
Lines changed: 22 additions & 10 deletions
diff --git a/‎python-checks/src/test/java/org/sonar/python/checks/NestedControlFlowDepthCheckTest.java‎
Lines changed: 2 additions & 8 deletions b/‎python-checks/src/test/java/org/sonar/python/checks/NestedControlFlowDepthCheckTest.java‎
Lines changed: 2 additions & 8 deletions
diff --git a/‎python-checks/src/test/resources/checks/nestedControlFlowDepth.py‎
Lines changed: 10 additions & 9 deletions b/‎python-checks/src/test/resources/checks/nestedControlFlowDepth.py‎
Lines changed: 10 additions & 9 deletions
@@ -20,14 +20,16 @@
 package org.sonar.python.checks;
 
 import com.sonar.sslr.api.AstNode;
-import com.sonar.sslr.api.Grammar;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.Iterator;
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
+import org.sonar.python.PythonCheck;
 import org.sonar.python.api.PythonGrammar;
 import org.sonar.squidbridge.annotations.ActivatedByDefault;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
-import org.sonar.squidbridge.checks.SquidCheck;
 
 @Rule(
     key = NestedControlFlowDepthCheck.CHECK_KEY,
@@ -37,17 +39,18 @@
 )
 @SqaleConstantRemediation("10min")
 @ActivatedByDefault
-public class NestedControlFlowDepthCheck extends SquidCheck<Grammar> {
+public class NestedControlFlowDepthCheck extends PythonCheck {
 
   public static final String CHECK_KEY = "S134";
   private static final int DEFAULT_MAX = 4;
+  private static final String MESSAGE = "Refactor this code to not nest more than %s \"if\", \"for\", \"while\", \"try\" and \"with\" statements.";
 
   @RuleProperty(
     key = "max",
     defaultValue = "" + DEFAULT_MAX)
   public int max = DEFAULT_MAX;
 
-  private int depth;
+  private Deque<AstNode> depthNodes;
 
   @Override
   public void init() {
@@ -61,21 +64,30 @@ public void init() {
 
   @Override
   public void visitFile(AstNode astNode) {
-    depth = 0;
+    depthNodes = new ArrayDeque<>();
   }
 
   @Override
   public void visitNode(AstNode node) {
-    depth++;
-    if (depth == max + 1) {
-      String message = "Refactor this code to not nest more than {0} \"if\", \"for\", \"while\", \"try\" and \"with\" statements.";
-      getContext().createLineViolation(this, message, node, max);
+    AstNode stmtKeywordNode = node.getFirstChild();
+    depthNodes.push(stmtKeywordNode);
+    if (depthNodes.size() == max + 1) {
+      PreciseIssue issue = addIssue(stmtKeywordNode, String.format(MESSAGE, max));
+
+      Iterator<AstNode> depthNodesIterator = depthNodes.iterator();
+
+      // skip current node
+      depthNodesIterator.next();
+
+      while (depthNodesIterator.hasNext()) {
+        issue.secondary(depthNodesIterator.next(), "Nesting +1");
+      }
     }
   }
 
   @Override
   public void leaveNode(AstNode astNode) {
-    depth--;
+    depthNodes.pop();
   }
 }
 
@@ -21,20 +21,14 @@
 
 import java.io.File;
 import org.junit.Test;
-import org.sonar.python.PythonAstScanner;
-import org.sonar.squidbridge.api.SourceFile;
-import org.sonar.squidbridge.checks.CheckMessagesVerifier;
+import org.sonar.python.checks.utils.PythonCheckVerifier;
 
 public class NestedControlFlowDepthCheckTest {
 
   @Test
   public void test() {
     NestedControlFlowDepthCheck check = new NestedControlFlowDepthCheck();
-    SourceFile file = PythonAstScanner.scanSingleFile(new File("src/test/resources/checks/nestedControlFlowDepth.py"), check);
-    CheckMessagesVerifier.verify(file.getCheckMessages())
-      .next().atLine(10).withMessage(
-        "Refactor this code to not nest more than 4 \"if\", \"for\", \"while\", \"try\" and \"with\" statements.")
-      .noMore();
+    PythonCheckVerifier.verify(new File("src/test/resources/checks/nestedControlFlowDepth.py"), check);
   }
 
 }
@@ -1,12 +1,13 @@
 for y in range(10):
-	if x > y:
-		if x > 1:
-			pass
+    if x > y:
+        if x > 1:
+            pass
 
 for x in range(10):
-	while x:
-		for y in range(10):
-			if x > y:
-				if x > 1:
-					if y > 10:
-						pass
+    while x:
+        for y in range(10):
+            if x > y:
+                if x > 1:  # Noncompliant [[secondary=-4,-3,-2,-1]] {{Refactor this code to not nest more than 4 "if", "for", "while", "try" and "with" statements.}}
+#               ^^
+                    if y > 10:
+                        pass