Skip to content

Script completer minor refactoring #2635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 23, 2025
Merged

Script completer minor refactoring #2635

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cca00c6
enable_completer() -> initialize_completer()
zas Apr 15, 2025
be8b838
Initialize `last_selected` before connecting signals
zas Apr 15, 2025
6eca60a
ScriptCompleter.choices: sort functions & variables independently
zas Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions picard/ui/widgets/scripttextedit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,15 @@ def highlightBlock(self, text):

class ScriptCompleter(QCompleter):
def __init__(self, parent=None):
super().__init__(sorted(self.choices), parent)
super().__init__(self.choices, parent)
self.setCompletionMode(QCompleter.CompletionMode.UnfilteredPopupCompletion)
self.highlighted.connect(self.set_highlighted)
self.last_selected = ''
self.highlighted.connect(self.set_highlighted)

@property
def choices(self):
yield from (f'${name}' for name in script_function_names())
yield from (f'%{name}%' for name in script_variable_tag_names())
yield from sorted(f'${name}' for name in script_function_names())
yield from sorted(f'%{name}%' for name in script_variable_tag_names())

def set_highlighted(self, text):
self.last_selected = text
Expand Down Expand Up @@ -312,7 +312,7 @@ def __init__(self, parent):
super().__init__(parent)
config = get_config()
self.highlighter = TaggerScriptSyntaxHighlighter(self.document())
self.enable_completer()
self.initialize_completer()
self.setFontFamily(FONT_FAMILY_MONOSPACE)
self.setMouseTracking(True)
self.setAcceptRichText(False)
Expand Down Expand Up @@ -414,7 +414,7 @@ def update_show_tooltips(self):
QToolTip.hideText()
self.setToolTip('')

def enable_completer(self):
def initialize_completer(self):
self.completer = ScriptCompleter()
self.completer.setWidget(self)
self.completer.activated.connect(self.insert_completion)
Expand Down
Loading