fsxc: refactoring (DRY)

Tiny DRY-respect improvement.
nblockchain · Sep 5, 2024 · 6f15704 · 6f15704
1 parent bc3acc4
commit 6f15704
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/fsxc/Fsxc.fs b/fsxc/Fsxc.fs
@@ -710,6 +710,17 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() }
             : FileInfo =
             let projectFile = GetAutoGenerationTargets origScript "fsproj"
 
+            let addFile relativeOrAbsoluteFilePath =
+                let fsProjFragment =
+                    sprintf
+                        "<ItemGroup><Compile Include=\"%s\" /></ItemGroup>"
+                        relativeOrAbsoluteFilePath
+
+                File.AppendAllText(
+                    projectFile.FullName,
+                    fsProjFragment + Environment.NewLine
+                )
+
             let rec iterate(lines: List<LineAction>) : unit =
                 match lines with
                 | head :: tail ->
@@ -741,16 +752,13 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() }
                                 + Environment.NewLine
                             )
                         | PreProcessorAction.Load fileName ->
-                            let fsProjFragment =
+                            addFile(
                                 sprintf
-                                    "<ItemGroup><Compile Include=\"..%c%s\" /></ItemGroup>"
+                                    "..%c%s"
                                     Path.DirectorySeparatorChar
                                     fileName
-
-                            File.AppendAllText(
-                                projectFile.FullName,
-                                fsProjFragment + Environment.NewLine
                             )
+
                         | PreProcessorAction.Ref refName ->
                             let fsProjFragment =
                                 if refName.ToLower().EndsWith(".dll") then
@@ -797,13 +805,9 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() }
 
             iterate contents
 
-            File.AppendAllText(
-                projectFile.FullName,
-                "<ItemGroup>
-                  <Compile Include=\"{userScriptFileName}.fs\" />
-                </ItemGroup></Project>"
-                    .Replace("{userScriptFileName}", origScript.Name)
-            )
+            addFile origScript.Name
+
+            File.AppendAllText(projectFile.FullName, "</Project>")
 
             projectFile
 #endif