Improves typing

Author: gnikit

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

@@ -473,7 +473,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 +585,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 +625,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 +649,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 +753,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 +834,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 +1048,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 +1170,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 +1337,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 +1354,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 +1365,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 +1376,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 +1387,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 +1422,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 +1433,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 +1490,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 +1533,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 +1547,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
@@ -1736,7 +1746,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,

fortls/parse_fortran.py

@@ -1643,7 +1643,7 @@ def parser_debug_msg(msg: str, line: str, ln: int):
                 if obj_info.var_names is None:
                     continue
                 desc_string = obj_info.type_word
-                link_name = None
+                link_name: str = None
                 procedure_def = False
                 if desc_string[:3] == "PRO":
                     if file_ast.current_scope.get_type() == INTERFACE_TYPE_ID:
@@ -1654,7 +1654,7 @@ def parser_debug_msg(msg: str, line: str, ln: int):
                     procedure_def = True
                     link_name = get_paren_substring(desc_string)
                 for var_name in obj_info.var_names:
-                    link_name = None
+                    link_name: str = None
                     if var_name.find("=>") > -1:
                         name_split = var_name.split("=>")
                         name_raw = name_split[0]