Merge pull request #645 from nipunayf/rename-type-category

Rename the "Built-in union types" category to "Other types"
ballerina-platform · Mar 4, 2025 · ec7850f · ec7850f
2 parents 1402573 + 3150b44
commit ec7850f
Show file tree

Hide file tree

Showing 4 changed files with 167 additions and 168 deletions.
diff --git a/...del-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/TypesGenerator.java b/...del-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/TypesGenerator.java
@@ -49,7 +49,6 @@ public class TypesGenerator {
     private final Map<TypeSymbol, CompletionItem> completionItemMap;
     private final Map<TypeSymbol, List<CompletionItem>> subtypeItemsMap;
 
-    private static final String PRIMITIVE_TYPE = "Primitive";
     private static final String USER_DEFINED_TYPE = "User-Defined";
     private static final List<SymbolKind> TYPE_SYMBOL_KINDS = List.of(SymbolKind.TYPE_DEFINITION, SymbolKind.CLASS,
             SymbolKind.ENUM);
@@ -93,9 +92,9 @@ public class TypesGenerator {
             List.of(TYPE_STRING, TYPE_INT, TYPE_FLOAT, TYPE_DECIMAL, TYPE_BOOLEAN, TYPE_NIL, TYPE_BYTE),
             "Data Types", List.of(TYPE_JSON, TYPE_XML, TYPE_ANYDATA),
             "Structural Types", List.of(TYPE_BYTE_ARRAY, TYPE_MAP_JSON, TYPE_MAP_STRING, TYPE_JSON_ARRAY),
-            "Built-in Union Types", List.of(TYPE_ANY, TYPE_READONLY),
             "Error Types", List.of(TYPE_ERROR),
-            "Behaviour Types", List.of(TYPE_FUNCTION, TYPE_FUTURE, TYPE_TYPEDESC, TYPE_HANDLE, TYPE_STREAM));
+            "Behaviour Types", List.of(TYPE_FUNCTION, TYPE_FUTURE, TYPE_TYPEDESC, TYPE_HANDLE, TYPE_STREAM),
+            "Other Types", List.of(TYPE_ANY, TYPE_READONLY));
 
     private TypesGenerator() {
         this.typeSymbolMap = new LinkedHashMap<>();

diff --git a/...or/modules/flow-model-generator-ls-extension/src/test/resources/types/config/config1.json b/...or/modules/flow-model-generator-ls-extension/src/test/resources/types/config/config1.json
@@ -69,103 +69,85 @@
       "insertText": "Admission"
     },
     {
-      "label": "json",
-      "labelDetails": {
-        "detail": "Data Types",
-        "description": "Json"
-      },
-      "kind": "TypeParameter",
-      "insertText": "json"
-    },
-    {
-      "label": "xml",
+      "label": "any",
       "labelDetails": {
-        "detail": "Data Types",
-        "description": "Xml"
+        "detail": "Other Types",
+        "description": "Any"
       },
       "kind": "TypeParameter",
-      "insertText": "xml"
+      "insertText": "any"
     },
     {
-      "label": "anydata",
+      "label": "readonly",
       "labelDetails": {
-        "detail": "Data Types",
-        "description": "Anydata"
+        "detail": "Other Types",
+        "description": "Readonly"
       },
       "kind": "TypeParameter",
-      "insertText": "anydata"
-    },
-    {
-      "label": "error",
-      "labelDetails": {
-        "detail": "Error Types",
-        "description": "Error"
-      },
-      "kind": "Event",
-      "insertText": "error"
+      "insertText": "readonly"
     },
     {
-      "label": "any",
+      "label": "string",
       "labelDetails": {
-        "detail": "Built-in Union Types",
-        "description": "Any"
+        "detail": "Primitive Types",
+        "description": "String"
       },
       "kind": "TypeParameter",
-      "insertText": "any"
+      "insertText": "string"
     },
     {
-      "label": "readonly",
+      "label": "int",
       "labelDetails": {
-        "detail": "Built-in Union Types",
-        "description": "Readonly"
+        "detail": "Primitive Types",
+        "description": "Int"
       },
       "kind": "TypeParameter",
-      "insertText": "readonly"
+      "insertText": "int"
     },
     {
-      "label": "function",
+      "label": "float",
       "labelDetails": {
-        "detail": "Behaviour Types",
-        "description": "Function"
+        "detail": "Primitive Types",
+        "description": "Float"
       },
       "kind": "TypeParameter",
-      "insertText": "function"
+      "insertText": "float"
     },
     {
-      "label": "future",
+      "label": "decimal",
       "labelDetails": {
-        "detail": "Behaviour Types",
-        "description": "Future"
+        "detail": "Primitive Types",
+        "description": "Decimal"
       },
       "kind": "TypeParameter",
-      "insertText": "future"
+      "insertText": "decimal"
     },
     {
-      "label": "typedesc",
+      "label": "boolean",
       "labelDetails": {
-        "detail": "Behaviour Types",
-        "description": "Typedesc"
+        "detail": "Primitive Types",
+        "description": "Boolean"
       },
       "kind": "TypeParameter",
-      "insertText": "typedesc"
+      "insertText": "boolean"
     },
     {
-      "label": "handle",
+      "label": "null",
       "labelDetails": {
-        "detail": "Behaviour Types",
-        "description": "Handle"
+        "detail": "Primitive Types",
+        "description": "Nil"
       },
       "kind": "TypeParameter",
-      "insertText": "handle"
+      "insertText": "null"
     },
     {
-      "label": "stream",
+      "label": "byte",
       "labelDetails": {
-        "detail": "Behaviour Types",
-        "description": "Stream"
+        "detail": "Primitive Types",
+        "description": "Byte"
       },
       "kind": "TypeParameter",
-      "insertText": "stream"
+      "insertText": "byte"
     },
     {
       "label": "byte[]",
@@ -204,67 +186,85 @@
       "insertText": "json[]"
     },
     {
-      "label": "string",
+      "label": "function",
       "labelDetails": {
-        "detail": "Primitive Types",
-        "description": "String"
+        "detail": "Behaviour Types",
+        "description": "Function"
       },
       "kind": "TypeParameter",
-      "insertText": "string"
+      "insertText": "function"
     },
     {
-      "label": "int",
+      "label": "future",
       "labelDetails": {
-        "detail": "Primitive Types",
-        "description": "Int"
+        "detail": "Behaviour Types",
+        "description": "Future"
       },
       "kind": "TypeParameter",
-      "insertText": "int"
+      "insertText": "future"
     },
     {
-      "label": "float",
+      "label": "typedesc",
       "labelDetails": {
-        "detail": "Primitive Types",
-        "description": "Float"
+        "detail": "Behaviour Types",
+        "description": "Typedesc"
       },
       "kind": "TypeParameter",
-      "insertText": "float"
+      "insertText": "typedesc"
     },
     {
-      "label": "decimal",
+      "label": "handle",
       "labelDetails": {
-        "detail": "Primitive Types",
-        "description": "Decimal"
+        "detail": "Behaviour Types",
+        "description": "Handle"
       },
       "kind": "TypeParameter",
-      "insertText": "decimal"
+      "insertText": "handle"
     },
     {
-      "label": "boolean",
+      "label": "stream",
       "labelDetails": {
-        "detail": "Primitive Types",
-        "description": "Boolean"
+        "detail": "Behaviour Types",
+        "description": "Stream"
       },
       "kind": "TypeParameter",
-      "insertText": "boolean"
+      "insertText": "stream"
     },
     {
-      "label": "null",
+      "label": "error",
       "labelDetails": {
-        "detail": "Primitive Types",
-        "description": "Nil"
+        "detail": "Error Types",
+        "description": "Error"
+      },
+      "kind": "Event",
+      "insertText": "error"
+    },
+    {
+      "label": "json",
+      "labelDetails": {
+        "detail": "Data Types",
+        "description": "Json"
       },
       "kind": "TypeParameter",
-      "insertText": "null"
+      "insertText": "json"
     },
     {
-      "label": "byte",
+      "label": "xml",
       "labelDetails": {
-        "detail": "Primitive Types",
-        "description": "Byte"
+        "detail": "Data Types",
+        "description": "Xml"
       },
       "kind": "TypeParameter",
-      "insertText": "byte"
+      "insertText": "xml"
+    },
+    {
+      "label": "anydata",
+      "labelDetails": {
+        "detail": "Data Types",
+        "description": "Anydata"
+      },
+      "kind": "TypeParameter",
+      "insertText": "anydata"
     }
   ]
 }