Redo the order of autcompletion

Author: kddejong

client/src/test/suite/completion.test.ts

@@ -219,7 +219,8 @@ export async function testCompletion(
   assert.equal(
     actualCompletionList.items.length,
     expectedCompletionList.items.length,
-    "Completion List doesn't have expected size"
+    "Completion List doesn't have expected size: " +
+      JSON.stringify(actualCompletionList.items)
   );
   expectedCompletionList.items
     .sort((a, b) => (a.label > b.label ? 1 : -1))

server/src/cfnSettings.ts

@@ -49,37 +49,13 @@ export class SettingsState extends YamlSettingsState {
   cfnLintIgnoreRules: Array<string> = [];
   cfnLintOverrideSpecPath: string = "";
 
-  indentation: string = "     ";
-
   pendingValidationRequests: { [uri: string]: NodeJS.Timeout } = {};
   validationDelayMs = 200;
 
   isPreviewing: { [index: string]: boolean } = {};
 
   constructor() {
     super();
-    this.customTags = [
-      "!And sequence",
-      "!If sequence",
-      "!Not sequence",
-      "!Equals sequence",
-      "!Or sequence",
-      "!FindInMap sequence",
-      "!Base64 scalar",
-      "!Join sequence",
-      "!Cidr sequence",
-      "!Ref scalar",
-      "!Sub scalar",
-      "!Sub sequence",
-      "!GetAtt scalar",
-      "!GetAtt sequence",
-      "!GetAZs mapping",
-      "!GetAZs scalar",
-      "!ImportValue mapping",
-      "!ImportValue scalar",
-      "!Select sequence",
-      "!Split sequence",
-    ];
     this.schemaStoreEnabled = false;
   }
 }

server/src/server/handlers/languageHandlers.ts

@@ -42,6 +42,24 @@ export class LanguageHandlers extends YamlLanguageHandlers {
   private cfnLanguageService: LanguageService;
   private cfnSettings: SettingsState;
   private cfnConnection: Connection;
+  private customTags: string[] = [
+    "!And",
+    "!Base64",
+    "!Cidr",
+    "!Equals",
+    "!FindInMap",
+    "!GetAtt",
+    "!GetAZs",
+    "!If",
+    "!ImportValue",
+    "!Join",
+    "!Not",
+    "!Or",
+    "!Ref",
+    "!Select",
+    "!Split",
+    "!Sub",
+  ];
 
   pendingLimitExceededWarnings: {
     [uri: string]: {
@@ -119,6 +137,15 @@ export class LanguageHandlers extends YamlLanguageHandlers {
     }
 
     if (this.cfnSettings.yamlShouldCompletion) {
+      for (var fn of this.customTags) {
+        results.items.push({
+          label: fn,
+          sortText: "zzzzzzzzzz",
+          insertText: fn + " ",
+          insertTextFormat: 2,
+          kind: 12,
+        });
+      }
       try {
         if (node !== null && template !== null) {
           if (isNode(node.internalNode)) {