Minor changes

Author: gnikit

fortls/langserver.py

@@ -1106,7 +1106,7 @@ def create_signature_hover():
         # Construct hover information
         var_type = var_obj.get_type()
         hover_array = []
-        if (var_type == SUBROUTINE_TYPE_ID) or (var_type == FUNCTION_TYPE_ID):
+        if var_type in (SUBROUTINE_TYPE_ID, FUNCTION_TYPE_ID):
             hover_str, highlight = var_obj.get_hover(long=True)
             hover_array.append(create_hover(hover_str, highlight))
         elif var_type == INTERFACE_TYPE_ID:

fortls/parse_fortran.py

@@ -48,6 +48,7 @@
     BLOCK_REGEX,
     CALL_REGEX,
     CONTAINS_REGEX,
+    DEFINED_REGEX,
     DO_REGEX,
     END_ASSOCIATE_REGEX,
     END_BLOCK_REGEX,
@@ -1034,7 +1035,7 @@ def preprocess_file(
     # Look for and mark excluded preprocessor paths in file
     # Initial implementation only looks for "if" and "ifndef" statements.
     # For "if" statements all blocks are excluded except the "else" block if present
-    # For "ifndef" statements all blocks excluding the first block are exlucded
+    # For "ifndef" statements all blocks excluding the first block are excluded
     def eval_pp_if(text, defs={}):
         def replace_ops(expr):
             expr = expr.replace("&&", " and ")
@@ -1045,9 +1046,6 @@ def replace_ops(expr):
             return expr
 
         def replace_defined(line):
-            DEFINED_REGEX = re.compile(
-                r"defined[ ]*\([ ]*([a-z_][a-z0-9_]*)[ ]*\)", re.I
-            )
             i0 = 0
             out_line = ""
             for match in DEFINED_REGEX.finditer(line):
@@ -1106,7 +1104,7 @@ def replace_vars(line):
             continue
         # Handle conditional statements
         match = PP_REGEX.match(line)
-        if match is not None:
+        if match:
             output_file.append(line)
             def_name = None
             if_start = False
@@ -1192,6 +1190,9 @@ def replace_vars(line):
             log.debug(f"{line.strip()} !!! Include statement({i+1})")
             include_filename = match.group(1).replace('"', "")
             include_path = None
+            # Intentionally keep this as a list and not a set. There are cases
+            # where projects play tricks with the include order of their headers
+            # to get their codes to compile. Using a set would not permit that.
             for include_dir in include_dirs:
                 include_path_tmp = os.path.join(include_dir, include_filename)
                 if os.path.isfile(include_path_tmp):
@@ -1221,7 +1222,7 @@ def replace_vars(line):
             else:
                 log.debug(f"{line.strip()} !!! Could not locate include file ({i+1})")
 
-        #
+        # Substitute (if any) read in preprocessor macros
         for def_tmp, value in defs_tmp.items():
             def_regex = def_regexes.get(def_tmp)
             if def_regex is None:

fortls/regex_patterns.py

@@ -102,6 +102,7 @@
 FREE_OPENMP_MATCH = re.compile(r"[ ]*!\$OMP", re.I)
 FREE_FORMAT_TEST = re.compile(r"[ ]{1,4}[a-z]", re.I)
 # Preprocessor mathching rules
+DEFINED_REGEX = re.compile(r"defined[ ]*\([ ]*([a-z_][a-z0-9_]*)[ ]*\)", re.I)
 PP_REGEX = re.compile(r"#(if |ifdef|ifndef|else|elif|endif)")
 PP_DEF_REGEX = re.compile(r"#(define|undef)[ ]*([a-z0-9_]+)", re.I)
 PP_DEF_TEST_REGEX = re.compile(r"(![ ]*)?defined[ ]*\([ ]*([a-z0-9_]*)[ ]*\)$", re.I)