reduce repeated code and make a helper method to find local/global variables

Author: GreemDev

src/Lib/Public/Hypervisor/Starscript.Completions.cs

@@ -128,7 +128,7 @@ private void CompletionsExpr(string source, int pos, Expr expr, CompletionCallba
     {
         if (expr is Expr.Variable variableExpr)
         {
-            return (Locals?.GetRaw(variableExpr.Name) ?? Globals.GetRaw(variableExpr.Name))?.Invoke();
+            return GetVariable(variableExpr.Name);
         }
 
         if (expr is Expr.Get getExpr)

src/Lib/Public/Hypervisor/Starscript.Globals.cs

@@ -85,6 +85,10 @@ public StarscriptHypervisor Set(string name, object obj)
     /// </summary>
     public void Clear() => Globals.Clear();
 
+    internal Func<Value>? ResolveVariable(string name) => Locals?.GetRaw(name) ?? Globals.GetRaw(name);
+
+    internal Value? GetVariable(string name) => ResolveVariable(name)?.Invoke();
+
     /// <summary>
     ///     Removes a single value with the specified name from the globals and returns the removed value.
     /// </summary>

src/Lib/Public/Hypervisor/Starscript.HV.cs

@@ -227,7 +227,7 @@ internal StringSegment RunImpl(ExecutableScript script, StringBuilder sb)
                 {
                     var name = script.Constants[script.GetMasked(instructionPointer++)].GetString();
 
-                    Push((Locals?.GetRaw(name) ?? Globals.GetRaw(name))?.Invoke());
+                    Push(GetVariable(name));
 
                     break;
                 }
@@ -239,7 +239,7 @@ internal StringSegment RunImpl(ExecutableScript script, StringBuilder sb)
 
                     Push(!value.IsMap
                         ? Value.Null
-                        : value.GetMap().GetRaw(name)?.Invoke()
+                        : GetVariable(name)
                     );
 
                     break;
@@ -325,7 +325,7 @@ internal StringSegment RunImpl(ExecutableScript script, StringBuilder sb)
                 {
                     var name = script.Constants[script.GetMasked(instructionPointer++)].GetString();
 
-                    Append(sb, (Locals?.GetRaw(name) ?? Globals.GetRaw(name))?.Invoke());
+                    Append(sb, GetVariable(name));
 
                     break;
                 }
@@ -367,7 +367,7 @@ internal StringSegment RunImpl(ExecutableScript script, StringBuilder sb)
                     {
                         // Variable
                         var name = script.Constants[script.GetMasked(instructionPointer++)].GetString();
-                        value = (Locals?.GetRaw(name) ?? Globals.GetRaw(name))?.Invoke() ?? Value.Null;
+                        value = GetVariable(name) ?? Value.Null;
                     }
 
                     {
@@ -392,7 +392,7 @@ internal StringSegment RunImpl(ExecutableScript script, StringBuilder sb)
                     {
                         // Variable
                         var name = script.Constants[script.GetMasked(instructionPointer++)].GetString();
-                        value = (Locals?.GetRaw(name) ?? Globals.GetRaw(name))?.Invoke() ?? Value.Null;
+                        value = GetVariable(name) ?? Value.Null;
                     }
 
                     {