Skip to content

made Namespaces collection immutable and relevant methods virtual #1040 #1041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lukebuehler wants to merge 3 commits into from
Closed

made Namespaces collection immutable and relevant methods virtual #1040 #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10f5730
made Namespaces collection immutable and relevant methods virtual #1040
lukebuehler May 7, 2015
8a8a190
made Namespaces collection immutable and relevant methods virtual #1040
lukebuehler May 7, 2015
cd0a15c
Merge branch 'dev' of https://github.com/lukebuehler/scriptcs into dev
lukebuehler May 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ScriptCs.Contracts/IScriptExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public interface IScriptExecutor
{
AssemblyReferences References { get; }

ICollection<string> Namespaces { get; }
IReadOnlyCollection<string> Namespaces { get; }

IScriptEngine ScriptEngine { get; }

Expand Down
25 changes: 7 additions & 18 deletions src/ScriptCs.Core/ScriptExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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; }

Expand Down Expand Up @@ -75,33 +75,24 @@ 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;
Logger = logger;
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)
Expand Down Expand Up @@ -151,9 +142,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();
}

Expand Down