1 files changed, 28 insertions, 35 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
index 31be3a714..446e5b529 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -15,10 +15,11 @@ using Tango.Core;
 using Tango.Core.IO;
 using Tango.Scripting.Core;
 using System.IO;
+using Tango.Core.Helpers;
 
 namespace Tango.Scripting.Basic
 {
-    public class Project : ExtendedObject
+    public class Project<T> : ExtendedObject where T : IContext
     {
         private String _name;
         public String Name
@@ -38,11 +39,9 @@ namespace Tango.Scripting.Basic
 
         public ObservableCollection<ReferenceAssembly> ReferenceAssemblies { get; set; }
 
-        [JsonIgnore]
-        public ObservableCollection<Assembly> ReferenceAssembliesLoaded { get; set; }
-
         public ObservableCollection<Script> Scripts { get; set; }
 
+        [JsonIgnore]
         public ObservableCollection<IScriptSource> AdditionalScripts
         {
             get
@@ -56,38 +55,20 @@ namespace Tango.Scripting.Basic
             ApartmentState = ApartmentState.MTA;
 
             ReferenceAssemblies = new ObservableCollection<ReferenceAssembly>();
-            ReferenceAssemblies.CollectionChanged += ReferenceAssemblies_CollectionChanged;
 
-            ReferenceAssembliesLoaded = new ObservableCollection<Assembly>();
             Scripts = new ObservableCollection<Script>();
             Scripts.CollectionChanged += (x, e) => { RaisePropertyChanged(nameof(AdditionalScripts)); };
         }
 
-        private void ReferenceAssemblies_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            LoadReferenceAssemblies();
-        }
-
-        private void LoadReferenceAssemblies()
+        public static TProject New<TProject, TContext>(String name) where TProject : Project<TContext> where TContext : IContext
         {
-            ReferenceAssembliesLoaded.Clear();
-
-            foreach (var type in ReferenceAssemblies)
-            {
-                ReferenceAssembliesLoaded.Add(type.FromType.Assembly);
-            }
-        }
-
-        public static Project New(String name)
-        {
-            Project p = new Project();
+            TProject p = Activator.CreateInstance<TProject>();
 
             p.Name = name;
 
-            p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(String) });
-            p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Enumerable) });
-            p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Form) });
-            p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Project) });
+            p.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(String)));
+            p.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(Enumerable)));
+            p.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(Form)));
             return p;
         }
 
@@ -140,14 +121,14 @@ namespace Tango.Scripting.Basic
                     }
                     else
                     {
-                        code += Environment.NewLine + Environment.NewLine + "return new Program().OnExecute(GlobalContext);";
+                        code += Environment.NewLine + Environment.NewLine + "new Program().OnExecute(GlobalContext);";
                         mainScriptCode = code;
                     }
                 }
 
-                var scriptOptions = ScriptOptions.Default.WithReferences(ReferenceAssembliesLoaded);
+                var scriptOptions = ScriptOptions.Default.WithReferences(LoadReferenceAssemblies());
 
-                var s = CSharpScript.Create<object>(mainScriptCode, scriptOptions, typeof(GlobalObject));
+                var s = CSharpScript.Create<object>(mainScriptCode, scriptOptions, typeof(GlobalObject<T>));
                 result.Script = s;
 
                 var compileResults = s.Compile();
@@ -164,7 +145,7 @@ namespace Tango.Scripting.Basic
                     cError.Message = error.GetMessage();
                     cError.Severity = error.Severity;
                     var line = error.Location.GetMappedLineSpan();
-                    cError.Line = line.StartLinePosition.Line + 1 + (errorScript != null ? errorScript.LoadCount : 0);
+                    cError.Line = line.StartLinePosition.Line + 1 - (errorScript != null ? errorScript.LoadCount : 0);
                     cError.Column = line.StartLinePosition.Character + 1;
                     cError.Length = line.EndLinePosition.Character - line.StartLinePosition.Character;
                     result.Errors.Add(cError);
@@ -174,7 +155,7 @@ namespace Tango.Scripting.Basic
             });
         }
 
-        public async Task<ProjectSession> Run(IContext context)
+        public async Task<ProjectSession<T>> Run(T context)
         {
             var result = await Compile();
 
@@ -184,9 +165,9 @@ namespace Tango.Scripting.Basic
             }
 
             Thread scriptThread = null;
-            ProjectSession session = null;
+            ProjectSession<T> session = null;
 
-            session = new ProjectSession(this, () =>
+            session = new ProjectSession<T>(this, () =>
             {
                 scriptThread.Abort();
             });
@@ -195,7 +176,7 @@ namespace Tango.Scripting.Basic
             {
                 try
                 {
-                    var runResult = result.Script.RunAsync(globals: new GlobalObject() { GlobalContext = context }).Result;
+                    var runResult = result.Script.RunAsync(globals: new GlobalObject<T>() { GlobalContext = context }).Result;
                     session.Completed(runResult.ReturnValue);
                 }
                 catch (ThreadAbortException)
@@ -214,5 +195,17 @@ namespace Tango.Scripting.Basic
 
             return session;
         }
+
+        public List<Assembly> LoadReferenceAssemblies()
+        {
+            List<Assembly> loadedAssemblies = new List<Assembly>();
+
+            foreach (var asm in ReferenceAssemblies)
+            {
+                loadedAssemblies.Add(asm.Load());
+            }
+
+            return loadedAssemblies;
+        }
     }
 }