Insert valid yarnspinner text on keyword completion (ie "if" instead of "COMMAND_IF")

Author: pappleby

LanguageServer/src/Server/Handlers/CompletionHandler.cs

@@ -57,11 +57,13 @@ public Task<CompletionList> Handle(CompletionParams request, CancellationToken c
                 var vocabulary = yarnFile.Parser.Vocabulary;
                 foreach (var token in candidates.Tokens)
                 {
-                    var label = vocabulary.GetSymbolicName(token.Key);
-                    if (label == null) { continue; } // unrecognized token
+                    var tokenname = vocabulary.GetSymbolicName(token.Key);
+
+                    if (tokenname == null) { continue; } // unrecognized token
+
+                    var label = UserFriendlyTokenText.GetValueOrDefault(tokenname, tokenname);
+                    var text = TokenSnippets.GetValueOrDefault(tokenname, label);
 
-                    var text = TokenSnippets.GetValueOrDefault(label, label);
-                    label = UserFriendlyTokenText.GetValueOrDefault(label, label);
                     results.Add(new CompletionItem
                     {
                         Label = label,
@@ -225,8 +227,8 @@ public Task<CompletionList> Handle(CompletionParams request, CancellationToken c
 
         public static readonly Dictionary<string, string> UserFriendlyTokenText = new Dictionary<string, string>
         {
-            { "COMMAND_IF", "if" }, { "COMMAND_ELSEIF", "elseif" }, { "COMMAND_ELSE", "else" }, { "COMMAND_SET", "set" },
-            { "COMMAND_ENDIF", "endif" }, { "COMMAND_CALL", "call" }, { "COMMAND_DECLARE", "declare" }, { "COMMAND_JUMP", "jump" },
+            { "COMMAND_IF", "if " }, { "COMMAND_ELSEIF", "elseif " }, { "COMMAND_ELSE", "else" }, { "COMMAND_SET", "set " },
+            { "COMMAND_ENDIF", "endif" }, { "COMMAND_CALL", "call " }, { "COMMAND_DECLARE", "declare " }, { "COMMAND_JUMP", "jump " },
             { "KEYWORD_FALSE", "false" }, { "KEYWORD_TRUE", "true" }, { "KEYWORD_NULL", "null" },
         };