moved trie to utils.py

Author: anirudnits

isort/api.py

@@ -332,7 +332,7 @@ def check_file(
             if config.verbose:
                 print(f"{config_info[0]} used for file {filename}")
 
-            file_config = config_info[1]
+            file_config = Config(**config_info[1])
 
     with io.File.read(filename) as source_file:
         return check_stream(
@@ -400,7 +400,7 @@ def sort_file(
             if config.verbose:
                 print(f"{config_info[0]} used for file {filename}")
 
-            file_config = config_info[1]
+            file_config = Config(**config_info[1])
 
     with io.File.read(filename) as source_file:
         actual_file_path = file_path or source_file.path

isort/main.py

@@ -15,7 +15,8 @@
 from .format import create_terminal_printer
 from .logo import ASCII_ART
 from .profiles import profiles
-from .settings import VALID_PY_TARGETS, Config, Trie, find_all_configs
+from .settings import VALID_PY_TARGETS, Config, find_all_configs
+from .utils import Trie
 from .wrap_modes import WrapModes
 
 DEPRECATED_SINGLE_DASH_ARGS = {

isort/settings.py

@@ -41,6 +41,7 @@
 from .profiles import profiles
 from .sections import DEFAULT as SECTION_DEFAULTS
 from .sections import FIRSTPARTY, FUTURE, LOCALFOLDER, STDLIB, THIRDPARTY
+from .utils import Trie
 from .wrap_modes import WrapModes
 from .wrap_modes import from_string as wrap_mode_from_string
 
@@ -726,43 +727,6 @@ def _parse_known_pattern(self, pattern: str) -> List[str]:
         return patterns
 
 
-class TrieNode:
-    def __init__(self) -> None:
-        self.nodes: Dict[str, TrieNode] = {}
-        self.config_info: Tuple[str, Config] = ("", DEFAULT_CONFIG)
-
-
-class Trie:
-    def __init__(self) -> None:
-        self.root: TrieNode = TrieNode()
-
-    def _insert(self, config_path: str, config_file: str, config_data: Dict[str, Any]) -> None:
-        resolved_config_path_as_tuple = Path(config_path).parent.resolve().parts
-
-        temp = self.root
-
-        for path in resolved_config_path_as_tuple:
-            if path not in temp.nodes:
-                temp.nodes[path] = TrieNode()
-
-            temp = temp.nodes[path]
-
-        temp.config_info = (config_file, Config(**config_data))
-
-    def _search(self, filename: str) -> Tuple[str, Config]:
-        resolved_file_path_as_tuple = Path(filename).resolve().parts
-
-        temp = self.root
-
-        for path in resolved_file_path_as_tuple:
-            if path not in temp.nodes:
-                return temp.config_info
-
-            temp = temp.nodes[path]
-
-        return temp.config_info
-
-
 def _get_str_to_type_converter(setting_name: str) -> Union[Callable[[str], Any], Type[Any]]:
     type_converter: Union[Callable[[str], Any], Type[Any]] = type(
         _DEFAULT_SETTINGS.get(setting_name, "")
@@ -824,7 +788,7 @@ def _find_config(path: str) -> Tuple[str, Dict[str, Any]]:
 
 @lru_cache()
 def find_all_configs(src_paths: Tuple[str]) -> Trie:
-    trie_root = Trie()
+    trie_root = Trie("default", DEFAULT_CONFIG.__dict__)
 
     for path in src_paths:
         for (dirpath, _, _) in os.walk(path):

isort/utils.py

@@ -1,5 +1,64 @@
 import os
 import sys
+from pathlib import Path
+from typing import Any, Dict, Optional, Tuple
+
+
+class TrieNode:
+    def __init__(self, config_file: str = "", config_data: Optional[Dict[str, Any]] = None) -> None:
+        if not config_file:
+            config_file = ""
+
+        if not config_data:
+            config_data = {}
+
+        self.nodes: Dict[str, TrieNode] = {}
+        self.config_info: Tuple[str, Dict[str, Any]] = (config_file, config_data)
+
+
+class Trie:
+    """
+    A prefix tree to store the paths of all config files and to search the nearest config
+    associated with each file
+    """
+
+    def __init__(self, config_file: str = "", config_data: Optional[Dict[str, Any]] = None) -> None:
+        self.root: TrieNode = TrieNode(config_file, config_data)
+
+    def _insert(self, config_path: str, config_file: str, config_data: Dict[str, Any]) -> None:
+        resolved_config_path_as_tuple = Path(config_path).parent.resolve().parts
+
+        temp = self.root
+
+        for path in resolved_config_path_as_tuple:
+            if path not in temp.nodes:
+                temp.nodes[path] = TrieNode()
+
+            temp = temp.nodes[path]
+
+        temp.config_info = (config_file, config_data)
+
+    def _search(self, filename: str) -> Tuple[str, Dict[str, Any]]:
+        """
+        Returns the closest config relative to filename by doing a depth
+        first search on the prefix tree.
+        """
+        resolved_file_path_as_tuple = Path(filename).resolve().parts
+
+        temp = self.root
+
+        last_stored_config: Tuple[str, Dict[str, Any]] = ("", {})
+
+        for path in resolved_file_path_as_tuple:
+            if temp.config_info[0]:
+                last_stored_config = temp.config_info
+
+            if path not in temp.nodes:
+                break
+
+            temp = temp.nodes[path]
+
+        return last_stored_config
 
 
 def exists_case_sensitive(path: str) -> bool: