Merge main

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [0.57.4] - 2022-09-30
+
+### Fixed
+
+* [Update LSP library so Code Actions calls don't crash anymore](https://github.com/fsharp/FsAutoComplete/pull/1018)
+
+## [0.57.3] - 2022-09-27
+
+### Fixed
+
+* [Don't let codeFixes bring down the application](https://github.com/fsharp/FsAutoComplete/pull/1016)
+
+### Changed
+
+* [Renamed fantomas-tool settings to fantomas](https://github.com/fsharp/FsAutoComplete/pull/1012) (Thanks @nojaf!)
+
+## [0.57.2] - 2022-09-24
+
+### Fixed
+
+* [Fix request cancellation causing crashes for emacs clients](https://github.com/fsharp/FsAutoComplete/pull/1013)
+
 ## [0.57.1] - 2022-09-22
 
 ### Changed

README.md

@@ -37,11 +37,12 @@ Requirements:
 
 * .NET Core Sdk, see [global.json](global.json) for the exact version.
 
-1. Restore dotnet tools to install local Paket and FAKE `dotnet tool restore`
-2. Build FSAC with `dotnet fake build`
+1. Restore dotnet tools to install local Paket `dotnet tool restore`
+2. Build FSAC with `dotnet run --project build`
+3. Optionally specify a target with the `-t` parameter: `dotnet run --project build -t ....`
 
-* To build release fsautocomplete binaries in `~/bin` directory, do run `dotnet fake build --target LocalRelease`
-* To build, run all tests and create packages, do run `dotnet fake build --target All`
+* To build release fsautocomplete binaries in `~/bin` directory, use the `LocalRelease` target
+* To build, run all tests and create packages, use the `All` target
 
 ### DevContainer
 
@@ -57,7 +58,7 @@ This repository is prepared to use Gitpod for a web-based VSCode-style IDE. Clic
 
 * Update CHANGELOG.md with the release notes from the current release in the `Unreleased` section. Use section headings like `Added`, `Fixed`, etc from keepachangelog.com.
 * For individual section items in the Changelog, use headings like `BUGFIX`, `FEATURE`, and `ENHANCEMENT` followed by a link to the PR with the PR title.
-* Run the `Promote` FAKE target via `dotnet fake build -t Promote` to create the appropriate release version from the current `Unreleased` section and stamp the date, as well as create a commit and tag for this promotion
+* Run the `Promote` FAKE target via the `Promote` target to create the appropriate release version from the current `Unreleased` section and stamp the date, as well as create a commit and tag for this promotion
 * push this commit and tag to main
 * the CI pipeline will publish a release from the tag.
 

build/Program.fs

@@ -133,7 +133,7 @@ let init args =
     if result.ExitCode = 0 then
       Trace.log "No files need formatting"
     elif result.ExitCode = 99 then
-      failwith "Some files need formatting, run `dotnet fake build -t Format` to format them"
+      failwith "Some files need formatting, run the `Format` target to format them"
     else
       Trace.logf "Errors while formatting: %A" result.Errors
       failwith "Unknown errors while formatting")
@@ -230,7 +230,7 @@ let main args =
   try
     match args with
     | [| target |] -> Target.runOrDefaultWithArguments target
-    | _ -> Target.runOrDefaultWithArguments "Default"
+    | _ -> Target.runOrDefaultWithArguments "Test"
 
     0
   with e ->

paket.lock

@@ -100,7 +100,7 @@ NUGET
       System.Collections.Immutable (>= 5.0)
       System.Reflection.Metadata (>= 5.0)
     Ionide.KeepAChangelog.Tasks (0.1.8) - copy_local: true
-    Ionide.LanguageServerProtocol (0.4.8)
+    Ionide.LanguageServerProtocol (0.4.10)
       FSharp.Core (>= 6.0)
       Newtonsoft.Json (>= 13.0.1)
       StreamJsonRpc (>= 2.10.44)

src/FsAutoComplete/CodeFixes.fs

@@ -310,7 +310,12 @@ module Run =
     runDiagnostics (fun d -> d.Message.Contains checkMessage) handler
 
   let ifDiagnosticByType (diagnosticType: string) handler : CodeFix =
-    runDiagnostics (fun d -> d.Source.Contains diagnosticType) handler
+    runDiagnostics
+      (fun d ->
+        match d.Source with
+        | None -> false
+        | Some s -> s.Contains diagnosticType)
+      handler
 
   let ifDiagnosticByCode codes handler : CodeFix =
     runDiagnostics (fun d -> d.Code.IsSome && Set.contains d.Code.Value codes) handler