pass invalid namespaces up to executor as it keeps it's own list

filipw · filipw · commit 2d8bbfe0a6b9 · 2014-11-11T14:18:25.000+01:00
catch ex CS0246 and extract namespace
diff --git a/src/ScriptCs.Contracts/ScriptResult.cs b/src/ScriptCs.Contracts/ScriptResult.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
 
 namespace ScriptCs.Contracts
@@ -18,7 +19,8 @@ public ScriptResult()
         public ScriptResult(
             object returnValue = null,
             Exception executionException = null,
-            Exception compilationException = null)
+            Exception compilationException = null, 
+            IEnumerable<string> invalidNamespaces = null)
         {
             if (returnValue != null)
             {
@@ -35,6 +37,11 @@ public ScriptResult(
                 CompileExceptionInfo = ExceptionDispatchInfo.Capture(compilationException);
             }
 
+            if (invalidNamespaces != null)
+            {
+                InvalidNamespaces = new HashSet<string>(invalidNamespaces);
+            }
+
             IsCompleteSubmission = true;
         }
 
@@ -44,6 +51,8 @@ public ScriptResult(
 
         public ExceptionDispatchInfo CompileExceptionInfo { get; private set; }
 
+        public HashSet<string> InvalidNamespaces { get; private set; }
+
         public bool IsCompleteSubmission { get; private set; }
     }
 }
diff --git a/src/ScriptCs.Core/Repl.cs b/src/ScriptCs.Core/Repl.cs
@@ -124,6 +124,11 @@ public override ScriptResult Execute(string script, params string[] scriptArgs)
                     Console.WriteLine(result.ExecuteExceptionInfo.SourceException.Message);
                 }
 
+                if (result.InvalidNamespaces != null && result.InvalidNamespaces.Any())
+                {
+                    RemoveNamespaces(result.InvalidNamespaces.ToArray());
+                }
+
                 if (!result.IsCompleteSubmission)
                 {
                     return result;
diff --git a/src/ScriptCs.Engine.Roslyn/RoslynScriptEngine.cs b/src/ScriptCs.Engine.Roslyn/RoslynScriptEngine.cs
@@ -8,6 +8,7 @@
 using Roslyn.Scripting.CSharp;
 
 using ScriptCs.Contracts;
+using System.Text.RegularExpressions;
 
 namespace ScriptCs.Engine.Roslyn
 {
@@ -116,7 +117,7 @@ public ScriptResult Execute(string code, string[] scriptArgs, AssemblyReferences
                     sessionState.References.Assemblies.Add(assembly);
                 }
 
-                var newNamespaces = namespaces.Except(sessionState.Namespaces);
+               var newNamespaces = namespaces.Except(sessionState.Namespaces);
 
                 foreach (var @namespace in newNamespaces)
                 {
@@ -129,6 +130,22 @@ public ScriptResult Execute(string code, string[] scriptArgs, AssemblyReferences
             Logger.Debug("Starting execution");
 
             var result = Execute(code, sessionState.Session);
+
+            if (result.InvalidNamespaces != null && result.InvalidNamespaces.Any())
+            {
+                var pendingNamespacesField = sessionState.Session.GetType().GetField("pendingNamespaces", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+                var pendingNamespacesValue = (ReadOnlyArray<string>)pendingNamespacesField.GetValue(sessionState.Session);
+                var fixedNamespaces = pendingNamespacesValue.ToList();
+
+                foreach (var @namespace in result.InvalidNamespaces)
+                {
+                    sessionState.Namespaces.Remove(@namespace);
+                    fixedNamespaces.Remove(@namespace);
+                }
+
+                pendingNamespacesField.SetValue(sessionState.Session, ReadOnlyArray<string>.CreateFrom<string>(fixedNamespaces));
+            }
+
             Logger.Debug("Finished execution");
             return result;
         }
@@ -161,6 +178,12 @@ protected virtual ScriptResult Execute(string code, Session session)
             }
             catch (Exception ex)
             {
+                if (ex.Message.StartsWith("error CS0246"))
+                {
+                    var offendingNamespace = Regex.Match(ex.Message, @"\'([^']*)\'").Groups[1].Value;
+                    return new ScriptResult(compilationException: ex, invalidNamespaces: new string[1] {offendingNamespace});
+                }
+           
                 return new ScriptResult(compilationException: ex);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using System.Runtime.ExceptionServices;`
`3`	`4`
`4`	`5`	`namespace ScriptCs.Contracts`
`@@ -18,7 +19,8 @@ public ScriptResult()`
`18`	`19`	`public ScriptResult(`
`19`	`20`	`object returnValue = null,`
`20`	`21`	`Exception executionException = null,`
`21`		`- Exception compilationException = null)`
	`22`	`+ Exception compilationException = null,`
	`23`	`+ IEnumerable<string> invalidNamespaces = null)`
`22`	`24`	`{`
`23`	`25`	`if (returnValue != null)`
`24`	`26`	`{`
`@@ -35,6 +37,11 @@ public ScriptResult(`
`35`	`37`	`CompileExceptionInfo = ExceptionDispatchInfo.Capture(compilationException);`
`36`	`38`	`}`
`37`	`39`
	`40`	`+ if (invalidNamespaces != null)`
	`41`	`+ {`
	`42`	`+ InvalidNamespaces = new HashSet<string>(invalidNamespaces);`
	`43`	`+ }`
	`44`	`+`
`38`	`45`	`IsCompleteSubmission = true;`
`39`	`46`	`}`
`40`	`47`
`@@ -44,6 +51,8 @@ public ScriptResult(`
`44`	`51`
`45`	`52`	`public ExceptionDispatchInfo CompileExceptionInfo { get; private set; }`
`46`	`53`
	`54`	`+ public HashSet<string> InvalidNamespaces { get; private set; }`
	`55`	`+`
`47`	`56`	`public bool IsCompleteSubmission { get; private set; }`
`48`	`57`	`}`
`49`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,11 @@ public override ScriptResult Execute(string script, params string[] scriptArgs)`
`124`	`124`	`Console.WriteLine(result.ExecuteExceptionInfo.SourceException.Message);`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ if (result.InvalidNamespaces != null && result.InvalidNamespaces.Any())`
	`128`	`+ {`
	`129`	`+ RemoveNamespaces(result.InvalidNamespaces.ToArray());`
	`130`	`+ }`
	`131`	`+`
`127`	`132`	`if (!result.IsCompleteSubmission)`
`128`	`133`	`{`
`129`	`134`	`return result;`