simdref 0.0.11__tar.gz → 0.0.12__tar.gz

{simdref-0.0.11/src/simdref.egg-info → simdref-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simdref
-Version: 0.0.11
+Version: 0.0.12
 Summary: Searchable SIMD intrinsic and instruction reference with CLI, manpages, TUI, and LSP.
 Author: Marco
 License: GPL-3.0-or-later

{simdref-0.0.11 → simdref-0.0.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simdref"
-version = "0.0.11"
+version = "0.0.12"
 description = "Searchable SIMD intrinsic and instruction reference with CLI, manpages, TUI, and LSP."
 readme = "README.md"
 requires-python = ">=3.10"

{simdref-0.0.11 → simdref-0.0.12}/src/simdref/lsp.py

@@ -99,6 +99,11 @@ def _code_point_index(line: str, character: int) -> int:
     return index
 
 
+def _utf16_column(line: str, index: int) -> int:
+    # The reverse of _code_point_index: a code-point index to a UTF-16 column.
+    return sum(2 if ord(c) > 0xFFFF else 1 for c in line[:index])
+
+
 def _line_prefix(text: str, line: int, character: int) -> str:
     lines = text.splitlines()
     if line >= len(lines):
@@ -374,7 +379,7 @@ def _inlay_hints(conn, text: str, language_id: str, uri: str, start: int, end: i
             # LSP columns count UTF-16 code units.
             "position": {
                 "line": line,
-                "character": len(source_lines[line].encode("utf-16-le")) // 2,
+                "character": _utf16_column(source_lines[line], len(source_lines[line])),
             },
             "label": _cut_label("; ".join(hints[line])),
             "paddingLeft": True,

{simdref-0.0.11 → simdref-0.0.12/src/simdref.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simdref
-Version: 0.0.11
+Version: 0.0.12
 Summary: Searchable SIMD intrinsic and instruction reference with CLI, manpages, TUI, and LSP.
 Author: Marco
 License: GPL-3.0-or-later

{simdref-0.0.11 → simdref-0.0.12}/tests/test_lsp_stdio.py

@@ -10,6 +10,7 @@ import time
 import unittest
 from pathlib import Path
 
+from simdref import lsp
 from simdref.lsp import _mnemonic_from_asm_line
 from simdref.storage import SQLITE_PATH
 
@@ -192,6 +193,27 @@ class LspEndToEndTests(unittest.TestCase):
         self.assertTrue(hints[4]["label"].endswith("..."))
         self.assertFalse(hints[5]["label"].endswith("..."))
 
+    def test_inlay_hint_after_astral_characters_gets_utf16_column(self):
+        # LSP columns count UTF-16 code units: each emoji adds 2 units to the
+        # end-of-line column the hint returns.
+        prefix = "".join("\U0001f600" for _ in range(10))
+        text = f"# {prefix}\n    vaddps ymm0, ymm1, ymm2 # {prefix}\n"
+        self.server.open(ASM_URI, "asm", text)
+        hints = {h["position"]["line"]: h for h in self.server.hints(ASM_URI)}
+        self.assertEqual(sorted(hints), [1])
+        line = text.split("\n")[1]
+        self.assertEqual(
+            hints[1]["position"]["character"],
+            lsp._utf16_column(line, len(line)),
+        )
+        self.assertEqual(hints[1]["label"], "Add Packed Single Precision Floating-Point Values.")
+
+    def test_utf16_column_is_the_reverse_of_code_point_index(self):
+        line = "a \U0001f600 b"
+        for index in range(len(line) + 1):
+            with self.subTest(index=index):
+                self.assertEqual(lsp._code_point_index(line, lsp._utf16_column(line, index)), index)
+
     def test_range_limits_hints(self):
         self.server.open(ASM_URI, "asm", ASM_TEXT)
         self.assertEqual([h["position"]["line"] for h in self.server.hints(ASM_URI, 4, 4)], [4])