Expand prime superscript support (#109)

opvious/modeling/identifiers.py

@@ -286,7 +286,10 @@ def format_quantifier(
 
 def _first_available(name: Name, env: Environment) -> Name:
     while name in env:
-        name += "'"
+        if name.endswith("}"):
+            name = name[:-1] + r" \prime}"
+        else:
+            name += "'"
     return name
 
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "opvious"
-version = "0.18.0rc1"
+version = "0.18.0rc2"
 description = "Opvious Python SDK"
 authors = ["Opvious Engineering <[email protected]>"]
 readme = "README.md"

tests/test_modeling.py

@@ -253,18 +253,29 @@ async def test_definition_counts(self):
     @pytest.mark.asyncio
     async def test_global_name_collision(self):
         class _Model(om.Model):
+            count = om.Variable.natural()
+            cost = om.Variable.natural()
             step_count = om.Variable.natural()
             step_cost = om.Variable.non_negative()
             step_color = om.Variable.non_negative()
 
             @om.objective
             def minimize_cost(self):
-                return self.step_count() + self.step_cost() + self.step_color()
+                return (
+                    self.count()
+                    + self.cost()
+                    + self.step_count()
+                    + self.step_cost()
+                    + self.step_color()
+                )
 
         model = _Model()
         spec = await client.annotate_specification(model.specification())
         assert spec.annotation.issue_count == 0
-        assert r"\chi^\mathrm{step}''" in spec.sources[0].text
+        text = spec.sources[0].text
+        assert r"\chi^\mathrm{step \prime}" in text
+        assert r"\chi^\mathrm{step \prime \prime}" in text
+        assert r"\chi'" in text
 
     @pytest.mark.asyncio
     async def test_annotate_markdown_repr(self):