Merge pull request #61 from gnikit/gnikit/issue60

Space separated keywords not being parsed

Author: gnikit

CHANGELOG.md

@@ -8,6 +8,8 @@
   ([#54](https://github.com/gnikit/fortls/issues/54))
 - Fixed hovering string length size is now matching the string
   ([#55](https://github.com/gnikit/fortls/issues/55))
+- Fixed space separated keywords not being displayed upon hover
+  ([#60](https://github.com/gnikit/fortls/issues/60))
 
 ## 2.2.3
 

fortls/helper_functions.py

@@ -309,7 +309,7 @@ def map_keywords(keywords: list[str]):
     mapped_keywords = []
     keyword_info = {}
     for keyword in keywords:
-        keyword_prefix = keyword.split("(")[0].lower()
+        keyword_prefix = keyword.split("(")[0].lower().strip()
         keyword_ind = KEYWORD_ID_DICT.get(keyword_prefix)
         # keyword_ind can be 0 which if 0: evaluates to False
         if keyword_ind is not None:

fortls/parse_fortran.py

@@ -144,9 +144,11 @@ def get_line_context(line: str) -> tuple[str, None] | tuple[str, str]:
 
 def parse_var_keywords(test_str: str) -> tuple[list[str], str]:
     """Parse Fortran variable declaration keywords"""
+    # Needs to be this way and not simply call finditer because no regex can
+    # capture nested parenthesis
     keyword_match = FRegex.KEYWORD_LIST.match(test_str)
     keywords = []
-    while keyword_match is not None:
+    while keyword_match:
         tmp_str = re.sub(r"^[, ]*", "", keyword_match.group(0))
         test_str = test_str[keyword_match.end(0) :]
         if tmp_str.lower().startswith("dimension"):

fortls/regex_patterns.py

@@ -74,9 +74,9 @@ class FortranRegularExpressions:
     KIND_SPEC: Pattern = compile(r"[ ]*([*]?\([ ]*[a-z0-9_*:]|\*[ ]*[0-9:]*)", I)
     KEYWORD_LIST: Pattern = compile(
         r"[ ]*,[ ]*(PUBLIC|PRIVATE|ALLOCATABLE|"
-        r"POINTER|TARGET|DIMENSION\(|"
-        r"OPTIONAL|INTENT\([inout]*\)|DEFERRED|NOPASS|"
-        r"PASS\([a-z0-9_]*\)|SAVE|PARAMETER|EXTERNAL|"
+        r"POINTER|TARGET|DIMENSION[ ]*\(|"
+        r"OPTIONAL|INTENT[ ]*\([ ]*(?:IN|OUT|INOUT)[ ]*\)|DEFERRED|NOPASS|"
+        r"PASS[ ]*\(\w*\)|SAVE|PARAMETER|EXTERNAL|"
         r"CONTIGUOUS)",
         I,
     )

test/test_server.py

@@ -594,6 +594,9 @@ def check_return(result_array, checks):
     string += hover_req(file_path, 46, 11)
     string += hover_req(file_path, 51, 11)
     string += hover_req(file_path, 55, 11)
+    file_path = test_dir / "hover" / "spaced_keywords.f90"
+    string += hover_req(file_path, 1, 45)
+    string += hover_req(file_path, 2, 99)
     file_path = test_dir / "hover" / "recursive.f90"
     string += hover_req(file_path, 9, 40)
     file_path = test_dir / "subdir" / "test_submod.F90"
@@ -655,6 +658,9 @@ def check_return(result_array, checks):
         """FUNCTION fun7() RESULT(val)
  TYPE(c_ptr) :: val""",
         """TYPE(c_ptr) FUNCTION c_loc(x) RESULT(c_loc)""",
+        """REAL, DIMENSION(:, :), INTENT(IN)""",
+        """REAL, DIMENSION( SIZE(ARG1, 1), MAXVAL([SIZE(ARG1, 2), """
+        """SIZE(ARG1, 1)]) ), INTENT(OUT)""",
         """RECURSIVE SUBROUTINE recursive_assign_descending(node, vector, current_loc)
  TYPE(tree_inode), POINTER, INTENT(IN) :: node
  INTEGER, DIMENSION(:), INTENT(INOUT) :: vector

test/test_source/hover/spaced_keywords.f90

@@ -0,0 +1,4 @@
+subroutine spaced_keywords(arg1,  arg2)
+    real, dimension (:, :), intent (in) :: arg1
+    real, dimension ( size(arg1, 1), maxval([size(arg1, 2), size(arg1, 1)]) ), intent (out) ::  arg2
+end subroutine spaced_keywords