Add MisleadingIndentation linting for On statement

Also added testing

Signed-off-by: Shreyas Khandekar <[email protected]>

Author: ShreyasKhandekar

test/chplcheck/MisleadingIndentation.chpl

@@ -28,4 +28,55 @@ writeln("second thing");
           writeln("Hello, world!");
       var unrelated = "hi";
   }
+
+  on Locale[0] do
+    writeln("Hello, world!");
+    writeln("Hello, world!");
+
+  for 1..10 do
+    for 1..10 do
+      writeln("Hello, world!");
+      writeln("Hello, world!");
+
+  for 1..10 do
+    on Locale[0] do
+      writeln("Hello, world!");
+      writeln("Hello, world!");
+
+  on Locale[0] do
+    for 1..10 do
+      writeln("Hello, world!");
+      writeln("Hello, world!");
+
+  on Locale[0] do
+    on Locale[0] do
+      writeln("Hello, world!");
+      writeln("Hello, world!");
+
+
+  for 1..10 do
+    for 1..10 do
+      for 1..10 do
+        writeln("Hello, world!");
+        writeln("Hello, world!");
+
+  for 1..10 do
+    for 1..10 do
+      for 1..10 do
+        for 1..10 do
+          writeln("Hello, world!");
+          writeln("Hello, world!");
+
+  for 1..10 do
+    for 1..10 do
+      on Locale[0] do
+        writeln("Hello, world!");
+        writeln("Hello, world!");
+
+  on Locale[0] do
+    on Locale[0] do
+      on Locale[0] do
+        writeln("Hello, world!");
+        writeln("Hello, world!");
+
 }

test/chplcheck/MisleadingIndentation.good

@@ -3,4 +3,13 @@ MisleadingIndentation.chpl:13: node violates rule MisleadingIndentation
 MisleadingIndentation.chpl:18: node violates rule MisleadingIndentation
 MisleadingIndentation.chpl:23: node violates rule IncorrectIndentation
 MisleadingIndentation.chpl:24: node violates rule MisleadingIndentation
+MisleadingIndentation.chpl:34: node violates rule MisleadingIndentation
+MisleadingIndentation.chpl:39: node violates rule MisleadingIndentation
+MisleadingIndentation.chpl:44: node violates rule MisleadingIndentation
+MisleadingIndentation.chpl:49: node violates rule MisleadingIndentation
+MisleadingIndentation.chpl:54: node violates rule MisleadingIndentation
+MisleadingIndentation.chpl:61: node violates rule MisleadingIndentation
+MisleadingIndentation.chpl:68: node violates rule MisleadingIndentation
+MisleadingIndentation.chpl:74: node violates rule MisleadingIndentation
+MisleadingIndentation.chpl:80: node violates rule MisleadingIndentation
 [Success matching fixit for MisleadingIndentation]

test/chplcheck/MisleadingIndentation.good-fixit

@@ -30,4 +30,55 @@ writeln(i);
           writeln("Hello, world!");
       var unrelated = "hi";
   }
+
+  on Locale[0] do
+    writeln("Hello, world!");
+  writeln("Hello, world!");
+
+  for 1..10 do
+    for 1..10 do
+      writeln("Hello, world!");
+  writeln("Hello, world!");
+
+  for 1..10 do
+    on Locale[0] do
+      writeln("Hello, world!");
+  writeln("Hello, world!");
+
+  on Locale[0] do
+    for 1..10 do
+      writeln("Hello, world!");
+  writeln("Hello, world!");
+
+  on Locale[0] do
+    on Locale[0] do
+      writeln("Hello, world!");
+  writeln("Hello, world!");
+
+
+  for 1..10 do
+    for 1..10 do
+      for 1..10 do
+        writeln("Hello, world!");
+  writeln("Hello, world!");
+
+  for 1..10 do
+    for 1..10 do
+      for 1..10 do
+        for 1..10 do
+          writeln("Hello, world!");
+  writeln("Hello, world!");
+
+  for 1..10 do
+    for 1..10 do
+      on Locale[0] do
+        writeln("Hello, world!");
+  writeln("Hello, world!");
+
+  on Locale[0] do
+    on Locale[0] do
+      on Locale[0] do
+        writeln("Hello, world!");
+  writeln("Hello, world!");
+
 }

tools/chplcheck/src/rules.py

@@ -551,9 +551,9 @@ def MisleadingIndentation(context: Context, root: AstNode):
             fix = append_nested_single_stmt(child, prev)
 
     def append_nested_single_stmt(node, prev: List[AstNode]):
-        if (isinstance(node, Loop)) and node.block_style() == "implicit":
+        if isinstance(node, Loop) and node.block_style() == "implicit":
             children = list(node)
-            # safe to access [-1], loops or on stmt must have at least 1 child
+            # safe to access [-1], loops must have at least 1 child
             for blockchild in reversed(list(children[-1])):
                 if isinstance(blockchild, Comment):
                     continue
@@ -562,6 +562,16 @@ def append_nested_single_stmt(node, prev: List[AstNode]):
                 prev.append(blockchild)
                 append_nested_single_stmt(blockchild, prev)
                 return node # Return the outermost loop to use an anchor
+        elif isinstance(node, On) and node.block_style() == "implicit":
+            for stmt in node.stmts():
+                if isinstance(stmt, Comment):
+                    continue
+                if might_incorrectly_report_location(stmt):
+                    continue
+                prev.append(stmt)
+                append_nested_single_stmt(stmt, prev)
+                return node # Return the outermost on to use an anchor
+        # Should we also check for Conditionals here?
         return None
 
     @driver.fixit(MisleadingIndentation)