Fixes END FORALL end of scope error

Case select with forall causes unexpected end of scope #18

Author: gnikit

CHANGELOG.md

@@ -36,6 +36,8 @@
   ([gnikit/fortls#13](https://github.com/gnikit/fortls/issues/13))
 - `POINTER` attribute now displays upon hover
   ([gnikit/fortls#16](https://github.com/gnikit/fortls/issues/16))
+- Fixes `END FORALL` end of scope error
+  ([gnikit/fortls#18](https://github.com/gnikit/fortls/issues/18))
 
 ## 1.16.0
 

fortls/regex_patterns.py

@@ -48,7 +48,7 @@
 END_WORD_REGEX = re.compile(
     r"[ ]*END[ ]*(DO|WHERE|IF|BLOCK|ASSOCIATE|SELECT"
     r"|TYPE|ENUM|MODULE|SUBMODULE|PROGRAM|INTERFACE"
-    r"|SUBROUTINE|FUNCTION|PROCEDURE)?([ ]+(?!\W)|$)",
+    r"|SUBROUTINE|FUNCTION|PROCEDURE|FORALL)?([ ]+(?!\W)|$)",
     re.I,
 )
 TYPE_DEF_REGEX = re.compile(r"[ ]*(TYPE)[, :]+", re.I)

test/test_server.py

@@ -178,6 +178,7 @@ def check_return(result_array):
             ["test", 6, 7],
             ["test_abstract", 2, 0],
             ["test_external", 2, 0],
+            ["test_forall", 2, 0],
             ["test_free", 2, 0],
             ["test_gen_type", 5, 1],
             ["test_generic", 2, 0],
@@ -603,6 +604,7 @@ def test_diagnostics():
 
     def check_return(results, ref_results):
         for i, r in enumerate(results):
+            print(r["diagnostics"], ref_results[i])
             assert r["diagnostics"] == ref_results[i]
 
     string = write_rpc_request(1, "initialize", {"rootPath": test_dir})
@@ -633,8 +635,15 @@ def check_return(results, ref_results):
     string += write_rpc_notification(
         "textDocument/didOpen", {"textDocument": {"uri": file_path}}
     )
+    # Checks that forall with end forall inside a case select does not cause
+    # unexpected end of scope.
+    file_path = os.path.join(test_dir, "diag", "test_forall.f90")
+    string += write_rpc_notification(
+        "textDocument/didOpen", {"textDocument": {"uri": file_path}}
+    )
     errcode, results = run_request(string)
     assert errcode == 0
+    file_path = os.path.join(test_dir, "diag", "test_external.f90")
     ref_results = [
         [],
         [],
@@ -682,6 +691,7 @@ def check_return(results, ref_results):
                 ],
             },
         ],
+        [],
     ]
     check_return(results[1:], ref_results)
 

test/test_source/diag/test_forall.f90

@@ -0,0 +1,14 @@
+program test_forall
+   implicit none
+   integer :: i, j, dim=3, a(10) = 2
+
+   select case (dim)
+    case(3)
+      forall(i=1:10)
+         a(i) = a(i) **2
+         forall (j=1:i) a(j) = a(j) ** 2
+      end forall
+    case default
+      call abort()
+   end select
+end program test_forall