code-intelligence 4.2.2__py3-none-win_amd64.whl → 4.3.1__py3-none-win_amd64.whl

code_intelligence/__init__.py

@@ -13,7 +13,7 @@ from .goober import (
 # SHAME   - Bump when fixing things too embarrassing to admit.
 #       PROUD.DEFAULT.SHAME
 #            \   |   /
-__version__ = "4.2.2"
+__version__ = "4.3.1"
 __version_info__ = tuple(int(i) for i in __version__.split('.'))
 
 __all__ = [

code_intelligence/goober.py

@@ -10,10 +10,24 @@ from enum import IntEnum, IntFlag
 
 DIR = Path(__file__).parent
 
+class Str_C(C.Structure):
+    _fields_ = [
+        ("data"  , C.c_char_p),
+        ("length", C.c_uint32),
+    ]
+
+    def to_bytes(self) -> bytes:
+        return C.string_at(self.data, self.length)
+
+def to_str_c(s: str | bytes) -> Str_C:
+    if isinstance(s, str):
+        s = s.encode()
+    return Str_C(s, len(s))
+
 _lib = C.CDLL(str(DIR / "libcode_intelligence.so"))
 
 SCAN_CALLBACK = C.CFUNCTYPE(None, C.c_void_p)
-_lib.enqueue_scan_file.argtypes = [SCAN_CALLBACK, C.c_void_p, C.c_char_p, C.c_uint64]
+_lib.enqueue_scan_file.argtypes = [SCAN_CALLBACK, C.c_void_p, Str_C, C.c_uint64]
 _lib.enqueue_scan_file.restype = None
 
 class Definition_Link_C(C.Structure):
@@ -26,7 +40,7 @@ class Definition_Link_C(C.Structure):
     ]
 
 FIND_CALLBACK = C.CFUNCTYPE(None, C.c_void_p, C.POINTER(Definition_Link_C), C.c_int, C.c_void_p)
-_lib.enqueue_find_symbols_in_text.argtypes = [FIND_CALLBACK, C.c_void_p, C.c_char_p, C.c_bool, C.c_bool]
+_lib.enqueue_find_symbols_in_text.argtypes = [FIND_CALLBACK, C.c_void_p, Str_C, C.c_bool, C.c_bool, C.POINTER(Str_C), C.c_uint32]
 _lib.enqueue_find_symbols_in_text.restype = None
 
 _lib.enqueue_stop.argtypes = []
@@ -72,6 +86,16 @@ class Definition_Link:
     line_0_based        : int = 0
     column_0_based      : int = 0
 
+    @classmethod
+    def from_c(cls, link: Definition_Link_C):
+        return cls(
+            start_offset_in_text=link.start_offset_in_utf8_text,
+            end_offset_in_text=link.end_offset_in_utf8_text,
+            source_file=link.source_file.decode('utf-8'),
+            line_0_based=link.line_0_based,
+            column_0_based=link.column_0_based,
+        )
+
 
 # Using ["..."] syntax to create a copy independant of
 # whether any other library sets the signature for those functions.
@@ -115,7 +139,7 @@ def scan_file(file, language: Language, callback=None, data=None) -> bool:
         c_callback, data_ptr = C_AFTER_SCAN, _wrap_data_ptr((callback, data))
 
     # print(f"[PY] sending next request {file}")
-    _lib.enqueue_scan_file(c_callback, data_ptr, os.fsencode(file), language)
+    _lib.enqueue_scan_file(c_callback, data_ptr, to_str_c(os.fsencode(file)), language)
 
     # never drop the request (it would be a memory leak)
     return True
@@ -124,18 +148,22 @@ def scan_file(file, language: Language, callback=None, data=None) -> bool:
 @SCAN_CALLBACK
 def C_AFTER_SCAN(data_ptr):
     callback, data = _unwrap_data_ptr(data_ptr)
-    if callback is not None:
-        callback(data)
+    assert callback is not None, "Don't feed youself NULL callbacks!"
+    callback(data)
 
 
-def find_symbols_in_text(text: str, callback=None, data=None, ignore_word_like: bool = False, sync: bool = False) -> bool:
+def find_symbols_in_text(text: str, callback=None, data=None, ignore_word_like: bool = False, sync: bool = False, first_look_at_these_files: list[Path|str] = []) -> bool:
     if callback is None:
-        c_callback, data_ptr = C_NO_CALLBACK, 0
-    else:
-        c_callback, data_ptr = C_AFTER_FIND, _wrap_data_ptr((callback, data))
+        return True
+
+    c_callback, data_ptr = C_AFTER_FIND, _wrap_data_ptr((callback, data))
+
+    first_look_at_these_files_c = (Str_C * len(first_look_at_these_files))()
+    for i, it in enumerate(first_look_at_these_files):
+        first_look_at_these_files_c[i] = to_str_c(os.fsencode(it))
 
     # print("[PY] sending find_symbols_in_text")
-    _lib.enqueue_find_symbols_in_text(c_callback, data_ptr, text.encode(), ignore_word_like, sync)
+    _lib.enqueue_find_symbols_in_text(c_callback, data_ptr, to_str_c(text), ignore_word_like, sync, first_look_at_these_files_c, len(first_look_at_these_files))
 
     # never drop the request (it would be a memory leak)
     return True
@@ -145,18 +173,11 @@ def find_symbols_in_text(text: str, callback=None, data=None, ignore_word_like:
 def C_AFTER_FIND(data_ptr, links_ptr, count, strings_handle):
     callback, data = _unwrap_data_ptr(data_ptr)
     try:
-        if callback is not None:
-            results = [Definition_Link()] * count
-            for i in range(count):
-                link = links_ptr[i]
-                results[i] = Definition_Link(
-                    start_offset_in_text=link.start_offset_in_utf8_text,
-                    end_offset_in_text=link.end_offset_in_utf8_text,
-                    source_file=link.source_file.decode('utf-8'),
-                    line_0_based=link.line_0_based,
-                    column_0_based=link.column_0_based,
-                )
-            callback(data, results)
+        assert callback is not None, "Don't feed youself NULL callbacks!"
+        results = [Definition_Link()] * count
+        for i in range(count):
+            results[i] = Definition_Link.from_c(links_ptr[i])
+        callback(data, results)
     finally:
         if links_ptr: _lib.free_memory(links_ptr)
         if strings_handle: _lib.free_memory(strings_handle)
@@ -221,7 +242,8 @@ if __name__ == "__main__":
             scan_file(path, Language.PYTHON, scan_callback, path)
 
     text = sys.argv[1]
-    find_symbols_in_text(text, find_callback, data=(text, "before"))
+    find_symbols_in_text(text, find_callback, data=(text, "before"),
+                         first_look_at_these_files=["hello.py", "yay.so"])
 
     print("[PY] WAIT, WAIT, WAIT!")
     wait_for_callbacks_in_seconds(20)

{code_intelligence-4.2.2.dist-info → code_intelligence-4.3.1.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: code_intelligence
-Version: 4.2.2
+Version: 4.3.1
 Summary: Code intelligence library

code_intelligence-4.3.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+code_intelligence-4.3.1.dist-info/METADATA,sha256=fVFNZJ-357mc0lh0JO1nXwnuOPGfLII4Lnr0XANPBac,100
+code_intelligence-4.3.1.dist-info/RECORD,,
+code_intelligence-4.3.1.dist-info/WHEEL,sha256=aD7J6E7Slys9i0J65v6Ehfi0DHYa5rImRhUDp62Iwh0,98
+code_intelligence/__init__.py,sha256=Tqxn-pY_ZsW8tv4ynDBmj3Xb6dg9wguqC3yls9hBWC4,587
+code_intelligence/goober.py,sha256=XzT3wqxZae2OgvS9Uktcrr6tW3inxRNmUokvi-nIq2c,7596
+code_intelligence/libcode_intelligence.so,sha256=Kx0BpK3TQKBHDWNCsNYq5vuDvZB7jqkvGuGLLefaU_E,8294912

code_intelligence-4.2.2.dist-info/RECORD

@@ -1,6 +0,0 @@
-code_intelligence-4.2.2.dist-info/METADATA,sha256=rZXF32YBKPTTroc4vgTxereZWlDOjz0VV5k42b0iKT4,100
-code_intelligence-4.2.2.dist-info/RECORD,,
-code_intelligence-4.2.2.dist-info/WHEEL,sha256=aD7J6E7Slys9i0J65v6Ehfi0DHYa5rImRhUDp62Iwh0,98
-code_intelligence/__init__.py,sha256=nQPGzPpVtVdbEkTI2dGXmBdEXm8x0Q0_KbDhz-IiB80,587
-code_intelligence/goober.py,sha256=sb8NcJDfvHlJj7mXuAQpZ7apOtpQtg-7Ra5BrBZhwc4,6801
-code_intelligence/libcode_intelligence.so,sha256=bSSY32V9sln7FrntGw2iD_DO_xO5VbdXLq1wz5WKvrA,8276992