tests

i574n · Jul 6, 2024 · c075634 · c075634
1 parent 523a55f
commit c075634
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -27,5 +27,16 @@
     "seccomp=unconfined",
     "--env-file",
     "${localWorkspaceFolder}/.devcontainer/.env"
-  ]
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "i574n.spiral-lang-vscode-i574n",
+        "i574n.dotnet-interactive-vscode-i574n"
+      ],
+      "settings": {
+        "notebook.lineNumbers": "on"
+      }
+    }
+  }
 }
diff --git a/apps/spiral/Eval.dib b/apps/spiral/Eval.dib
@@ -383,7 +383,7 @@ let prepareSpiral rawCellCode lines =
         let lastTopLevelIndex, _ =
             (lines |> Array.indexed, (None, false))
             ||> Array.foldBack (fun (i, line) (lastTopLevelIndex, finished) ->
-                trace Verbose (fun () -> $"Eval.prepareSpi / i: {i} / line: '{line}' / lastTopLevelIndex: {lastTopLevelIndex} / finished: {finished}") _locals
+                // trace Verbose (fun () -> $"Eval.prepareSpiral / i: {i} / line: '{line}' / lastTopLevelIndex: {lastTopLevelIndex} / finished: {finished}") _locals
                 match line with
                 | _ when finished -> lastTopLevelIndex, true
                 | "" -> lastTopLevelIndex, false
@@ -768,7 +768,7 @@ let inline eval
 
                 trace Verbose
                     (fun () -> $"Eval.eval")
-                    (fun () -> $"cellCode: {cellCode |> SpiralSm.ellipsis_end 400} / lastTopLevelIndex: {lastTopLevelIndex} / builderCommands: %A{builderCommands} / buildBackends: %A{buildBackends} / isReal: {isReal} / {_locals ()}")
+                    (fun () -> $"lastTopLevelIndex: {lastTopLevelIndex} / builderCommands: %A{builderCommands} / buildBackends: %A{buildBackends} / isReal: {isReal} / {_locals ()}")
 
                 let! buildCodeResults =
                     buildBackends

diff --git a/apps/spiral/Eval.fs b/apps/spiral/Eval.fs
@@ -289,7 +289,7 @@ module Eval =
             let lastTopLevelIndex, _ =
                 (lines |> Array.indexed, (None, false))
                 ||> Array.foldBack (fun (i, line) (lastTopLevelIndex, finished) ->
-                    trace Verbose (fun () -> $"Eval.prepareSpi / i: {i} / line: '{line}' / lastTopLevelIndex: {lastTopLevelIndex} / finished: {finished}") _locals
+                    // trace Verbose (fun () -> $"Eval.prepareSpiral / i: {i} / line: '{line}' / lastTopLevelIndex: {lastTopLevelIndex} / finished: {finished}") _locals
                     match line with
                     | _ when finished -> lastTopLevelIndex, true
                     | "" -> lastTopLevelIndex, false
@@ -659,7 +659,7 @@ module Eval =
 
                     trace Verbose
                         (fun () -> $"Eval.eval")
-                        (fun () -> $"cellCode: {cellCode |> SpiralSm.ellipsis_end 400} / lastTopLevelIndex: {lastTopLevelIndex} / builderCommands: %A{builderCommands} / buildBackends: %A{buildBackends} / isReal: {isReal} / {_locals ()}")
+                        (fun () -> $"lastTopLevelIndex: {lastTopLevelIndex} / builderCommands: %A{builderCommands} / buildBackends: %A{buildBackends} / isReal: {isReal} / {_locals ()}")
 
                     let! buildCodeResults =
                         buildBackends

diff --git a/apps/spiral/Supervisor.dib b/apps/spiral/Supervisor.dib
@@ -365,7 +365,7 @@ let inline buildFile backend timeout port cancellationToken path =
             ((None, [], 0), outputSeq)
             ||> FSharp.Control.AsyncSeq.scan (
                 fun (outputContentResult, errors, typeErrorCount) (outputContent, error) ->
-                    trace Debug (fun () -> $"Supervisor.buildFile / AsyncSeq.scan / outputContent: {outputContent |> Option.defaultValue System.String.Empty |> SpiralSm.ellipsis_end 400} / errors: {errors |> serializeObj} / outputContentResult: {outputContentResult} / typeErrorCount: {typeErrorCount} / retry: {retry} / error: {error} / path: {path}") _locals
+                    trace Debug (fun () -> $"Supervisor.buildFile / AsyncSeq.scan / outputContent:\n{outputContent |> Option.defaultValue System.String.Empty |> SpiralSm.ellipsis_end 300} / errors: {errors |> serializeObj} / outputContentResult: {outputContentResult} / typeErrorCount: {typeErrorCount} / retry: {retry} / error: {error} / path: {path}") _locals
                     match outputContent, error with
                     | Some outputContent, None -> Some outputContent, errors, typeErrorCount
                     | None, Some (_, FatalError "File main has a type error somewhere in its path.") ->
@@ -376,7 +376,7 @@ let inline buildFile backend timeout port cancellationToken path =
                     | _ -> outputContentResult, errors, typeErrorCount
             )
             |> FSharp.Control.AsyncSeq.takeWhileInclusive (fun (outputContent, errors, typeErrorCount) ->
-                trace Debug (fun () -> $"Supervisor.buildFile / takeWhileInclusive / outputContent: {outputContent |> Option.defaultValue System.String.Empty |> SpiralSm.ellipsis_end 400} / errors: {errors |> serializeObj} / typeErrorCount: {typeErrorCount} / retry: {retry} / path: {path}") _locals
+                trace Debug (fun () -> $"Supervisor.buildFile / takeWhileInclusive / outputContent:\n{outputContent |> Option.defaultValue System.String.Empty |> SpiralSm.ellipsis_end 300} / errors: {errors |> serializeObj} / typeErrorCount: {typeErrorCount} / retry: {retry} / path: {path}") _locals
     #if INTERACTIVE
                 let errorWait = 2
     #else

diff --git a/apps/spiral/Supervisor.fs b/apps/spiral/Supervisor.fs
@@ -262,7 +262,7 @@ module Supervisor =
                 ((None, [], 0), outputSeq)
                 ||> FSharp.Control.AsyncSeq.scan (
                     fun (outputContentResult, errors, typeErrorCount) (outputContent, error) ->
-                        trace Debug (fun () -> $"Supervisor.buildFile / AsyncSeq.scan / outputContent: {outputContent |> Option.defaultValue System.String.Empty |> SpiralSm.ellipsis_end 400} / errors: {errors |> serializeObj} / outputContentResult: {outputContentResult} / typeErrorCount: {typeErrorCount} / retry: {retry} / error: {error} / path: {path}") _locals
+                        trace Debug (fun () -> $"Supervisor.buildFile / AsyncSeq.scan / outputContent:\n{outputContent |> Option.defaultValue System.String.Empty |> SpiralSm.ellipsis_end 300} / errors: {errors |> serializeObj} / outputContentResult: {outputContentResult} / typeErrorCount: {typeErrorCount} / retry: {retry} / error: {error} / path: {path}") _locals
                         match outputContent, error with
                         | Some outputContent, None -> Some outputContent, errors, typeErrorCount
                         | None, Some (_, FatalError "File main has a type error somewhere in its path.") ->
@@ -273,7 +273,7 @@ module Supervisor =
                         | _ -> outputContentResult, errors, typeErrorCount
                 )
                 |> FSharp.Control.AsyncSeq.takeWhileInclusive (fun (outputContent, errors, typeErrorCount) ->
-                    trace Debug (fun () -> $"Supervisor.buildFile / takeWhileInclusive / outputContent: {outputContent |> Option.defaultValue System.String.Empty |> SpiralSm.ellipsis_end 400} / errors: {errors |> serializeObj} / typeErrorCount: {typeErrorCount} / retry: {retry} / path: {path}") _locals
+                    trace Debug (fun () -> $"Supervisor.buildFile / takeWhileInclusive / outputContent:\n{outputContent |> Option.defaultValue System.String.Empty |> SpiralSm.ellipsis_end 300} / errors: {errors |> serializeObj} / typeErrorCount: {typeErrorCount} / retry: {retry} / path: {path}") _locals
         #if INTERACTIVE
                     let errorWait = 2
         #else

diff --git a/scripts/dep_dotnet-interactive.ps1 b/scripts/dep_dotnet-interactive.ps1
@@ -47,5 +47,5 @@ if (!$fast) {
 Copy-Item "../deps/dotnet-interactive/artifacts/bin/dotnet-interactive/Release/net9.0/**" $netVersion -Recurse -Force
 
 if ($pack) {
-    { dotnet pack -c Release /p:Version=0.1.0 } | Invoke-Block -Location ../deps/dotnet-interactive/src/dotnet-interactive
+    { dotnet pack -c Release /p:Version=0.1.1 } | Invoke-Block -Location ../deps/dotnet-interactive/src/dotnet-interactive
 }