Change include_dirs from a list to a set

Author: gnikit

CHANGELOG.md

@@ -9,6 +9,7 @@
 ### Changed
 
 - Changed `USE_info` named tuple to storing use modules as `sets` instead of `lists`
+- Changed `include_dirs` from a `list` to a `set`
 
 ### Fixed
 

fortls/__init__.py

@@ -461,7 +461,7 @@ def debug_server_parser(args):
     # Get preprocessor definitions from config file
     pp_suffixes = None
     pp_defs = {}
-    include_dirs = []
+    include_dirs = set()
     if args.debug_rootpath:
         config_path = os.path.join(args.debug_rootpath, args.config)
         config_exists = os.path.isfile(config_path)
@@ -471,9 +471,9 @@ def debug_server_parser(args):
                     config_dict = json.load(fhandle)
                     pp_suffixes = config_dict.get("pp_suffixes", None)
                     pp_defs = config_dict.get("pp_defs", {})
-                    include_dirs = []
-                    for path in config_dict.get("include_dirs", []):
-                        include_dirs.extend(
+                    include_dirs = set()
+                    for path in config_dict.get("include_dirs", set()):
+                        include_dirs.update(
                             only_dirs(resolve_globs(path, args.debug_rootpath))
                         )
 

fortls/interface.py

@@ -219,7 +219,8 @@ def commandline_args(name: str = "fortls") -> argparse.ArgumentParser:
         # "--pp_include_dirs",  # TODO: make main
         type=str,
         nargs="*",
-        default=list(),
+        default=set(),
+        action=SetAction,
         metavar="DIRS",
         help="Folders containing preprocessor files with extensions PP_SUFFIXES.",
     )

fortls/langserver.py

@@ -1548,8 +1548,8 @@ def __load_config_file_preproc(self, config_dict: dict) -> None:
         if isinstance(self.pp_defs, list):
             self.pp_defs = {key: "" for key in self.pp_defs}
 
-        for path in config_dict.get("include_dirs", []):
-            self.include_dirs.extend(
+        for path in config_dict.get("include_dirs", set()):
+            self.include_dirs.update(
                 only_dirs(resolve_globs(path, self.root_path), self.post_messages)
             )
 

fortls/parse_fortran.py

@@ -1101,12 +1101,12 @@ def find_word_in_code_line(
         return line_number, i0, i1
 
     def preprocess(
-        self, pp_defs: dict = None, include_dirs: list = None, debug: bool = False
+        self, pp_defs: dict = None, include_dirs: set = None, debug: bool = False
     ) -> tuple[list, list]:
         if pp_defs is None:
             pp_defs = {}
         if include_dirs is None:
-            include_dirs = []
+            include_dirs = set()
 
         self.contents_pp, pp_skips, pp_defines, self.pp_defs = preprocess_file(
             self.contents_split,
@@ -1173,7 +1173,7 @@ def preprocess_file(
     contents_split: list,
     file_path: str = None,
     pp_defs: dict = None,
-    include_dirs: list = None,
+    include_dirs: set = None,
     debug: bool = False,
 ):
     # Look for and mark excluded preprocessor paths in file
@@ -1231,9 +1231,9 @@ def replace_vars(line: str):
     if pp_defs is None:
         pp_defs = {}
     if include_dirs is None:
-        include_dirs = []
+        include_dirs = set()
     if file_path is not None:
-        include_dirs = [os.path.dirname(file_path)] + include_dirs
+        include_dirs.add(os.path.abspath(os.path.dirname(file_path)))
     pp_skips = []
     pp_defines = []
     pp_stack = []
@@ -1397,7 +1397,7 @@ def process_file(
     file_obj: fortran_file,
     debug: bool = False,
     pp_defs: dict = None,
-    include_dirs: list = None,
+    include_dirs: set = None,
 ):
     """Build file AST by parsing file"""
 
@@ -1407,7 +1407,7 @@ def parser_debug_msg(msg: str, line: str, ln: int):
     if pp_defs is None:
         pp_defs = {}
     if include_dirs is None:
-        include_dirs = []
+        include_dirs = set()
     # Configure the parser logger
     if debug:
         logging.basicConfig(

test/test_interface.py

@@ -68,7 +68,7 @@ def test_command_line_preprocessor_options():
         ' {"HAVE_PETSC":"","HAVE_ZOLTAN":"","Mat":"type(tMat)"}'.split()
     )
     assert args.pp_suffixes == [".h", ".fh"]
-    assert args.include_dirs == ["/usr/include/**", "./local/incl"]
+    assert args.include_dirs == set(["/usr/include/**", "./local/incl"])
     assert args.pp_defs == {"HAVE_PETSC": "", "HAVE_ZOLTAN": "", "Mat": "type(tMat)"}
 
 
@@ -145,7 +145,7 @@ def test_config_file_preprocessor_options():
     server, root = unittest_server_init()
     # Preprocessor options
     assert server.pp_suffixes == [".h", ".fh"]
-    assert server.include_dirs == [f"{root}/include"]
+    assert server.include_dirs == set([f"{root}/include"])
     assert server.pp_defs == {
         "HAVE_PETSC": "",
         "HAVE_ZOLTAN": "",