pull isVariable check into reactive block

NASA-AMMOS · Nov 2, 2024 · 521cacd · 521cacd
1 parent 5f31b17
commit 521cacd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/components/sequencing/form/ArgEditor.svelte b/src/components/sequencing/form/ArgEditor.svelte
@@ -31,11 +31,13 @@
 
   let argDef: FswCommandArgument | undefined = undefined;
   let enableRepeatAdd: boolean = false;
+  let isVariable: boolean = false;
 
   $: argDef = argInfo.argDef;
 
   $: {
-    if (argDef && commandInfoMapper.isArgumentNodeOfVariableType(argInfo.node ?? null)) {
+    isVariable = commandInfoMapper.isArgumentNodeOfVariableType(argInfo.node ?? null);
+    if (!!argDef && isVariable) {
       argDef = {
         arg_type: 'enum',
         bit_length: null,
@@ -79,7 +81,7 @@
     {/if}
   {:else}
     <ArgTitle {argDef} />
-    {#if argInfo.node?.name === 'Enum' && isFswCommandArgumentEnum(argDef)}
+    {#if isVariable && isFswCommandArgumentEnum(argDef)}
       <div class="st-typography-small-caps" title="Dictionary values must be quoted in editor">Global/Parameter</div>
       <EnumEditor
         {argDef}
@@ -91,7 +93,7 @@
         }}
         useQuotes={false}
       />
-    {:else if argDef.arg_type === 'enum' && argInfo.node}
+    {:else if isFswCommandArgumentEnum(argDef) && argInfo.node}
       {#if commandInfoMapper.nodeTypeEnumCompatible(argInfo.node)}
         <EnumEditor
           {commandDictionary}

diff --git a/src/utilities/codemirror/vml/vmlTreeUtils.ts b/src/utilities/codemirror/vml/vmlTreeUtils.ts
@@ -103,7 +103,11 @@ export class VmlCommandInfoMapper implements CommandInfoMapper {
   }
 
   isArgumentNodeOfVariableType(argNode: SyntaxNode | null): boolean {
-    return argNode?.name === RULE_VARIABLE_NAME;
+    if (argNode?.name === RULE_CALL_PARAMETER) {
+      const variableNameNode = argNode.getChild(RULE_SIMPLE_EXPR)?.getChild(RULE_VARIABLE_NAME);
+      return !!variableNameNode && variableNameNode.from === argNode.from && variableNameNode.to === argNode.to;
+    }
+    return false;
   }
 
   nodeTypeEnumCompatible(node: SyntaxNode | null): boolean {