Fixing logic in Repl and ScriptExecutor to properly propagate imports and references from Script Libraries

glennblock · glennblock · commit 3b89d2309de1 · 2015-04-25T23:00:45.000-07:00
diff --git a/src/ScriptCs.Core/Repl.cs b/src/ScriptCs.Core/Repl.cs
@@ -114,7 +114,10 @@ public override ScriptResult Execute(string script, params string[] scriptArgs)
                     ? preProcessResult.Code
                     : Buffer + Environment.NewLine + preProcessResult.Code;
 
-                var result = ScriptEngine.Execute(Buffer, _scriptArgs, References, Namespaces, ScriptPackSession);
+                var namespaces = Namespaces.Union(preProcessResult.Namespaces);
+                var references = References.Union(preProcessResult.References);
+
+                var result = ScriptEngine.Execute(Buffer, _scriptArgs, references, namespaces, ScriptPackSession);
                 if (result == null) return ScriptResult.Empty;
 
                 if (result.CompileExceptionInfo != null)
diff --git a/src/ScriptCs.Core/ScriptExecutor.cs b/src/ScriptCs.Core/ScriptExecutor.cs
@@ -167,26 +167,26 @@ public virtual ScriptResult Execute(string script, params string[] scriptArgs)
         {
             var path = Path.IsPathRooted(script) ? script : Path.Combine(FileSystem.CurrentDirectory, script);
             var result = FilePreProcessor.ProcessFile(path);
-            References = References.Union(result.References);
-            var namespaces = Namespaces.Union(result.Namespaces);
             ScriptEngine.FileName = Path.GetFileName(path);
 
             Logger.Debug("Starting execution in engine");
 
             InjectScriptLibraries(Path.GetDirectoryName(path), result, ScriptPackSession.State);
-            return ScriptEngine.Execute(result.Code, scriptArgs, References, namespaces, ScriptPackSession);
+            var namespaces = Namespaces.Union(result.Namespaces);
+            var references = References.Union(result.References);
+            return ScriptEngine.Execute(result.Code, scriptArgs, references, namespaces, ScriptPackSession);
         }
 
         public virtual ScriptResult ExecuteScript(string script, params string[] scriptArgs)
         {
             var result = FilePreProcessor.ProcessScript(script);
-            References = References.Union(result.References);
-            var namespaces = Namespaces.Union(result.Namespaces);
 
             Logger.Debug("Starting execution in engine");
 
             InjectScriptLibraries(FileSystem.CurrentDirectory, result, ScriptPackSession.State);
-            return ScriptEngine.Execute(result.Code, scriptArgs, References, namespaces, ScriptPackSession);
+            var namespaces = Namespaces.Union(result.Namespaces);
+            var references = References.Union(result.References);
+            return ScriptEngine.Execute(result.Code, scriptArgs, references, namespaces, ScriptPackSession);
         }
 
         protected internal virtual void InjectScriptLibraries(
