Addressing review feedback from @dahlbyk and @shiftkey

glennblock · glennblock · commit 0eb7d34ea4e3 · 2013-07-29T18:51:14.000-07:00
diff --git a/src/ScriptCs.Hosting/IScriptServicesBuilder.cs b/src/ScriptCs.Hosting/IScriptServicesBuilder.cs
@@ -7,6 +7,6 @@ public interface IScriptServicesBuilder : IServiceOverrides<IScriptServicesBuild
         IScriptServicesBuilder ScriptName(string name);
         IScriptServicesBuilder Repl(bool repl = true);
         IScriptServicesBuilder LogLevel(LogLevel level);
-        void LoadModules(string extension, params string[] moduleNames);
+        IScriptServicesBuilder LoadModules(string extension, params string[] moduleNames);
     }
 }
diff --git a/src/ScriptCs.Hosting/ModuleLoader.cs b/src/ScriptCs.Hosting/ModuleLoader.cs
@@ -53,7 +53,7 @@ public void Load(IModuleConfiguration config, string modulePackagesPath, string
             var lazyModules = _getModules(container);
             var modules = lazyModules
                 .Where(m => moduleNames.Contains(m.Metadata.Name) ||
-                    (extension != null && m.Metadata.Extensions != null && (m.Metadata.Extensions.Equals(extension) || m.Metadata.Extensions.Split(',').Contains(extension))))
+                    (extension != null && m.Metadata.Extensions != null && (m.Metadata.Extensions.Split(',').Contains(extension))))
                 .Select(m => m.Value);
 
             _logger.Debug("Initializing modules");
diff --git a/src/ScriptCs.Hosting/ScriptServicesBuilder.cs b/src/ScriptCs.Hosting/ScriptServicesBuilder.cs
@@ -51,11 +51,12 @@ public ScriptServices Build()
             return _runtimeServices.GetScriptServices();
         }
 
-        public void LoadModules(string extension, params string[] moduleNames)
+        public IScriptServicesBuilder LoadModules(string extension, params string[] moduleNames)
         {
             var config = new ModuleConfiguration(_debug, _scriptName, _repl, _logLevel, _overrides);
             var loader = _initializationServices.GetModuleLoader();
             loader.Load(config, _initializationServices.GetFileSystem().ModulesFolder, extension, moduleNames);
+            return this;
         }
 
         public IScriptServicesBuilder Debug(bool debug = true)
diff --git a/src/ScriptCs.Hosting/ScriptServicesRegistration.cs b/src/ScriptCs.Hosting/ScriptServicesRegistration.cs
@@ -21,10 +21,7 @@ public abstract class ScriptServicesRegistration
 
         public ScriptServicesRegistration(ILog logger, IDictionary<Type, object> overrides)
         {
-            if (overrides == null)
-                overrides = new Dictionary<Type, object>();
-
-            _overrides = overrides;
+            _overrides = overrides ?? new Dictionary<Type, object>();
             _logger = logger;
         }
 
diff --git a/src/ScriptCs/Program.cs b/src/ScriptCs/Program.cs
@@ -46,16 +46,11 @@ private static int Main(string[] args)
 
         private static string[] GetModuleList(string modulesArg)
         {
-            string[] modules = new string[0];
+            var modules = new string[0];
 
             if (modulesArg != null)
-            {
                 modules = modulesArg.Split(',');
-                if (modules.Length == 0)
-                {
-                    modules = new[] {modulesArg};
-                }
-            }
+
             return modules;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ public interface IScriptServicesBuilder : IServiceOverrides<IScriptServicesBuild`
`7`	`7`	`IScriptServicesBuilder ScriptName(string name);`
`8`	`8`	`IScriptServicesBuilder Repl(bool repl = true);`
`9`	`9`	`IScriptServicesBuilder LogLevel(LogLevel level);`
`10`		`- void LoadModules(string extension, params string[] moduleNames);`
	`10`	`+ IScriptServicesBuilder LoadModules(string extension, params string[] moduleNames);`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,12 @@ public ScriptServices Build()`
`51`	`51`	`return _runtimeServices.GetScriptServices();`
`52`	`52`	`}`
`53`	`53`
`54`		`- public void LoadModules(string extension, params string[] moduleNames)`
	`54`	`+ public IScriptServicesBuilder LoadModules(string extension, params string[] moduleNames)`
`55`	`55`	`{`
`56`	`56`	`var config = new ModuleConfiguration(_debug, _scriptName, _repl, _logLevel, _overrides);`
`57`	`57`	`var loader = _initializationServices.GetModuleLoader();`
`58`	`58`	`loader.Load(config, _initializationServices.GetFileSystem().ModulesFolder, extension, moduleNames);`
	`59`	`+ return this;`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`public IScriptServicesBuilder Debug(bool debug = true)`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,7 @@ public abstract class ScriptServicesRegistration`
`21`	`21`
`22`	`22`	`public ScriptServicesRegistration(ILog logger, IDictionary<Type, object> overrides)`
`23`	`23`	`{`
`24`		`- if (overrides == null)`
`25`		`- overrides = new Dictionary<Type, object>();`
`26`		`-`
`27`		`- _overrides = overrides;`
	`24`	`+ _overrides = overrides ?? new Dictionary<Type, object>();`
`28`	`25`	`_logger = logger;`
`29`	`26`	`}`
`30`	`27`