diff --git a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.SG/HotExecutorGenerator.cs b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.SG/HotExecutorGenerator.cs index a6f9da86..f63873ab 100644 --- a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.SG/HotExecutorGenerator.cs +++ b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor.SG/HotExecutorGenerator.cs @@ -18,8 +18,15 @@ void ISourceGenerator.Execute(GeneratorExecutionContext context) string coreScript = "HEProxy.SetProjectKind(HEProjectKind.Console);"; string winformAndwpfLoggerScript = @" -string debugFilePath = Path.Combine(VSCSharpProjectInfomation.MainCsprojPath,""HEDebug.txt""); -if(File.Exists(debugFilePath)){ File.Delete(debugFilePath); } +string debugFilePath = Path.Combine(VSCSharpProjectInfomation.HEOutputPath,""Debug.txt""); +if (Directory.Exists(VSCSharpProjectInfomation.HEOutputPath)) +{ + var files = Directory.GetFiles(VSCSharpProjectInfomation.HEOutputPath); + foreach (var file in files) + { + File.Delete(file); + } +} HEFileLogger logger = new HEFileLogger(debugFilePath); HEProxy.ShowMessage = async msg => { await logger.WriteUtf8FileAsync(msg); diff --git a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/WinformRewriter.cs b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/WinformRewriter.cs index 63f04525..2406ef8d 100644 --- a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/WinformRewriter.cs +++ b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/WinformRewriter.cs @@ -44,39 +44,40 @@ internal static class WinformRewriter if (runNode != null) { - return blockSyntax.ReplaceNode(runNode, [SyntaxFactory.ParseStatement(@$" HEProxy.SetAftHotExecut(() => {{ - Task.Run(() => + System.Threading.Tasks.Task.Run(() => {{ - Application.ExitThread(); + System.Windows.Forms.Application.ExitThread(); while(!DiposeWindows()){{}}; var __heProxInstance = {runArgumentScript}; - Form tempForm; - if (__heProxInstance is Form) + System.Windows.Forms.Form tempForm; + if (__heProxInstance is System.Windows.Forms.Form) {{ - tempForm = ((object)__heProxInstance as Form)!; + tempForm = ((object)__heProxInstance as System.Windows.Forms.Form)!; }} else {{ - tempForm = (Form)(typeof(ApplicationContext).GetProperty(""MainForm"")!.GetValue(__heProxInstance)!); + tempForm = (System.Windows.Forms.Form)(typeof(System.Windows.Forms.ApplicationContext).GetProperty(""MainForm"")!.GetValue(__heProxInstance)!); }} tempForm.FormClosed += (s, e) => {{ if (!HEProxy.IsHotCompiling) {{ - var result = MessageBox.Show(""请确认是否退出主程序？"", ""HotExecutor 提醒"", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning); - if (result.HasFlag(DialogResult.OK)) + var result = System.Windows.Forms.MessageBox.Show(""请确认是否退出主程序？"", ""HotExecutor 提醒"", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning); + if (result.HasFlag(System.Windows.Forms.DialogResult.OK)) {{ - Application.Exit(); + System.Windows.Forms.Application.Exit(); }} }} }}; try{{ - Application.Run(__heProxInstance); - }}catch(Exception ex) + + System.Windows.Forms.Application.Run(__heProxInstance); + + }}catch(System.Exception ex) {{ HEProxy.ShowMessage(ex.Message); }} @@ -84,15 +85,15 @@ internal static class WinformRewriter static bool DiposeWindows() {{ try{{ - for (int i = 0; i < Application.OpenForms.Count; i++) + for (int i = 0; i < System.Windows.Forms.Application.OpenForms.Count; i++) {{ try{{ - var form = Application.OpenForms[i]; + var form = System.Windows.Forms.Application.OpenForms[i]; if (form!=null) {{ HEProxy.ShowMessage($""当前将被注销的开放窗体 {{form.Name}}""); form.Dispose(); - DelegateHelper.Execute.Invoke(Application.OpenForms, form); + Natasha.CSharp.HotExecutor.Component.DelegateHelper.Execute.Invoke(System.Windows.Forms.Application.OpenForms, form); }} }}catch{{ }} diff --git a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/WpfWriter.cs b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/WpfWriter.cs index 6a5c1e5b..0e6eb2e8 100644 --- a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/WpfWriter.cs +++ b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/SyntaxUtils/WpfWriter.cs @@ -2,6 +2,7 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Text; namespace Natasha.CSharp.HotExecutor.Component.SyntaxUtils @@ -10,31 +11,50 @@ internal static class WpfWriter { public static BlockSyntax? Handle(BlockSyntax blockSyntax) { - return blockSyntax.WithStatements([SyntaxFactory.ParseStatement(@$"HEProxy.SetAftHotExecut(() => {{ - Task.Run(() => {{ - - while(!DiposeWindows()){{}}; - Application.Current.Run(); + var mainStatement = SyntaxFactory.ParseStatement(@" + System.Windows.Application.Current.Dispatcher.Invoke(()=>{ + + while(!DiposeWindows()){}; + static bool DiposeWindows() - {{ - try{{ - for (int i = 0; i < Application.Current.Windows.Count; i++) - {{ - var window = Application.Current.Windows[i]; - try{{ - window.Close(); - }}catch{{ - - }} - }} - }}catch{{ - return false; - }} + { + try{ + //HEProxy.ShowMessage($""当前将被注销的开放窗体个数 {System.Windows.Application.Current.Windows.Count}""); + for (int i = 0; i < System.Windows.Application.Current.Windows.Count; i++) + { + + try{ + var window = System.Windows.Application.Current.Windows[i]; + window.Dispatcher.Invoke(()=>{ window.Close(); }); + }catch{ + + } + } + + }catch(System.Exception ex){ + + HEProxy.ShowMessage($""出现异常 {ex.GetType()}{ex.Message}""); + if(ex is not System.InvalidOperationException){ + return false; + } + + } return true; - }} - }}); - }});")]); + } + }); + System.Windows.Application.Current.Shutdown(); + "); + + var newStatement = SyntaxFactory.ParseStatement(@$" + + HEProxy.SetAftHotExecut(() => {{ + +{blockSyntax.Statements.ToFullString()} + + }});"); + Debug.WriteLine(mainStatement.ToFullString()); + return blockSyntax.WithStatements([newStatement]); } } } diff --git a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/VSCSharpProjectInfomation.cs b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/VSCSharpProjectInfomation.cs index f1652356..49aef015 100644 --- a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/VSCSharpProjectInfomation.cs +++ b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/VSCSharpProjectInfomation.cs @@ -17,6 +17,7 @@ public static class VSCSharpProjectInfomation public static readonly HashSet ExpectFiles; public static readonly bool EnableImplicitUsings; public static IEnumerable? MainAssemblyUsings; + public static readonly string HEOutputPath; static VSCSharpProjectInfomation() { ExpectFiles = []; @@ -29,6 +30,7 @@ static VSCSharpProjectInfomation() ExecutePath = new FileInfo(currentExeFilePath).Directory!.FullName; var currentDirectoryInfo = new DirectoryInfo(ExecutePath); MainCsprojPath = FindFileDirectory(currentDirectoryInfo,"*.csproj"); + HEOutputPath = Path.Combine(MainCsprojPath, "HEOutput"); var files = Directory.GetFiles(MainCsprojPath,"*.csproj"); CSProjFilePath = files[0]; BinPath = Path.Combine(MainCsprojPath, "bin"); @@ -93,9 +95,13 @@ public static bool CheckFileAvailiable(string file) return CheckFileAvivaliable(file, BinPath, ObjPath); } + public static bool IsXamlAndResxFile(string file) + { + return file.EndsWith(".xaml") || file.EndsWith(".resx"); + } public static bool CheckFileAvivaliable(string file, string binPath, string objPath) { - if (file.EndsWith(".cs") || file.EndsWith(".xaml") || file.EndsWith(".resx")) + if (file.EndsWith(".cs")) { if (file.StartsWith(binPath)) { diff --git a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/WatcherUtils/VSCSharpMainFileWatcher.cs b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/WatcherUtils/VSCSharpMainFileWatcher.cs index 5ffb89a9..3bc3f5bf 100644 --- a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/WatcherUtils/VSCSharpMainFileWatcher.cs +++ b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/WatcherUtils/VSCSharpMainFileWatcher.cs @@ -52,8 +52,12 @@ public void DeployMonitor() { return; } + if (VSCSharpProjectInfomation.IsXamlAndResxFile(e.FullPath)) + { + await ExecuteAfterFunction(); - if (VSCSharpProjectInfomation.CheckFileAvailiable(e.FullPath)) + } + else if (VSCSharpProjectInfomation.CheckFileAvailiable(e.FullPath)) { #if DEBUG HEProxy.ShowMessage($"Created: {e.FullPath}"); @@ -62,6 +66,7 @@ public void DeployMonitor() _compileLock.GetAndWaitLock(); CreateFileAction(e.FullPath); _compileLock.ReleaseLock(); + await ExecuteAfterFunction(); } @@ -73,7 +78,12 @@ public void DeployMonitor() { return; } - if (VSCSharpProjectInfomation.CheckFileAvailiable(e.FullPath)) + if (VSCSharpProjectInfomation.IsXamlAndResxFile(e.FullPath)) + { + await ExecuteAfterFunction(); + + } + else if (VSCSharpProjectInfomation.CheckFileAvailiable(e.FullPath)) { #if DEBUG HEProxy.ShowMessage($"Deleted: {e.FullPath}"); @@ -83,7 +93,7 @@ public void DeployMonitor() _compileLock.ReleaseLock(); await ExecuteAfterFunction(); } - + }; _mainWatcher.Renamed += async (sender, e) => @@ -92,10 +102,13 @@ public void DeployMonitor() { return; } + if (VSCSharpProjectInfomation.IsXamlAndResxFile(e.OldFullPath) || VSCSharpProjectInfomation.IsXamlAndResxFile(e.FullPath)) + { + await ExecuteAfterFunction(); - if (e.OldFullPath.EndsWith(".cs") || e.OldFullPath.EndsWith(".xaml")) + }else if (e.OldFullPath.EndsWith(".cs")) { - if (e.FullPath.EndsWith(".cs") || e.FullPath.EndsWith(".xaml")) + if (e.FullPath.EndsWith(".cs")) { #if DEBUG HEProxy.ShowMessage($"Renamed: {e.OldFullPath} -> {e.FullPath}"); @@ -150,10 +163,10 @@ private async Task ExecuteAfterFunction() catch { - + } } - + private static void Error(object sender, ErrorEventArgs e) { PrintException(e.GetException()); diff --git a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/WatcherUtils/VSCSharpProjectFileWatcher.cs b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/WatcherUtils/VSCSharpProjectFileWatcher.cs index 9d2081cc..7b22dd86 100644 --- a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/WatcherUtils/VSCSharpProjectFileWatcher.cs +++ b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/Component/WatcherUtils/VSCSharpProjectFileWatcher.cs @@ -29,7 +29,7 @@ public void SetExecute(Func execute) public void Notify() { #if DEBUG - Console.WriteLine($"接收重建通知！"); + Debug.WriteLine($"接收重建通知！"); #endif _timeStamp = DateTime.UtcNow.Ticks / 10000; _needExecuted = true; @@ -46,7 +46,7 @@ public void StartMonitor() { Clean(); #if DEBUG - Console.WriteLine($"时间戳差值: {DateTime.UtcNow.Ticks / 10000 - _timeStamp}"); + Debug.WriteLine($"时间戳差值: {DateTime.UtcNow.Ticks / 10000 - _timeStamp}"); #endif if (DateTime.UtcNow.Ticks / 10000 - _timeStamp > 2000) { @@ -129,7 +129,7 @@ public VSCSharpProjectFileInternalWatcher(string csprojPath, ConcurrentDictionar var fileName = Path.GetFileName(csprojPath); var binFolder = Path.Combine(folder, "bin"); var objFolder = Path.Combine(folder, "obj"); - FileSystemEventHandler handler = (sender, e) => { + FileSystemEventHandler csFileHandler = (sender, e) => { if (VSCSharpProjectInfomation.CheckFileAvivaliable(e.FullPath, binFolder, objFolder)) { @@ -137,13 +137,28 @@ public VSCSharpProjectFileInternalWatcher(string csprojPath, ConcurrentDictionar } }; - RenamedEventHandler reNameHandler = (sender, e) => { + RenamedEventHandler csRenameHandler = (sender, e) => { if (VSCSharpProjectInfomation.CheckFileAvivaliable(e.FullPath, binFolder, objFolder)) { _notify?.Invoke(); } }; + FileSystemEventHandler csprojFileHandler = (sender, e) => { + + if (e.FullPath == csprojPath) + { + _notify?.Invoke(); + } + + }; + RenamedEventHandler csprojRenameHandler = (sender, e) => { + + if (e.FullPath == csprojPath) + { + _notify?.Invoke(); + } + }; var csfileWatcher = new FileSystemWatcher() { @@ -152,10 +167,10 @@ public VSCSharpProjectFileInternalWatcher(string csprojPath, ConcurrentDictionar EnableRaisingEvents = true, IncludeSubdirectories = true, }; - csfileWatcher.Changed += handler; - csfileWatcher.Deleted += handler; - csfileWatcher.Created += handler; - csfileWatcher.Renamed += reNameHandler; + csfileWatcher.Changed += csFileHandler; + csfileWatcher.Deleted += csFileHandler; + csfileWatcher.Created += csFileHandler; + csfileWatcher.Renamed += csRenameHandler; var csprojWatcher = new FileSystemWatcher() { @@ -166,8 +181,8 @@ public VSCSharpProjectFileInternalWatcher(string csprojPath, ConcurrentDictionar NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.CreationTime | NotifyFilters.DirectoryName | NotifyFilters.LastAccess }; - csprojWatcher.Changed += handler; - csprojWatcher.Renamed += reNameHandler; + csprojWatcher.Changed += csprojFileHandler; + csprojWatcher.Renamed += csprojRenameHandler; csprojWatcher.Deleted += (sender, e) => { if (e.FullPath == csprojPath) diff --git a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/HEProxy.cs b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/HEProxy.cs index 7bdb75cc..90c30edd 100644 --- a/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/HEProxy.cs +++ b/src/Natasha.CSharp/Extension/HotExecutor/Natasha.CSharp.HotExecutor/HEProxy.cs @@ -232,10 +232,6 @@ public static void Run() var root = tree.GetCompilationUnitRoot()!; if (root.Members.Count == 0) { -#if DEBUG - ShowMessage($"检测到空成员文件 {file}."); -#endif - return tree; } @@ -350,11 +346,12 @@ private static async Task HotExecute() } ShowMessage($"执行主入口回调方法...."); _endCallback?.Invoke(); - + ShowMessage($"入口回调方法执行完毕."); } catch (Exception ex) { + ShowMessage($"热编译运行失败...."); if (ex is NatashaException nex) { @@ -370,13 +367,22 @@ private static async Task HotExecute() } } ShowMessage($"Error during hot execution: {errorBuilder}"); - + var files = Directory.GetFiles(VSCSharpProjectInfomation.HEOutputPath); + foreach (var file in files) + { + if (file.StartsWith("error.")) + { + File.Delete(file); + } + } + File.WriteAllText(Path.Combine(VSCSharpProjectInfomation.HEOutputPath, "error." + Guid.NewGuid().ToString("N") + ".txt"), nex.Formatter); } else { ShowMessage($"Error during hot execution: {ex}"); } + } _isHotCompiling = false; return;