Fixes end of scope caused by end named vars

Fixes END variable closes scope prematurely #9

The solution is to perform a negative lookahead for non-word characters

Author: gnikit

CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELONG
 
+## 1.15.1
+
+### Fixes
+
+- Fixes premature end of scope with variables named `end`
+  ([gnikit/fortls#9](https://github.com/gnikit/fortls/issues/9))
+
+## 1.15.0
+
+### Adds
+
+- Adds `--config` option which allows arbitrary named configuration files
+
 ## 1.14.4
 
 ### Fixes

fortls/regex_patterns.py

@@ -45,7 +45,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)?([ ]+|$)",
+    r"|SUBROUTINE|FUNCTION|PROCEDURE)?([ ]+(?!\W)|$)",
     re.I,
 )
 TYPE_DEF_REGEX = re.compile(r"[ ]*(TYPE)[, :]+", re.I)

test/test_server.py

@@ -580,23 +580,11 @@ def test_diagnostics():
     string += write_rpc_notification(
         "textDocument/didOpen", {"textDocument": {"uri": file_path}}
     )
-    # Example of a diagnostics message
-    # string += write_rpc_notification(
-    #     "textDocument/publishDiagnostics",
-    #     {
-    #         "uri": file_path,
-    #         "diagnostics": [
-    #             {
-    #                 "range": {
-    #                     "start": {"line": 0, "character": 0},
-    #                     "end": {"line": 0, "character": 0},
-    #                 },
-    #                 "message": "",
-    #                 "severity": 0,
-    #             }
-    #         ],
-    #     },
-    # )
+    # Tests that variables named end do not close the scope prematurely
+    file_path = os.path.join(test_dir, "diag", "test_scope_end_name_var.f90")
+    string += write_rpc_notification(
+        "textDocument/didOpen", {"textDocument": {"uri": file_path}}
+    )
     errcode, results = run_request(string)
     assert errcode == 0
     # check that the diagnostics list is empty

test/test_source/diag/test_scope_end_name_var.f90

@@ -0,0 +1,7 @@
+program scope_end_named_var
+    implicit none
+    integer :: end, endif
+    if (.true.) then
+        end = 10
+    end if
+end program scope_end_named_var