Merge pull request #163 from romangolev/dev

Make application compatible with Revit 2025

Author: daren-thomas

.github/workflows/Workflow.yml

@@ -1,6 +1,7 @@
 name: Workflow
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - '**'
@@ -16,4 +17,4 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Run Nuke Build
-        run: ./.nuke/build.cmd --GitHubToken ${{ secrets.GITHUB_TOKEN }}
+        run: ./.nuke/build.cmd --GitHubToken ${{ secrets.GITHUB_TOKEN }}

Installer/Installer.cs

@@ -12,7 +12,7 @@
 const string projectName = "RevitPythonShell";
 const string outputName = "RevitPythonShell";
 const string outputDir = "output";
-const string version = "2.0.2";
+const string version = "2.1.0";
 
 var fileName = new StringBuilder().Append(outputName).Append("-").Append(version);
 var project = new Project

Installer/Installer.csproj

@@ -5,6 +5,7 @@
         <PlatformTarget>x64</PlatformTarget>
         <TargetFramework>net48</TargetFramework>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <Configurations>Debug;Release</Configurations>
     </PropertyGroup>
     <PropertyGroup Condition="$(Configuration.Contains('Release'))">
         <Optimize>true</Optimize>

PythonConsoleControl/PythonConsole.cs

@@ -14,7 +14,6 @@
 using ICSharpCode.AvalonEdit.Editing;
 using ICSharpCode.AvalonEdit.Document;
 using Style = Microsoft.Scripting.Hosting.Shell.Style;
-using System.Runtime.Remoting;
 
 namespace PythonConsoleControl
 {
@@ -26,6 +25,28 @@ namespace PythonConsoleControl
     /// </summary>
     public class PythonConsole : IConsole, IDisposable
     {
+
+        Action<Action> commandDispatcher;
+        public Action<Action> GetCommandDispatcherSafe()
+        {
+            if (commandDispatcher == null)
+            {
+                try
+                {
+                    var languageContext = Microsoft.Scripting.Hosting.Providers.HostingHelpers.GetLanguageContext(commandLine.ScriptScope.Engine);
+                    var pythonContext = (IronPython.Runtime.PythonContext)languageContext;
+                    commandDispatcher = pythonContext.GetSetCommandDispatcher(null);
+                    pythonContext.GetSetCommandDispatcher(commandDispatcher);
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine("Failed to get dispatcher: " + ex.Message);
+                    commandDispatcher = action => action(); // fallback dispatcher
+                }
+            }
+            return commandDispatcher;
+        }
+
         bool allowFullAutocompletion = true;
         public bool AllowFullAutocompletion
         {
@@ -381,13 +402,35 @@ void ExecuteStatements()
                     }
                     else
                     {
-                        ObjectHandle wrapexception = null;
-                        GetCommandDispatcher()(() => scriptSource.ExecuteAndWrap(commandLine.ScriptScope, out wrapexception));
-                        if (wrapexception != null)
+                        Exception capturedEx = null;
+                        var dispatcher = GetCommandDispatcherSafe();
+
+                        ManualResetEventSlim done = new ManualResetEventSlim();
+
+                        dispatcher(() =>
+                        {
+                            try
+                            {
+                                scriptSource.Execute(commandLine.ScriptScope);
+                            }
+                            catch (Exception ex)
+                            {
+                                capturedEx = ex;
+                            }
+                            finally
+                            {
+                                done.Set();
+                            }
+                        });
+
+                        done.Wait();
+
+                        if (capturedEx != null)
                         {
-                            error = "Exception : " + wrapexception.Unwrap().ToString() + "\n";
+                            var eo = commandLine.ScriptScope.Engine.GetService<ExceptionOperations>();
+                            error = eo.FormatException(capturedEx) + Environment.NewLine;
                         }
-                    }                    
+                    }
                 }
                 catch (ThreadAbortException tae)
                 {

PythonConsoleControl/PythonTextEditor.cs

@@ -74,9 +74,10 @@ public void Write(string text)
 
         public void Write(string text, bool allowSynchronous, bool moveToEnd)
         {
-            //text = text.Replace("\r\r\n", "\r\n");
-            text = text.Replace("\r\r\n", "\r");
-            text = text.Replace("\r\n", "\r");
+            text = text.Replace("\r\r\n", "\r\n"); // Normalize Windows-style newlines
+            text = text.Replace("\r\n", "\n"); // Or "\r" if needed
+            text = text.Replace("\0", ""); // Remove NUL characters
+
             if (allowSynchronous)
             {
                 if (moveToEnd)