Refactor EnumSchemaNode to improve handling of "Any" type

davelopez · Jun 22, 2024 · 4f69902 · 4f69902
1 parent e2b0394
commit 4f69902
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/server/gx-workflow-ls-format2/src/schema/definitions.ts b/server/gx-workflow-ls-format2/src/schema/definitions.ts
@@ -195,12 +195,16 @@ export class EnumSchemaNode implements SchemaNode {
     return false;
   }
 
+  public get canBeAny(): boolean {
+    return this.name === "Any";
+  }
+
   public get typeRef(): string {
     return this._schemaEnum.name;
   }
 
   public matchesType(typeName: string): boolean {
-    return this.name === "Any" || this.symbols.includes(typeName);
+    return this.canBeAny || this.symbols.includes(typeName);
   }
 
   //Override toString for debugging purposes

diff --git a/server/gx-workflow-ls-format2/src/services/completionService.ts b/server/gx-workflow-ls-format2/src/services/completionService.ts
@@ -53,6 +53,8 @@ export class GxFormat2CompletionService {
     const position = textBuffer.getPosition(offset);
     const isPositionAfterColon = textBuffer.isPositionAfterToken(position, ":");
     if (schemaNode instanceof EnumSchemaNode) {
+      if (schemaNode.canBeAny) return result;
+
       schemaNode.symbols
         .filter((v) => v.startsWith(currentWord))
         .forEach((value) => {