script_variable_tag_names(): use TagVar.script_name(), add test

Author: zas

picard/ui/widgets/scripttextedit.py

@@ -182,7 +182,7 @@ def __init__(self, parent=None):
     @property
     def choices(self):
         yield from (f'${name}' for name in script_function_names())
-        yield from (f'%{name}%'.replace('~', '_', 1) for name in script_variable_tag_names())
+        yield from (f'%{name}%' for name in script_variable_tag_names())
 
     def set_highlighted(self, text):
         self.last_selected = text

picard/util/tags.py

@@ -841,7 +841,11 @@ def file_info_tag_names():
 
 def script_variable_tag_names():
     """Tag names available to scripts (used by script editor completer)"""
-    yield from ALL_TAGS.names(selector=lambda tv: tv.is_script_variable)
+    yield from (
+        tagvar.script_name()
+        for tagvar in ALL_TAGS
+        if tagvar.is_script_variable
+    )
 
 
 def display_tag_name(name):

test/test_util_tags.py

@@ -32,6 +32,7 @@
     display_tag_name,
     parse_comment_tag,
     parse_subtag,
+    script_variable_tag_names,
 )
 
 
@@ -158,6 +159,22 @@ def test_tagvars_display_name(self):
         with mock.patch("picard.util.tags._", return_value='translated'):
             self.assertEqual(tagvars.display_name('only_sd'), 'translated')
 
+    def test_script_variable_tag_names(self):
+        tagvars = TagVars(
+            self.tagvar_nodesc,
+            self.tagvar_hidden,
+            self.tagvar_hidden_sd,
+            self.tagvar_only_sd,
+            self.tagvar_sd_ld,
+        )
+        self.tagvar_sd_ld.is_script_variable = False
+
+        with mock.patch('picard.util.tags.ALL_TAGS', tagvars):
+            self.assertEqual(
+                tuple(script_variable_tag_names()),
+                ('nodesc', '_hidden', '_hidden_sd', 'only_sd'),
+            )
+
 
 class UtilTagsTest(PicardTestCase):
     def test_display_tag_name(self):