Handle completion of named characters better

Author: rocky

mathicsscript/completion.py

@@ -32,7 +32,7 @@
     FIND_MATHICS_WORD_RE = re.compile(
         fr"({NAMED_CHARACTER_START})|(?:.*[\[\(])?({SYMBOLS}$)"
     )
-FIND_MATHICS_WORD_RE = re.compile(r"((?:\[)?[^\s\[\(\{]+)")
+FIND_MATHICS_WORD_RE = re.compile(r"((?:\[)?[^\s]+)")
 
 
 class TokenKind(Enum):
@@ -56,7 +56,7 @@ class MathicsCompleter(WordCompleter):
     def __init__(self, definitions):
         self.definitions = definitions
         self.completer = WordCompleter([])
-        self.named_characters = [name + "]" for name in named_characters.keys()]
+        self.named_characters = sorted(named_characters.keys())
 
         # From WordCompleter, adjusted with default values
         self.ignore_case = True
@@ -144,7 +144,10 @@ def get_word_before_cursor_with_kind(self, document: Document) -> WordToken:
         )
 
         word_before_cursor = text_before_cursor[len(text_before_cursor) + start :]
-        if word_before_cursor.startswith(r"\["):
+        text_before_word = text_before_cursor[: len(word_before_cursor)]
+        if text_before_word.endswith(r"\["):
+            return WordToken(word_before_cursor[2:], TokenKind.NamedCharacter)
+        elif word_before_cursor.startswith(r"\["):
             return WordToken(word_before_cursor[2:], TokenKind.NamedCharacter)
         if word_before_cursor.startswith(r"["):
             word_before_cursor = word_before_cursor[1:]

mathicsscript/version.py

@@ -3,4 +3,4 @@
 # This file is suitable for sourcing inside POSIX shell as
 # well as importing into Python. That's why there is no
 # space around "=" below.
-__version__="3.1.0"  # noqa
+__version__="3.1.1.dev0"  # noqa