tree-sitter-analyzer 0.3.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

tree_sitter_analyzer/{plugins → languages}/javascript_plugin.py

@@ -19,9 +19,9 @@ except ImportError:
 
 from ..core.analysis_engine import AnalysisRequest
 from ..language_loader import loader
-from ..models import AnalysisResult, Class, Function, Import, Variable
+from ..models import AnalysisResult, Class, CodeElement, Function, Import, Variable
+from ..plugins.base import ElementExtractor, LanguagePlugin
 from ..utils import log_error, log_warning
-from . import ElementExtractor, LanguagePlugin
 
 
 class JavaScriptElementExtractor(ElementExtractor):
@@ -416,7 +416,7 @@ class JavaScriptPlugin(LanguagePlugin):
             tree = parser.parse(bytes(source_code, "utf8"))
 
             extractor = self.create_extractor()
-            elements = []
+            elements: list[CodeElement] = []
             elements.extend(extractor.extract_functions(tree, source_code))
             elements.extend(extractor.extract_classes(tree, source_code))
             elements.extend(extractor.extract_variables(tree, source_code))

tree_sitter_analyzer/languages/python_plugin.py

@@ -14,7 +14,7 @@ if TYPE_CHECKING:
     from ..core.analysis_engine import AnalysisRequest
     from ..models import AnalysisResult
 
-from ..models import Class, Function, Import, Variable
+from ..models import Class, CodeElement, Function, Import, Variable
 from ..plugins.base import ElementExtractor, LanguagePlugin
 from ..utils import log_error, log_warning
 
@@ -301,7 +301,7 @@ class PythonElementExtractor(ElementExtractor):
             elif name.startswith("_"):
                 visibility = "private"
 
-            # 安全地提取原始文本，避免索引越界
+            # Safely extract raw text, avoiding index out of bounds
             start_byte = min(node.start_byte, len(source_code))
             end_byte = min(node.end_byte, len(source_code))
             raw_text = (
@@ -402,6 +402,7 @@ class PythonElementExtractor(ElementExtractor):
                 end_line=node.end_point[0] + 1,
                 raw_text=variable_text,
                 language="python",
+                variable_type=assignment_type,
             )
 
         except Exception as e:
@@ -416,7 +417,7 @@ class PythonElementExtractor(ElementExtractor):
             if not self._validate_node(node):
                 return None
 
-            # 安全地提取导入文本，避免索引越界
+            # Safely extract import text, avoiding index out of bounds
             start_byte = min(node.start_byte, len(source_code))
             end_byte = min(node.end_byte, len(source_code))
             import_text = (
@@ -585,6 +586,7 @@ class PythonPlugin(LanguagePlugin):
         """Initialize the Python plugin"""
         super().__init__()
         self._language_cache: tree_sitter.Language | None = None
+        self._extractor: PythonElementExtractor | None = None
 
     def get_language_name(self) -> str:
         """Return the name of the programming language this plugin supports"""
@@ -598,6 +600,12 @@ class PythonPlugin(LanguagePlugin):
         """Create and return an element extractor for this language"""
         return PythonElementExtractor()
 
+    def get_extractor(self) -> ElementExtractor:
+        """Get the cached extractor instance, creating it if necessary"""
+        if self._extractor is None:
+            self._extractor = PythonElementExtractor()
+        return self._extractor
+
     def get_tree_sitter_language(self) -> Optional["tree_sitter.Language"]:
         """Get the Tree-sitter language object for Python"""
         if self._language_cache is None:
@@ -677,13 +685,23 @@ class PythonPlugin(LanguagePlugin):
 
             # Extract elements
             extractor = self.create_extractor()
-            functions = extractor.extract_functions(parse_result.tree, source_code)
-            classes = extractor.extract_classes(parse_result.tree, source_code)
-            variables = extractor.extract_variables(parse_result.tree, source_code)
-            imports = extractor.extract_imports(parse_result.tree, source_code)
+            if parse_result.tree:
+                functions = extractor.extract_functions(parse_result.tree, source_code)
+                classes = extractor.extract_classes(parse_result.tree, source_code)
+                variables = extractor.extract_variables(parse_result.tree, source_code)
+                imports = extractor.extract_imports(parse_result.tree, source_code)
+            else:
+                functions = []
+                classes = []
+                variables = []
+                imports = []
 
             # Combine all elements
-            all_elements = functions + classes + variables + imports
+            all_elements: list[CodeElement] = []
+            all_elements.extend(functions)
+            all_elements.extend(classes)
+            all_elements.extend(variables)
+            all_elements.extend(imports)
 
             return AnalysisResult(
                 file_path=file_path,

tree_sitter_analyzer/mcp/resources/code_file_resource.py

@@ -59,9 +59,6 @@ class CodeFileResource:
         Returns:
             True if the URI matches the code file pattern
         """
-        if not isinstance(uri, str):
-            return False
-
         return bool(self._uri_pattern.match(uri))
 
     def _extract_file_path(self, uri: str) -> str: