Clear CodeDom and add ICodeDomService

ricaun-io · Jan 27, 2024 · 8a630d8 · 8a630d8
1 parent f0893a8
commit 8a630d8
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [1.0.6] / 2024-01-27
 ### Features
 - Using `ricaun.Revit.UI.Tasks`
+### Updated
+- Add `ICodeDomService` interface
+- Add `CodeDomFactory` class
 ### Remove
 - Remove `Revit.Async`
 

diff --git a/RevitAddin.CommandLoader/Revit/Commands/CommandTest.cs b/RevitAddin.CommandLoader/Revit/Commands/CommandTest.cs
@@ -18,7 +18,7 @@ public Result Execute(ExternalCommandData commandData, ref string message, Eleme
 
             try
             {
-                CodeDomService codeDomService = new CodeDomService();
+                var codeDomService = CodeDomFactory.Instance;
                 var assembly = codeDomService.GenerateCode(
                     CodeSamples.CommandVersion,
                     CodeSamples.CommandTask,

diff --git a/RevitAddin.CommandLoader/Revit/Commands/CommandTestGist.cs b/RevitAddin.CommandLoader/Revit/Commands/CommandTestGist.cs
@@ -21,7 +21,7 @@ public Result Execute(ExternalCommandData commandData, ref string message, Eleme
 
             try
             {
-                CodeDomService codeDomService = new CodeDomService() { UseLegacyCodeDom = true };
+                var codeDomService = CodeDomFactory.Instance;
                 var assembly = codeDomService.GenerateCode(gistContent);
 
                 App.CreateCommands(assembly);

diff --git a/RevitAddin.CommandLoader/Revit/Commands/CommandTestGistFiles.cs b/RevitAddin.CommandLoader/Revit/Commands/CommandTestGistFiles.cs
@@ -20,7 +20,8 @@ public Result Execute(ExternalCommandData commandData, ref string message, Eleme
 
             try
             {
-                CodeDomService codeDomService = new CodeDomService();
+                System.Console.WriteLine(gistFilesContent.Length);
+                var codeDomService = CodeDomFactory.Instance;
                 var assembly = codeDomService.GenerateCode(gistFilesContent);
 
                 App.CreateCommands(assembly);

diff --git a/RevitAddin.CommandLoader/RevitAddin.CommandLoader.csproj b/RevitAddin.CommandLoader/RevitAddin.CommandLoader.csproj
@@ -89,7 +89,7 @@
 
   <PropertyGroup>
     <PackageId>RevitAddin.CommandLoader</PackageId>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
     <ProjectGuid>{82070359-36DA-4441-A59D-9018B6A8B348}</ProjectGuid>
   </PropertyGroup>
 

diff --git a/....CommandLoader/Services/CodeDomService.cs → ...Loader/Services/CodeDom/CodeDomService.cs b/....CommandLoader/Services/CodeDomService.cs → ...Loader/Services/CodeDom/CodeDomService.cs
@@ -2,24 +2,29 @@
 using System.CodeDom;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 
-namespace RevitAddin.CommandLoader.Services
+namespace RevitAddin.CommandLoader.Services.CodeDom
 {
-    public class CodeDomService
+    public class CodeDomService : ICodeDomService
     {
-        public bool UseLegacyCodeDom { get; set; }
-        public string CompilerOptions { get; set; }
-        public CodeDomService SetDefines(params string[] defines)
+        private CodeDomProvider provider;
+
+        public CodeDomService(CodeDomProvider provider)
+        {
+            this.provider = provider;
+        }
+        private string CompilerOptions { get; set; }
+        public ICodeDomService SetDefines(params string[] defines)
         {
-            CompilerOptions += $" /define:{string.Join(";", defines).Replace(" ", "")}";
+            CompilerOptions = $" /define:{string.Join(";", defines).Replace(" ", "")}";
             return this;
         }
-        public Assembly GenerateCode(params string[] sources)
+
+        public Assembly GenerateCode(params string[] sourceCode)
         {
-            var compilationUnits = sources
+            var compilationUnits = sourceCode
                 .Select(s => new CodeSnippetCompileUnit(s))
                 .ToArray();
 
@@ -28,7 +33,6 @@ public Assembly GenerateCode(params string[] sources)
 
         public Assembly GenerateCode(params CodeCompileUnit[] compilationUnits)
         {
-            CodeDomProvider provider = CodeProviderService.GetCSharpCodeProvider(UseLegacyCodeDom);
             CompilerParameters compilerParametes = new CompilerParameters();
 
             compilerParametes.GenerateExecutable = false;
@@ -51,6 +55,7 @@ public Assembly GenerateCode(params CodeCompileUnit[] compilationUnits)
             {
                 compilerParametes.ReferencedAssemblies.Add(keyAssembly.Value.Location);
             }
+
             #endregion
 
             CompilerResults results = provider.CompileAssemblyFromDom(compilerParametes, compilationUnits);

diff --git a/...andLoader/Services/CodeProviderService.cs → ...r/Services/CodeDom/CodeProviderService.cs b/...andLoader/Services/CodeProviderService.cs → ...r/Services/CodeDom/CodeProviderService.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace RevitAddin.CommandLoader.Services
+namespace RevitAddin.CommandLoader.Services.CodeDom
 {
     public class CodeProviderService
     {

diff --git a/RevitAddin.CommandLoader/Services/CodeDom/ICodeDomService.cs b/RevitAddin.CommandLoader/Services/CodeDom/ICodeDomService.cs
@@ -0,0 +1,11 @@
+using System.Reflection;
+
+namespace RevitAddin.CommandLoader.Services.CodeDom
+{
+    public interface ICodeDomService
+    {
+        Assembly GenerateCode(params string[] sourceCode);
+        public ICodeDomService SetDefines(params string[] defines);
+
+    }
+}
diff --git a/RevitAddin.CommandLoader/Services/CodeDomFactory.cs b/RevitAddin.CommandLoader/Services/CodeDomFactory.cs
@@ -0,0 +1,17 @@
+using RevitAddin.CommandLoader.Services.CodeDom;
+
+namespace RevitAddin.CommandLoader.Services
+{
+    public class CodeDomFactory
+    {
+        public static ICodeDomService Instance { get; private set; } = CreateCodeDomService();
+
+        private static ICodeDomService CreateCodeDomService()
+        {
+            var provider = CodeProviderService.GetCSharpCodeProvider();
+
+            return new CodeDomService(provider);
+        }
+
+    }
+}
diff --git a/RevitAddin.CommandLoader/ViewModels/CompileViewModel.cs b/RevitAddin.CommandLoader/ViewModels/CompileViewModel.cs
@@ -25,7 +25,6 @@ public class CompileViewModel : ObservableObject
 #else
             CodeSamples.Command;
 #endif
-        public bool UseLegacyCodeDom { get; set; } = false;
         public bool EnableText { get; set; } = true;
         public IAsyncRelayCommand Command => new AsyncRelayCommand(CompileText);
         #endregion
@@ -79,16 +78,22 @@ await App.RevitTask.Run((uiapp) =>
                     var version = uiapp.Application.VersionNumber;
                     try
                     {
-                        var codeDomService = new CodeDomService()
-                        {
-                            UseLegacyCodeDom = UseLegacyCodeDom
-                        };
+                        var codeDomService = CodeDomFactory.Instance;
 
-                        var assembly = codeDomService
+                        var defines = new[] {
+                            $"REVIT{version}",
+                            $"Revit{version}",
 #if DEBUG
-                             .SetDefines("DEBUG")
+                             "DEBUG",
 #endif
-                             .SetDefines($"REVIT{version}", $"Revit{version}")
+                        };
+
+                        var assembly = codeDomService
+                             //#if DEBUG
+                             //                             .SetDefines("DEBUG")
+                             //#endif
+                             //                             .SetDefines($"REVIT{version}", $"Revit{version}")
+                             .SetDefines(defines)
                              .GenerateCode(sources);
 
                         App.CreateCommands(assembly);
@@ -109,7 +114,7 @@ private void InitializeCompile()
         {
             Task.Run(() =>
             {
-                new CodeDomService().GenerateCode(CodeSamples.Command);
+                CodeDomFactory.Instance.GenerateCode(CodeSamples.Command);
             });
         }
         #endregion