code-intelligence 3.3.0__py3-none-win_amd64.whl → 3.3.2__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__ = "3.3.0"
+__version__ = "3.3.2"
 __version_info__ = tuple(int(i) for i in __version__.split('.'))
 
 __all__ = [

code_intelligence/goober.py

@@ -50,12 +50,6 @@ _lib.get_pending_tasks_count.restype = C.c_uint64
 _lib.free_memory.argtypes = [C.c_void_p]
 _lib.free_memory.restype = None
 
-# --- CPYTHON C API ACCESS ---
-C.pythonapi.Py_IncRef.argtypes = [C.py_object]
-C.pythonapi.Py_IncRef.restype = None
-C.pythonapi.Py_DecRef.argtypes = [C.py_object]
-C.pythonapi.Py_DecRef.restype = None
-
 
 def positional_repr(cls):
     def __repr__(self):
@@ -77,35 +71,46 @@ class Definition_Link:
 
 # IMPORTANT: KEEP THIS ALIVE FOR GO THREAD WORKER
 C_NO_CALLBACK = SCAN_CALLBACK(0)
+_KEEPALIVE = dict[int, tuple]()
 
 
-def _wrap_data_ptr(callback, data):
-    full_data = (callback, data)
-
-    # MANUALLY INCREMENT THE REFERENCE COUNT
-    # We are now responsible for its lifetime
-    C.pythonapi.Py_IncRef(full_data)
-
-    return id(full_data)
-
+def _wrap_data_ptr(tup: tuple):
+    ptr = id(tup)
+    _KEEPALIVE[ptr] = tup
+    return ptr
 
-def _unwrap_data_ptr(data_ptr):
-    assert data_ptr != 0, "we got NULL"
 
-    full_data = C.cast(data_ptr, C.py_object).value
+def _unwrap_data_ptr(ptr) -> tuple:
+    tup = _KEEPALIVE.pop(ptr, None)
+    assert tup is not None, "keepalive missing for callback"
+    return tup
 
-    # MANUALLY DECREMENT THE REFERENCE COUNT.
-    # We are fulfilling our promise
-    C.pythonapi.Py_DecRef(full_data)
 
-    return full_data
+# def _wrap_data_ptr(tup: tuple):
+#     # MANUALLY INCREMENT THE REFERENCE COUNT
+#     # We are now responsible for its lifetime
+#     C.pythonapi.Py_IncRef(C.py_object(tup))
+#
+#     return id(tup) # C.cast(obj, C.c_void_p)
+#
+#
+# def _unwrap_data_ptr(data_ptr) -> tuple:
+#     assert data_ptr != 0, "we got NULL"
+#
+#     tup = C.cast(data_ptr, C.py_object).value
+#
+#     # MANUALLY DECREMENT THE REFERENCE COUNT.
+#     # We are fulfilling our promise
+#     C.pythonapi.Py_DecRef(C.py_object(tup))
+#
+#     return tup
 
 
 def scan_file(file, language: Language, callback=None, data=None) -> bool:
     if callback is None:
         c_callback, data_ptr = C_NO_CALLBACK, 0
     else:
-        c_callback, data_ptr = C_AFTER_SCAN, _wrap_data_ptr(callback, data)
+        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)
@@ -125,7 +130,7 @@ def find_symbols_in_text(text: str, callback=None, data=None) -> 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)
+        c_callback, data_ptr = C_AFTER_FIND, _wrap_data_ptr((callback, data))
 
     # print("[PY] sending find_symbols_in_text")
     _lib.enqueue_find_symbols_in_text(c_callback, data_ptr, text.encode())
@@ -206,9 +211,9 @@ if __name__ == "__main__":
         path = Path(folder)
         if path.is_dir():
             for file in path.rglob("*.py"):
-                scan_file(file, scan_callback, file)
+                scan_file(file, Language.PYTHON, scan_callback, file)
         else:
-            scan_file(path, scan_callback, path)
+            scan_file(path, Language.PYTHON, scan_callback, path)
 
     text = sys.argv[1]
     find_symbols_in_text(text, find_callback, data=(text, "before"))

{code_intelligence-3.3.0.dist-info → code_intelligence-3.3.2.dist-info}/METADATA

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

code_intelligence-3.3.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+code_intelligence-3.3.2.dist-info/METADATA,sha256=8CbUIUnddfvjcSVE89vgiuoqj4Rgsg6qLJSzxFdnwaI,100
+code_intelligence-3.3.2.dist-info/RECORD,,
+code_intelligence-3.3.2.dist-info/WHEEL,sha256=aD7J6E7Slys9i0J65v6Ehfi0DHYa5rImRhUDp62Iwh0,98
+code_intelligence/__init__.py,sha256=OqMfhLblRbAVpTR0VKo2Ap-J4XKuDY-PaiqEv9N3zCU,587
+code_intelligence/goober.py,sha256=CGwX8hulLbiJFx05u0hMYGXnbQnfYBmyyFildhj0ziQ,6622
+code_intelligence/libcode_intelligence.h,sha256=9iy0xXcOpq366DuiKw1cw4-7VNz-QPAYBNJGZKEh12M,3169
+code_intelligence/libcode_intelligence.so,sha256=Ls1qokhJ_5xlgUNDu4xBRjMeJIWL1ySiNz0yE_Pfh1w,2840576
+code_intelligence/symdb.py,sha256=gRq3-xr2oYIzudgwDwMj3Zl5Pb0B8tDdnGKUB0WIV_o,32427

code_intelligence-3.3.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-code_intelligence-3.3.0.dist-info/METADATA,sha256=GjydZJisD2oYo8E4VkOSw7GKxskpnITRxtFGRurGncU,100
-code_intelligence-3.3.0.dist-info/RECORD,,
-code_intelligence-3.3.0.dist-info/WHEEL,sha256=aD7J6E7Slys9i0J65v6Ehfi0DHYa5rImRhUDp62Iwh0,98
-code_intelligence/__init__.py,sha256=oIXxSmeNFJScnUsKG8r906r1ur34-SwvbN8gGGkb_D8,587
-code_intelligence/goober.py,sha256=yelM919e_n3nI2NnYx3qGgAS74J2-zkdp3x-GIz_gVI,6481
-code_intelligence/libcode_intelligence.h,sha256=9iy0xXcOpq366DuiKw1cw4-7VNz-QPAYBNJGZKEh12M,3169
-code_intelligence/libcode_intelligence.so,sha256=wQ0AyR2z7GvHf6kZVntMmRAE-E4yT4VgZkcdFQ7G8Lo,2840064
-code_intelligence/symdb.py,sha256=gRq3-xr2oYIzudgwDwMj3Zl5Pb0B8tDdnGKUB0WIV_o,32427