Fixes private variables seen in other scopes

Closes Private variable declaration in module seen in other scopes #3
Closes Private variable declaration in module seen in other scopes #191

Author: gnikit

CHANGELOG.md

@@ -14,6 +14,9 @@
 ### Fixed
 
 - Fixed some mutable default argument warnings in methods and classes
+- Fixed private variables showing in autocomplete
+  ([#191](https://github.com/hansec/fortran-language-server/issues/191))
+  ([gnikit/fortls#3](https://github.com/gnikit/fortls/issues/3))
 
 ## 2.0.0
 

fortls/regex_patterns.py

@@ -79,7 +79,7 @@
 TATTR_LIST_REGEX = re.compile(
     r"[ ]*,[ ]*(PUBLIC|PRIVATE|ABSTRACT|EXTENDS\([a-z0-9_]*\))", re.I
 )
-VIS_REGEX = re.compile(r"[ ]*(PUBLIC|PRIVATE)[ :]", re.I)
+VIS_REGEX = re.compile(r"[ ]*\b(PUBLIC|PRIVATE)\b", re.I)
 WORD_REGEX = re.compile(r"[a-z_][a-z0-9_]*", re.I)
 NUMBER_REGEX = re.compile(
     r"[\+\-]?(\b\d+\.?\d*|\.\d+)(_\w+|d[\+\-]?\d+|e[\+\-]?\d+(_\w+)?)?(?![a-z_])",

test/test_server.py

@@ -187,6 +187,7 @@ def check_return(result_array):
             ["test_mod", 2, 0],
             ["test_nonint_mod", 2, 0],
             ["test_preproc_keywords", 2, 0],
+            ["test_private", 2, 8],
             ["test_program", 2, 0],
             ["test_rename_sub", 6, 9],
             ["test_select", 2, 0],
@@ -279,6 +280,9 @@ def comp_request(file_path, line, char):
     string += comp_request(file_path, 8, 10)
     file_path = os.path.join(test_dir, "test_import.f90")
     string += comp_request(file_path, 15, 20)
+    file_path = os.path.join(test_dir, "completion", "test_vis_mod_completion.f90")
+    string += comp_request(file_path, 12, 16)
+    string += comp_request(file_path, 12, 24)
     errcode, results = run_request(string)
     assert errcode == 0
     #
@@ -330,7 +334,11 @@ def comp_request(file_path, line, char):
         [3, "some_type", "TYPE"],
         # test_import.f90
         # TODO: this should be 1, mytype2 should not appear in autocomplete
+        # see #5 and #8 on GitHub
         [2, "mytype", "TYPE"],
+        # completion/test_vis_mod_completion.f90
+        [1, "some_var", "INTEGER"],
+        [3, "length", "INTEGER"],
     )
     assert len(exp_results) + 1 == len(results)
     for i in range(len(exp_results)):

test/test_source/completion/test_vis_mod_completion.f90

@@ -0,0 +1,14 @@
+module foo
+   implicit none
+   public :: length
+   private
+   integer :: len
+   integer :: length
+end module foo
+
+program test_private
+   use foo, only: length
+   use test_vis_mod
+   implicit none
+   print*, some_var, length
+end program test_private