Tune: Add async getting of dte2

TarmoPikaroAtVisualComponents · TarmoPikaroAtVisualComponents · commit cde701507bfa · 2019-02-17T17:40:51.000+02:00
Bugfix: Figure out exception failure
Tune: Add mechanism for main to return false and cancel output in visual studio
Tune: VsScriptExceptionHandler - make class public
vsDev: Remove async, as it can eat exceptions
diff --git a/ScriptEngine/ScriptEnginePackage.cs b/ScriptEngine/ScriptEnginePackage.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Threading;
+using EnvDTE80;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Task = System.Threading.Tasks.Task;
@@ -24,6 +25,7 @@ public sealed class ScriptEnginePackage : AsyncPackage
         public const int CommandId = 0x0100;
 
         public dynamic vsModule;
+        public DTE2 dte;
 
         /// <summary>
         /// Initialization of the package; this method is called right after the package is sited, so this is the place
@@ -36,6 +38,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         {
             // Switch to main thread
             await this.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+            dte = await this.GetServiceAsync(typeof(EnvDTE.DTE)) as DTE2;
 
             // Register menu handlers
             OleMenuCommandService commandService = await GetServiceAsync((typeof(IMenuCommandService))) as OleMenuCommandService;
diff --git a/ScriptEngineStarter/CsScript.cs b/ScriptEngineStarter/CsScript.cs
@@ -35,7 +35,8 @@ public class CsScript
     /// Use CleanupScScriptTempDir() on application startup to wipe out compilation folder.
     /// 
     /// </summary>
-    static public void RunScript( String scriptPath, Object mainArg)
+    /// <returns>Returns object from main method call, null if not called</returns>
+    static public object RunScript( String scriptPath, Object mainArg)
     {
         String tempDir = GetScriptTempDir();
 
@@ -168,23 +169,23 @@ static public void RunScript( String scriptPath, Object mainArg)
             // ----------------------------------------------------------------
             try
             {
-                entry.Invoke(null, new object[] { mainArg });
+                object oRet = entry.Invoke(null, new object[] { mainArg });
                 Directory.SetCurrentDirectory(oldDir);
+
+                return oRet;
             }
             catch (Exception ex)
-            {
+            {
                 Directory.SetCurrentDirectory(oldDir);
 
                 String errors = "";
 
                 try
                 {
                     StackFrame[] stack = new StackTrace(ex.InnerException, true).GetFrames();
-                    StackFrame lastCall = stack[0];
-
-                    errors = String.Format("{0}({1},{2}): error: {3}\r\n", path,
-                        lastCall.GetFileLineNumber(), lastCall.GetFileColumnNumber(), ex.InnerException.Message);
+                    StackFrame lastCall = stack.Last();
 
+                    errors = String.Format("{0}({1},{2}): error: {3}\r\n", path, lastCall.GetFileLineNumber(), lastCall.GetFileColumnNumber(), ex.InnerException.Message);
                 }
                 catch (Exception ex3)
                 {
@@ -203,6 +204,8 @@ static public void RunScript( String scriptPath, Object mainArg)
             // Works only when there is no debugger attached.
             //try { File.Delete(pdbPath); } catch { }
         }
+
+        return null;
     }
 
     static String GetGlobalScriptTempDir()
diff --git a/ScriptEngineStarter/ScriptHost.cs b/ScriptEngineStarter/ScriptHost.cs
@@ -483,8 +483,10 @@ static void FileReloadUIThread( String file )
                 //    helper.Invoke("*.Main");
                 //}
 
-                CsScript.RunScript(file, mainArg);
-                exceptionHandler.ReportScriptResult(file, null);
+                object oRet = CsScript.RunScript(file, mainArg);
+
+                if(!(oRet is bool) || (bool)oRet != false)
+                    exceptionHandler.ReportScriptResult(file, null);
                 break;
             }
             catch (IOException ex)
diff --git a/ScriptEngineStarter/VsScriptExceptionHandler.cs b/ScriptEngineStarter/VsScriptExceptionHandler.cs
@@ -12,7 +12,7 @@
 /// <summary>
 /// Handles errors coming from C# script compilation.
 /// </summary>
-class VsScriptExceptionHandler : ScriptExceptionHandler
+public class VsScriptExceptionHandler : ScriptExceptionHandler
 {
     public override async void ReportScriptResult(String file, Exception ex)
     {
diff --git a/Tools/vsDev/vsDev.cs b/Tools/vsDev/vsDev.cs
@@ -25,14 +25,14 @@
 
 public class vsDev
 {
-
-    public static async void Main( object arg )
+    public static void Main( object arg )
     {
         ScriptEnginePackage sepkg = (ScriptEnginePackage)arg;
-        DTE2 dte = await sepkg.GetServiceAsync(typeof(DTE)) as DTE2;
-        IServiceProvider serviceProvider = sepkg as IServiceProvider;
 
         Debug.WriteLine("New compilation: " + Assembly.GetExecutingAssembly().FullName);
+        var dte = sepkg.dte;
+        
+        //File.Delete(Assembly.GetExecutingAssembly().Location);
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ public class CsScript`
`35`	`35`	`/// Use CleanupScScriptTempDir() on application startup to wipe out compilation folder.`
`36`	`36`	`///`
`37`	`37`	`/// </summary>`
`38`		`- static public void RunScript( String scriptPath, Object mainArg)`
	`38`	`+ /// <returns>Returns object from main method call, null if not called</returns>`
	`39`	`+ static public object RunScript( String scriptPath, Object mainArg)`
`39`	`40`	`{`
`40`	`41`	`String tempDir = GetScriptTempDir();`
`41`	`42`
`@@ -168,23 +169,23 @@ static public void RunScript( String scriptPath, Object mainArg)`
`168`	`169`	`// ----------------------------------------------------------------`
`169`	`170`	`try`
`170`	`171`	`{`
`171`		`- entry.Invoke(null, new object[] { mainArg });`
	`172`	`+ object oRet = entry.Invoke(null, new object[] { mainArg });`
`172`	`173`	`Directory.SetCurrentDirectory(oldDir);`
	`174`	`+`
	`175`	`+ return oRet;`
`173`	`176`	`}`
`174`	`177`	`catch (Exception ex)`
`175`		`- {`
	`178`	`+ {`
`176`	`179`	`Directory.SetCurrentDirectory(oldDir);`
`177`	`180`
`178`	`181`	`String errors = "";`
`179`	`182`
`180`	`183`	`try`
`181`	`184`	`{`
`182`	`185`	`StackFrame[] stack = new StackTrace(ex.InnerException, true).GetFrames();`
`183`		`- StackFrame lastCall = stack[0];`
`184`		`-`
`185`		`- errors = String.Format("{0}({1},{2}): error: {3}\r\n", path,`
`186`		`- lastCall.GetFileLineNumber(), lastCall.GetFileColumnNumber(), ex.InnerException.Message);`
	`186`	`+ StackFrame lastCall = stack.Last();`
`187`	`187`
	`188`	`+ errors = String.Format("{0}({1},{2}): error: {3}\r\n", path, lastCall.GetFileLineNumber(), lastCall.GetFileColumnNumber(), ex.InnerException.Message);`
`188`	`189`	`}`
`189`	`190`	`catch (Exception ex3)`
`190`	`191`	`{`
`@@ -203,6 +204,8 @@ static public void RunScript( String scriptPath, Object mainArg)`
`203`	`204`	`// Works only when there is no debugger attached.`
`204`	`205`	`//try { File.Delete(pdbPath); } catch { }`
`205`	`206`	`}`
	`207`	`+`
	`208`	`+ return null;`
`206`	`209`	`}`
`207`	`210`
`208`	`211`	`static String GetGlobalScriptTempDir()`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// Handles errors coming from C# script compilation.`
`14`	`14`	`/// </summary>`
`15`		`-class VsScriptExceptionHandler : ScriptExceptionHandler`
	`15`	`+public class VsScriptExceptionHandler : ScriptExceptionHandler`
`16`	`16`	`{`
`17`	`17`	`public override async void ReportScriptResult(String file, Exception ex)`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,14 @@`
`25`	`25`
`26`	`26`	`public class vsDev`
`27`	`27`	`{`
`28`		`-`
`29`		`- public static async void Main( object arg )`
	`28`	`+ public static void Main( object arg )`
`30`	`29`	`{`
`31`	`30`	`ScriptEnginePackage sepkg = (ScriptEnginePackage)arg;`
`32`		`- DTE2 dte = await sepkg.GetServiceAsync(typeof(DTE)) as DTE2;`
`33`		`- IServiceProvider serviceProvider = sepkg as IServiceProvider;`
`34`	`31`
`35`	`32`	`Debug.WriteLine("New compilation: " + Assembly.GetExecutingAssembly().FullName);`
	`33`	`+ var dte = sepkg.dte;`
	`34`	`+`
	`35`	`+ //File.Delete(Assembly.GetExecutingAssembly().Location);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`}`