Initial msbuild properties support

Author: TheAngryByrd

src/FsAutoComplete.Core/Consts.fs

@@ -5,6 +5,7 @@ module ProjectLoader =
   let ProduceReferenceAssembly = "ProduceReferenceAssembly"
 
   let globalProperties =
-    [
-      // For tooling we don't want to use Reference Assemblies as this doesn't play well with type checking across projects
-      ProduceReferenceAssembly, "false" ]
+    Map.ofList
+      [
+        // For tooling we don't want to use Reference Assemblies as this doesn't play well with type checking across projects
+        ProduceReferenceAssembly, "false" ]

src/FsAutoComplete/LspHelpers.fs

@@ -604,6 +604,9 @@ type NotificationsDto =
   { Trace: bool option
     TraceNamespaces: string array option }
 
+type BuildOptionsDto =
+  { MsBuildProperties: string array option }
+
 type DebugDto =
   { DontCheckRelatedFiles: bool option
     CheckFileDebouncerTimeout: int option
@@ -648,6 +651,7 @@ type FSharpConfigDto =
     PipelineHints: InlineValueDto option
     InlayHints: InlayHintDto option
     Notifications: NotificationsDto option
+    BuildOptions: BuildOptionsDto option
     Debug: DebugDto option }
 
 type FSharpConfigRequest = { FSharp: FSharpConfigDto }
@@ -695,6 +699,18 @@ type NotificationsConfig =
     { Trace = defaultArg dto.Trace this.Trace
       TraceNamespaces = defaultArg dto.TraceNamespaces this.TraceNamespaces }
 
+type BuildOptions =
+  { MsBuildProperties: string array }
+
+  static member Default = { MsBuildProperties = [||] }
+
+  static member FromDto(dto: BuildOptionsDto) : BuildOptions =
+    { MsBuildProperties = defaultArg dto.MsBuildProperties BuildOptions.Default.MsBuildProperties }
+
+
+  member this.AddDto(dto: BuildOptionsDto) : BuildOptions =
+    { MsBuildProperties = defaultArg dto.MsBuildProperties this.MsBuildProperties }
+
 type DebugConfig =
   { DontCheckRelatedFiles: bool
     CheckFileDebouncerTimeout: int
@@ -745,6 +761,7 @@ type FSharpConfig =
     InlayHints: InlayHintsConfig
     InlineValues: InlineValuesConfig
     Notifications: NotificationsConfig
+    BuildOptions: BuildOptions
     Debug: DebugConfig }
 
   static member Default: FSharpConfig =
@@ -785,6 +802,7 @@ type FSharpConfig =
       InlayHints = InlayHintsConfig.Default
       InlineValues = InlineValuesConfig.Default
       Notifications = NotificationsConfig.Default
+      BuildOptions = BuildOptions.Default
       Debug = DebugConfig.Default }
 
   static member FromDto(dto: FSharpConfigDto) : FSharpConfig =
@@ -853,6 +871,10 @@ type FSharpConfig =
         dto.Notifications
         |> Option.map NotificationsConfig.FromDto
         |> Option.defaultValue NotificationsConfig.Default
+      BuildOptions =
+        dto.BuildOptions
+        |> Option.map BuildOptions.FromDto
+        |> Option.defaultValue BuildOptions.Default
       Debug =
         match dto.Debug with
         | None -> DebugConfig.Default
@@ -939,6 +961,10 @@ type FSharpConfig =
         dto.Notifications
         |> Option.map x.Notifications.AddDto
         |> Option.defaultValue NotificationsConfig.Default
+      BuildOptions =
+        dto.BuildOptions
+        |> Option.map x.BuildOptions.AddDto
+        |> Option.defaultValue BuildOptions.Default
       Debug =
         match dto.Debug with
         | None -> DebugConfig.Default

src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs

@@ -176,7 +176,7 @@ type AdaptiveWorkspaceChosen =
   | Projs of aval<HashMap<string<LocalPath>, DateTime>>
   | NotChosen
 
-type AdaptiveFSharpLspServer(workspaceLoader: IWorkspaceLoader, lspClient: FSharpLspClient) =
+type AdaptiveFSharpLspServer(workspaceLoader: Map<string, string> -> IWorkspaceLoader, lspClient: FSharpLspClient) =
 
   let thisType = typeof<AdaptiveFSharpLspServer>
 
