Merge pull request #14 from gnikit/bug/externals

Bug/externals

Author: gnikit

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Adds intrinsic support for `OpenACC` version 3.1
 - Adds sphinx autogenerated documentation
 - Adds `incl_suffixes` as a configuration option
+- Adds `EXTERNAL` as an attribute upon hover
 
 ### Changes
 
@@ -21,6 +22,10 @@
 - Fixes the hover of preprocessor functions. It now displays the function name
   witout the argument list and the function body. The argument list cannot be
   multiline but the function body can.
+- Fixes objects marked `EXTERNAL` across multiple lines
+  ([#169](https://github.com/hansec/fortran-language-server/issues/169))
+- Fixes include with external files
+  ([gnikit/fortls#13](https://github.com/gnikit/fortls/issues/13))
 
 ## 1.16.0
 

fortls/constants.py

@@ -26,6 +26,7 @@
     "elemental",
     "recursive",
     "abstract",
+    "external",
 ]
 KEYWORD_ID_DICT = {keyword: ind for (ind, keyword) in enumerate(KEYWORD_LIST)}
 

fortls/helper_functions.py

@@ -322,7 +322,7 @@ def map_keywords(keywords):
     for keyword in keywords:
         keyword_prefix = keyword.split("(")[0].lower()
         keyword_ind = KEYWORD_ID_DICT.get(keyword_prefix)
-        if keyword_ind is not None:
+        if keyword_ind:
             mapped_keywords.append(keyword_ind)
             if keyword_prefix in ("intent", "dimension", "pass"):
                 keyword_substring = get_paren_substring(keyword)
@@ -340,7 +340,7 @@ def get_keywords(keywords, keyword_info={}):
         addl_info = keyword_info.get(string_rep)
         string_rep = string_rep.upper()
         if addl_info is not None:
-            string_rep += "({0})".format(addl_info)
+            string_rep += f"({addl_info})"
         keyword_strings.append(string_rep)
     return keyword_strings
 

fortls/objects.py

@@ -188,6 +188,8 @@ def check_scope(
         strip_str = strip_str.replace("'", "")
         for inc in scope.file_ast.include_statements:
             if strip_str == inc.path:
+                if inc.file is None:
+                    return None
                 return fortran_include(inc.file.ast, inc.line_number, inc.path)
 
     # Setup USE search
@@ -473,7 +475,7 @@ def __init__(self, file_ast, line_number: int, name: str):
         self.base_setup(file_ast, line_number, name)
 
     def base_setup(self, file_ast, sline: int, name: str, keywords: list = []):
-        self.file_ast = file_ast
+        self.file_ast: fortran_ast = file_ast
         self.sline: int = sline
         self.eline: int = sline
         self.name: str = name
@@ -585,7 +587,7 @@ def check_definitions(self, obj_tree):
                 contains_line = self.eline
             else:
                 contains_line = self.contains_start
-        # Detect interface defintions
+        # Detect interface definitions
         is_interface = False
         if (
             (self.parent is not None)
@@ -625,9 +627,7 @@ def check_definitions(self, obj_tree):
                 if line_number > FQSN_dict[child.FQSN]:
                     new_diag = fortran_diagnostic(
                         line_number,
-                        message='Variable "{0}" declared twice in scope'.format(
-                            child.name
-                        ),
+                        message=f'Variable "{child.name}" declared twice in scope',
                         severity=1,
                         find_word=child.name,
                     )
@@ -651,8 +651,8 @@ def check_definitions(self, obj_tree):
                         continue
                     new_diag = fortran_diagnostic(
                         line_number,
-                        message='Variable "{0}" masks variable in parent scope'.format(
-                            child.name
+                        message=(
+                            f'Variable "{child.name}" masks variable in parent scope'
                         ),
                         severity=2,
                         find_word=child.name,
@@ -755,7 +755,11 @@ def get_desc(self):
 
 class fortran_submodule(fortran_module):
     def __init__(
-        self, file_ast, line_number: int, name: str, ancestor_name: str = None
+        self,
+        file_ast: fortran_ast,
+        line_number: int,
+        name: str,
+        ancestor_name: str = None,
     ):
         self.base_setup(file_ast, line_number, name)
         self.ancestor_name = ancestor_name
@@ -832,7 +836,7 @@ def require_link(self):
 class fortran_subroutine(fortran_scope):
     def __init__(
         self,
-        file_ast,
+        file_ast: fortran_ast,
         line_number: int,
         name: str,
         args: str = "",
@@ -1046,7 +1050,7 @@ def get_diagnostics(self):
 class fortran_function(fortran_subroutine):
     def __init__(
         self,
-        file_ast,
+        file_ast: fortran_ast,
         line_number: int,
         name: str,
         args: str = "",
@@ -1168,7 +1172,9 @@ def get_interface(self, name_replace=None, change_arg=-1, change_strings=None):
 
 
 class fortran_type(fortran_scope):
-    def __init__(self, file_ast, line_number: int, name: str, keywords: list):
+    def __init__(
+        self, file_ast: fortran_ast, line_number: int, name: str, keywords: list
+    ):
         self.base_setup(file_ast, line_number, name, keywords=keywords)
         #
         self.in_children: list = []
@@ -1333,7 +1339,7 @@ def get_actions(self, sline, eline):
 
 
 class fortran_block(fortran_scope):
-    def __init__(self, file_ast, line_number: int, name: str):
+    def __init__(self, file_ast: fortran_ast, line_number: int, name: str):
         self.base_setup(file_ast, line_number, name)
 
     def get_type(self, no_link=False):
@@ -1350,7 +1356,7 @@ def req_named_end(self):
 
 
 class fortran_do(fortran_block):
-    def __init__(self, file_ast, line_number: int, name: str):
+    def __init__(self, file_ast: fortran_ast, line_number: int, name: str):
         self.base_setup(file_ast, line_number, name)
 
     def get_type(self, no_link=False):
@@ -1361,7 +1367,7 @@ def get_desc(self):
 
 
 class fortran_where(fortran_block):
-    def __init__(self, file_ast, line_number: int, name: str):
+    def __init__(self, file_ast: fortran_ast, line_number: int, name: str):
         self.base_setup(file_ast, line_number, name)
 
     def get_type(self, no_link=False):
@@ -1372,7 +1378,7 @@ def get_desc(self):
 
 
 class fortran_if(fortran_block):
-    def __init__(self, file_ast, line_number: int, name: str):
+    def __init__(self, file_ast: fortran_ast, line_number: int, name: str):
         self.base_setup(file_ast, line_number, name)
 
     def get_type(self, no_link=False):
@@ -1383,7 +1389,7 @@ def get_desc(self):
 
 
 class fortran_associate(fortran_block):
-    def __init__(self, file_ast, line_number: int, name: str):
+    def __init__(self, file_ast: fortran_ast, line_number: int, name: str):
         self.base_setup(file_ast, line_number, name)
         self.assoc_links = []
 
@@ -1418,7 +1424,7 @@ def require_link(self):
 
 
 class fortran_enum(fortran_block):
-    def __init__(self, file_ast, line_number: int, name: str):
+    def __init__(self, file_ast: fortran_ast, line_number: int, name: str):
         self.base_setup(file_ast, line_number, name)
 
     def get_type(self, no_link=False):
@@ -1429,7 +1435,7 @@ def get_desc(self):
 
 
 class fortran_select(fortran_block):
-    def __init__(self, file_ast, line_number: int, name: str, select_info):
+    def __init__(self, file_ast: fortran_ast, line_number: int, name: str, select_info):
         self.base_setup(file_ast, line_number, name)
         self.select_type = select_info.type
         self.binding_name = None
@@ -1486,7 +1492,13 @@ def create_binding_variable(self, file_ast, line_number, var_desc, case_type):
 
 
 class fortran_int(fortran_scope):
-    def __init__(self, file_ast, line_number: list, name: str, abstract: bool = False):
+    def __init__(
+        self,
+        file_ast: fortran_ast,
+        line_number: list,
+        name: str,
+        abstract: bool = False,
+    ):
         self.base_setup(file_ast, line_number, name)
         self.mems = []
         self.abstract = abstract
@@ -1523,7 +1535,7 @@ def require_link(self):
 class fortran_var(fortran_obj):
     def __init__(
         self,
-        file_ast,
+        file_ast: fortran_ast,
         line_number: int,
         name: str,
         var_desc: str,
@@ -1537,18 +1549,18 @@ def __init__(
 
     def base_setup(
         self,
-        file_ast,
+        file_ast: fortran_ast,
         line_number: int,
         name: str,
         var_desc: str,
         keywords: list,
         keyword_info: dict,
         link_obj: str,
     ):
-        self.file_ast = file_ast
+        self.file_ast: fortran_ast = file_ast
         self.sline: int = line_number
         self.eline: int = line_number
-        self.name: int = name
+        self.name: str = name
         self.desc: str = var_desc
         self.keywords: list = keywords
         self.keyword_info: dict = keyword_info
@@ -1561,6 +1573,7 @@ def base_setup(
         self.link_obj = None
         self.type_obj = None
         self.is_const: bool = False
+        self.is_external: bool = False
         self.param_val: str = None
         self.link_name: str = None
         self.FQSN: str = self.name.lower()
@@ -1574,6 +1587,11 @@ def base_setup(
             self.vis = -1
         if self.keywords.count(KEYWORD_ID_DICT["parameter"]) > 0:
             self.is_const = True
+        if (
+            self.keywords.count(KEYWORD_ID_DICT["external"]) > 0
+            or self.desc.lower() == "external"
+        ):
+            self.is_external = True
 
     def update_fqsn(self, enc_scope=None):
         if enc_scope is not None:
@@ -1665,6 +1683,10 @@ def is_parameter(self):
     def set_parameter_val(self, val: str):
         self.param_val = val
 
+    def set_external_attr(self):
+        self.keywords.append(KEYWORD_ID_DICT["external"])
+        self.is_external = True
+
     def check_definition(self, obj_tree, known_types={}, interface=False):
         # Check for type definition in scope
         type_match = DEF_KIND_REGEX.match(self.desc)
@@ -1726,7 +1748,7 @@ def check_definition(self, obj_tree, known_types={}, interface=False):
 class fortran_meth(fortran_var):
     def __init__(
         self,
-        file_ast,
+        file_ast: fortran_ast,
         line_number: int,
         name: str,
         var_desc: str,
@@ -1871,6 +1893,7 @@ def __init__(self, file_obj=None):
         self.parse_errors: list = []
         self.inherit_objs: list = []
         self.linkable_objs: list = []
+        self.external_objs: list = []
         self.none_scope = None
         self.inc_scope = None
         self.current_scope = None
@@ -1945,12 +1968,14 @@ def end_scope(self, line_number: int, check: bool = True):
             self.END_SCOPE_REGEX = None
         self.enc_scope_name = self.get_enc_scope_name()
 
-    def add_variable(self, new_var):
+    def add_variable(self, new_var: fortran_var):
         if self.current_scope is None:
             self.create_none_scope()
             new_var.FQSN = self.none_scope.FQSN + "::" + new_var.name.lower()
         self.current_scope.add_child(new_var)
         self.variable_list.append(new_var)
+        if new_var.is_external:
+            self.external_objs.append(new_var)
         if new_var.require_link():
             self.linkable_objs.append(new_var)
         self.last_obj = new_var