Merge pull request #1042 from adamralph/1040

glennblock · web-flow · commit eb3bdddc44bc · 2016-07-29T11:32:17.000-07:00
made Namespaces collection immutable and relevant methods virtual #1040
diff --git a/src/ScriptCs.Contracts/IScriptExecutor.cs b/src/ScriptCs.Contracts/IScriptExecutor.cs
@@ -7,7 +7,7 @@ public interface IScriptExecutor
     {
         AssemblyReferences References { get; }
 
-        ICollection<string> Namespaces { get; }
+        IReadOnlyCollection<string> Namespaces { get; }
 
         IScriptEngine ScriptEngine { get; }
 
diff --git a/src/ScriptCs.Core/ScriptExecutor.cs b/src/ScriptCs.Core/ScriptExecutor.cs
@@ -51,7 +51,7 @@ public class ScriptExecutor : IScriptExecutor
 
         public AssemblyReferences References { get; private set; }
 
-        public ICollection<string> Namespaces { get; private set; }
+        public IReadOnlyCollection<string> Namespaces { get; private set; }
 
         public ScriptPackSession ScriptPackSession { get; protected set; }
 
@@ -97,8 +97,7 @@ public ScriptExecutor(
             Guard.AgainstNullArgument("composer", composer);
 
             References = new AssemblyReferences(DefaultReferences);
-            Namespaces = new Collection<string>();
-            ImportNamespaces(DefaultNamespaces);
+            Namespaces = new ReadOnlyCollection<string>(DefaultNamespaces);
             FileSystem = fileSystem;
             FilePreProcessor = filePreProcessor;
             ScriptEngine = scriptEngine;
@@ -109,24 +108,16 @@ public ScriptExecutor(
             ScriptLibraryComposer = composer;
         }
 
-        public void ImportNamespaces(params string[] namespaces)
+        public virtual void ImportNamespaces(params string[] namespaces)
         {
             Guard.AgainstNullArgument("namespaces", namespaces);
-
-            foreach (var @namespace in namespaces)
-            {
-                Namespaces.Add(@namespace);
-            }
+            Namespaces = new ReadOnlyCollection<string>(Namespaces.Union(namespaces).ToArray());
         }
 
-        public void RemoveNamespaces(params string[] namespaces)
+        public virtual void RemoveNamespaces(params string[] namespaces)
         {
             Guard.AgainstNullArgument("namespaces", namespaces);
-
-            foreach (var @namespace in namespaces)
-            {
-                Namespaces.Remove(@namespace);
-            }
+            Namespaces = new ReadOnlyCollection<string>(Namespaces.Except(namespaces).ToArray());
         }
 
         public virtual void AddReferences(params Assembly[] assemblies)
@@ -176,9 +167,7 @@ public virtual void Initialize(
         public virtual void Reset()
         {
             References = new AssemblyReferences(DefaultReferences);
-            Namespaces.Clear();
-            ImportNamespaces(DefaultNamespaces);
-
+            Namespaces = new ReadOnlyCollection<string>(DefaultNamespaces);
             ScriptPackSession.State.Clear();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public interface IScriptExecutor`
`7`	`7`	`{`
`8`	`8`	`AssemblyReferences References { get; }`
`9`	`9`
`10`		`- ICollection<string> Namespaces { get; }`
	`10`	`+ IReadOnlyCollection<string> Namespaces { get; }`
`11`	`11`
`12`	`12`	`IScriptEngine ScriptEngine { get; }`
`13`	`13`