@@ -630,8 +630,23 @@ type AdaptiveFSharpLspServer(workspaceLoader: IWorkspaceLoader, lspClient: FShar
 
     file |> addAValLogging logMsg
 
-  let loader = cval<Ionide.ProjInfo.IWorkspaceLoader> workspaceLoader
+  let loaderFactory = cval<Map<string, string> -> Ionide.ProjInfo.IWorkspaceLoader> workspaceLoader
+  let loader =
+    aval {
+      let! loaderFactory = loaderFactory
+      and! config = config
+
+      let props =
+        config.BuildOptions.MsBuildProperties
+        |> Array.choose(fun s ->
+          match s.Split("=") |> Array.toList with
+          | head::shoulders::_ -> Some(head,shoulders)
+          | _ -> None
+        )
+        |> Map.ofArray
 
+      return loaderFactory props
+    }
 
 
   let binlogConfig =

src/FsAutoComplete/LspServers/FsAutoComplete.Lsp.fs

@@ -2944,7 +2944,7 @@ module FSharpLspServer =
       |> Map.add "fsproj/removeFile" (serverRequestHandling (fun s p -> s.FsProjRemoveFile(p)))
 
     let regularServer lspClient =
-      let state = State.Initial toolsPath stateStorageDir workspaceLoaderFactory
+      let state = State.Initial toolsPath stateStorageDir (fun toolsPath -> workspaceLoaderFactory toolsPath Map.empty)
       let originalFs = FSharp.Compiler.IO.FileSystemAutoOpens.FileSystem
       FSharp.Compiler.IO.FileSystemAutoOpens.FileSystem <- FsAutoComplete.FileSystem(originalFs, state.Files.TryFind)
       new FSharpLspServer(state, lspClient) :> IFSharpLspServer

src/FsAutoComplete/Parser.fs

@@ -130,11 +130,12 @@ module Parser =
     rootCommand.SetHandler(
       Func<_, _, _, Task>(fun projectGraphEnabled stateDirectory adaptiveLspEnabled ->
         let workspaceLoaderFactory =
-          fun toolsPath ->
+          fun toolsPath props ->
+            let props = Map.merge ProjectLoader.globalProperties props |> Map.toList
             if projectGraphEnabled then
-              Ionide.ProjInfo.WorkspaceLoaderViaProjectGraph.Create(toolsPath, ProjectLoader.globalProperties)
+              Ionide.ProjInfo.WorkspaceLoaderViaProjectGraph.Create(toolsPath, props)
             else
-              Ionide.ProjInfo.WorkspaceLoader.Create(toolsPath, ProjectLoader.globalProperties)
+              Ionide.ProjInfo.WorkspaceLoader.Create(toolsPath, props)
 
         let dotnetPath =
           if
@@ -191,7 +192,6 @@ module Parser =
       if ctx.ParseResult.GetValueForOption otelTracingOption then
         let serviceName = FsAutoComplete.Utils.Tracing.serviceName
         let version = FsAutoComplete.Utils.Version.info().Version
-
         tracerProvider <-
           Sdk
             .CreateTracerProviderBuilder()

test/FsAutoComplete.Tests.Lsp/Helpers.fs

@@ -270,6 +270,7 @@ let defaultConfigDto: FSharpConfigDto =
         { Enabled = Some true
           Prefix = Some "//" }
     Notifications = None
+    BuildOptions = None
     Debug = None }
 
 let clientCaps: ClientCapabilities =

test/FsAutoComplete.Tests.Lsp/Program.fs

@@ -32,7 +32,9 @@ Environment.SetEnvironmentVariable("FSAC_WORKSPACELOAD_DELAY", "250")
 
 let loaders =
   [
-    "Ionide WorkspaceLoader", (fun toolpath -> WorkspaceLoader.Create(toolpath, FsAutoComplete.Core.ProjectLoader.globalProperties))
+    "Ionide WorkspaceLoader", (fun toolpath props ->
+      let props = FsAutoComplete.Utils.Map.merge FsAutoComplete.Core.ProjectLoader.globalProperties props |> Map.toList
+      WorkspaceLoader.Create(toolpath, props))
     // "MSBuild Project Graph WorkspaceLoader", (fun toolpath -> WorkspaceLoaderViaProjectGraph.Create(toolpath, FsAutoComplete.Core.ProjectLoader.globalProperties))
   ]
 
@@ -191,9 +193,12 @@ let main args =
     args
     |> Array.windowed 2
     |> Array.tryPick (function
-      | [| "--loader"; "ionide" |] as args -> Some(args, [ "Ionide WorkspaceLoader", WorkspaceLoader.Create ])
+      | [| "--loader"; "ionide" |] as args ->
+        let (name, factory) = loaders |> Seq.find(fun (k,v) -> k = "Ionide WorkspaceLoader")
+        Some(args, [ name, factory ])
       | [| "--loader"; "graph" |] as args ->
-        Some(args, [ "MSBuild Project Graph WorkspaceLoader", WorkspaceLoaderViaProjectGraph.Create ])
+        let (name, factory) = loaders |> Seq.find(fun (k,v) -> k = "MSBuild Project Graph WorkspaceLoader")
+        Some(args, [ name, factory ])
       | _ -> None)
     |> Option.defaultValue ([||], loaders)