fix debug launch (#1871)

Author: baronfel

RELEASE_NOTES.md

@@ -1,3 +1,8 @@
+### 7.5.4 - 07.05.2023
+
+* Fix debug settings to not override coreclr from omnisharp.
+* Update Ionide TextMate grammar to pick up some fixes (Thanks @jkillingsworth!)
+
 ### 7.5.3 - 21.04.2023
 
 * Update to FSAC 0.59.6 to get all the delightful new features and fixes. You can check the release notes for [0.59.6](https://github.com/fsharp/FsAutoComplete/releases/tag/v0.59.5).

release/package.json

@@ -6,7 +6,9 @@
   },
   "activationEvents": [
     "onCommand:workbench.action.tasks.runTask",
+    "onDebugInitialConfigurations:coreclr",
     "onDebugDynamicConfigurations:coreclr",
+    "onDebugResolve:coreclr",
     "workspaceContains:**/*.fs",
     "workspaceContains:**/*.fsproj",
     "workspaceContains:**/*.fsx",
@@ -826,12 +828,6 @@
       "title": "F#",
       "type": "object"
     },
-    "debuggers": [
-      {
-        "label": "Ionide LaunchSettings",
-        "type": "coreclr"
-      }
-    ],
     "grammars": [
       {
         "language": "fsharp",

src/Components/Debugger.fs

@@ -337,14 +337,14 @@ module Debugger =
             override x.provideDebugConfigurations(folder: option<WorkspaceFolder>, token: option<CancellationToken>) =
                 let generate () =
                     promise {
-                        logger.Info $"Evaluating launch settings configurations for workspace '%A{folder}'"
+                        logger.Info("Evaluating launch settings configurations for %O", folder)
                         let projects = Project.getLoaded ()
                         let! msbuildTasks = tasks.fetchTasks (msbuildTasksFilter)
 
                         let tasks =
                             projects
-                            |> Seq.collect (fun (p: Project) ->
-                                seq {
+                            |> List.collect (fun (p: Project) ->
+                                [
                                     let projectFile = node.path.basename p.Project
 
                                     let buildTaskForProject =
@@ -360,24 +360,22 @@ module Debugger =
                                     match defaultConfigForProject (p, buildTaskForProject) with
                                     | Some p -> yield p
                                     | None -> ()
-                                })
+                                ])
 
                         return ResizeArray tasks
                     }
 
-                generate ()
-                |> Promise.map Some
-                |> Promise.toThenable
-                |> U2.Case2
-                |> ProviderResult.Some
+                generate () // this bix/unbox is a hack because JS types
+                |> box
+                |> unbox
 
             override x.resolveDebugConfiguration
                 (
                     folder: option<WorkspaceFolder>,
                     debugConfiguration: DebugConfiguration,
                     token: option<CancellationToken>
                 ) =
-                logger.Info $"Evaluating launch settings configurations for workspace2 '{folder}'"
+                logger.Info("Resolving launch settings configuration %O for %O", debugConfiguration, folder)
                 ProviderResult.Some(U2.Case1 debugConfiguration)
 
             override x.resolveDebugConfigurationWithSubstitutedVariables
@@ -386,7 +384,7 @@ module Debugger =
                     debugConfiguration: DebugConfiguration,
                     token: option<CancellationToken>
                 ) =
-                logger.Info $"Evaluating launch settings configurations for workspace3 '{folder}'"
+                logger.Info("Resolving subsituted launch settings configuration %O for %O", debugConfiguration, folder)
                 ProviderResult.Some(U2.Case1 debugConfiguration) }
 
     let activate (c: ExtensionContext) =