update from main

.config/dotnet-tools.json

@@ -19,6 +19,12 @@
       "commands": [
         "fantomas"
       ]
+    },
+    "fsharp-analyzers": {
+      "version": "0.23.0",
+      "commands": [
+        "fsharp-analyzers"
+      ]
     }
   }
 }

.github/workflows/build.yml

@@ -84,16 +84,10 @@ jobs:
       run: dotnet --info
 
     - name: Restore tools
-      run: |
-        # can't do a tool restore here due to an 8.0.100 rc2 bug - this is fixed in GA so can go back to
-        # dotnet tool restore then.
-        dotnet tool install paket --version 8.0.0-alpha002 && dotnet tool install fantomas --version 6.2.3 && dotnet paket restore
-
-    - name: cat file
-      run: cat src/FsAutoComplete.Core/AbstractClassStubGenerator.fs
+      run: dotnet tool restore
 
     - name: Check format
-      run: dotnet build -t:CheckFormat
+      run: dotnet fantomas --check src
       env:
         DOTNET_ROLL_FORWARD: LatestMajor
         DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
@@ -110,3 +104,23 @@ jobs:
       env:
         BuildNet7: ${{ matrix.build_net7 }}
         BuildNet8: ${{ matrix.build_net8 }}
+
+  analyze:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+
+    - name: Restore tools
+      run: dotnet tool restore
+
+    - name: Run analyzers
+      run: dotnet build -t:AnalyzeSolution -p:TargetFramework=net6.0
+
+    - name: Upload SARIF file
+      uses: github/codeql-action/upload-sarif@v2
+      with:
+        sarif_file: analysisreports

.gitignore

@@ -45,3 +45,5 @@ test/FsAutoComplete.Tests.Lsp/TestResults/
 
 .tool-versions
 BenchmarkDotNet.Artifacts/
+
+*.sarif

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog
 
+
+## [0.69.0] - 2024-01-14
+
+### Added
+
+- [Codefix: Update value in signature file](https://github.com/fsharp/FsAutoComplete/pull/1161) and [1220](https://github.com/fsharp/FsAutoComplete/pull/1220) (thanks @nojaf)
+
+### Changed
+
+- [Analyzers: Update analyzers support to 0.23.0](https://github.com/fsharp/FsAutoComplete/pull/1217) (thanks @dawedawe)
+
+### Fixed
+
+- [fix and improves l10n](https://github.com/fsharp/FsAutoComplete/pull/1181) (thanks @Tangent-90)
+- [Fix AP signatures for APs with names which are substrings of other APs](https://github.com/fsharp/FsAutoComplete/pull/1211) (thanks @dawedawe)
+- [fixing caching of cancelled cached tasks](https://github.com/fsharp/FsAutoComplete/pull/1221) (thanks @TheAngryByrd)
+
+### Internal
+
+
+## [0.68.0] - 2023-11-17
+
+### Added
+
+* [Dotnet 8 support](https://github.com/fsharp/FsAutoComplete/pull/1175) (Thanks @baronfel & @TheAngryByrd)
+* [F# 8 Support](https://github.com/fsharp/FsAutoComplete/pull/1180) (Thanks @baronfel & @nojaf & @dawedawe)
+
+### Changed
+
+* [Updates Ionide.LanguageServerProtocol to 0.4.20](https://github.com/fsharp/FsAutoComplete/pull/1190) (Thanks @TheAngryByrd)
+* [Update IcedTasks 0.9.2](https://github.com/fsharp/FsAutoComplete/pull/1197) (Thanks @TheAngryByrd)
+* [Paket Simplify](https://github.com/fsharp/FsAutoComplete/pull/1204) (Thanks @1eyewonder)
+
+### Fixed
+
+- [Do ordinal string comparisons](https://github.com/fsharp/FsAutoComplete/pull/1193) (Thanks @dawedawe)
+- [fix typo in FullNameExternalAutocomplete default value](https://github.com/fsharp/FsAutoComplete/pull/1196) (Thanks @MrLuje)
+* [Fix tooltip errorhandling]()(https://github.com/fsharp/FsAutoComplete/pull/1195) (Thanks @pblasucci & @TheAngryByrd)
+
 ## [0.67.0] - 2023-10-28
 
 ### Changed

Directory.Build.props

@@ -6,6 +6,8 @@
     <PackageLicenseExpression Condition=" '$(PackAsTool)' != 'true' ">Apache-2.0</PackageLicenseExpression>
     <NoWarn>$(NoWarn);3186,0042</NoWarn><!-- circumvent an error with the fake dependencymanager for paket: https://github.com/dotnet/fsharp/issues/8678 -->
     <NoWarn>$(NoWarn);NU1902</NoWarn><!-- NU1902 - package vulnerability detected -->
+    <WarnOn>$(WarnOn);1182</WarnOn> <!-- Unused variables,https://learn.microsoft.com/en-us/dotnet/fsharp/language-reference/compiler-options#opt-in-warnings -->
+    <WarnOn>$(WarnOn);3390</WarnOn><!-- Malformed XML doc comments -->
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ChangelogFile>$(MSBuildThisFileDirectory)CHANGELOG.md</ChangelogFile>
   </PropertyGroup>

Directory.Build.targets

@@ -8,5 +8,10 @@
     </PropertyGroup>
 </Target>
 
+<PropertyGroup>
+    <SarifOutput Condition="$(SarifOutput) == ''">./</SarifOutput>
+    <CodeRoot Condition="$(CodeRoot) == ''">.</CodeRoot>
+    <FSharpAnalyzersOtherFlags>--analyzers-path &quot;$(PkgIonide_Analyzers)/analyzers/dotnet/fs&quot; --code-root $(CodeRoot) --report &quot;$(SarifOutput)/$(MSBuildProjectName)-$(TargetFramework).sarif&quot; --verbosity d</FSharpAnalyzersOtherFlags>
+</PropertyGroup>
 
 </Project>

Directory.Solution.targets

@@ -1,13 +1,25 @@
 <Project>
-  <ItemGroup>
-    <FormatInputs Include="src/**/*.fs;src/**/*.fsi" Exclude="src/**/obj/**/*.fs" />
-  </ItemGroup>
-
   <Target Name="Format">
-    <Exec Command="dotnet fantomas @(FormatInputs, ' ') " />
+    <Exec Command="dotnet fantomas src" />
   </Target>
 
   <Target Name="CheckFormat">
-    <Exec Command="dotnet fantomas --check @(FormatInputs, ' ') " />
+    <Exec Command="dotnet fantomas --check src" />
   </Target>
+
+  <ItemGroup>
+    <ProjectsToAnalyze Include="src/**/*.fsproj" />
+  </ItemGroup>
+
+  <Target Name="AnalyzeSolution">
+    <PropertyGroup>
+      <CodeRoot>$(SolutionDir)</CodeRoot>
+      <SarifOutput>$(SolutionDir)/analysisreports</SarifOutput>
+    </PropertyGroup>
+    <MSBuild
+      Projects="@(ProjectsToAnalyze)"
+      Targets="AnalyzeFSharpProject"
+      Properties="CodeRoot=$(CodeRoot);SarifOutput=$(SarifOutput)" />
+  </Target>
+
 </Project>

benchmarks/Program.fs

@@ -1,4 +1,5 @@
 namespace Benchmarks
+
 open System
 open BenchmarkDotNet
 open BenchmarkDotNet.Attributes
@@ -11,6 +12,6 @@ open System.Security.Cryptography
 module EntryPoint =
 
   [<EntryPoint>]
-  let main argv =
-    let summary = BenchmarkRunner.Run<SourceText_LineChanges_Benchmarks>();
+  let main _argv =
+    let _summary = BenchmarkRunner.Run<SourceText_LineChanges_Benchmarks>()
     0

benchmarks/paket.references

@@ -1,4 +1,3 @@
-FSharp.Core
 BenchmarkDotNet
 Microsoft.CodeAnalysis
-FSharp.Data.Adaptive
+FSharp.Data.Adaptive

build/Program.fs

@@ -43,8 +43,6 @@ let init args =
   Context.setExecutionContext (Context.RuntimeContext.Fake execContext)
   Target.initEnvironment ()
 
-  let fsacAssemblies = "FsAutoComplete|FsAutoComplete.Core|LanguageServerProtocol"
-
   let packAsToolProp = "PackAsTool", "true"
 
   Target.create "LspTest" (fun _ ->

build/paket.references

@@ -1,18 +1,11 @@
 group Build
-  Fake.Core.Target
-  Fake.Core.Process
-  Fake.DotNet.Cli
-  Fake.Core.ReleaseNotes
-  Fake.DotNet.AssemblyInfoFile
-  Fake.DotNet.Paket
-  Fake.Tools.Git
-  Fake.Core.Environment
-  Fake.Core.UserInput
-  Fake.IO.FileSystem
-  Fake.IO.Zip
-  Fake.DotNet.MsBuild
-  Fake.Api.GitHub
-  Microsoft.Build
-  MSBuild.StructuredLogger
-  Octokit
-  Fantomas.Core
+Fake.Core.Target
+Fake.Core.ReleaseNotes
+Fake.DotNet.AssemblyInfoFile
+Fake.DotNet.Paket
+Fake.Tools.Git
+Fake.Core.UserInput
+Fake.IO.Zip
+Fake.Api.GitHub
+Microsoft.Build
+Fantomas.Core

paket.dependencies

@@ -13,7 +13,9 @@ lowest_matching: true
 
 nuget BenchmarkDotNet 0.13.5
 nuget Fantomas.Client >= 0.9
-nuget FSharp.Compiler.Service >= 43.8.200-preview.23562.1
+nuget FSharp.Compiler.Service >= 43.8.200-preview.24061.1
+nuget Ionide.Analyzers 0.7.0
+nuget FSharp.Analyzers.Build 0.3.0
 nuget Ionide.ProjInfo >= 0.62.0
 nuget Ionide.ProjInfo.FCS >= 0.62.0
 nuget Ionide.ProjInfo.ProjectSystem >= 0.62.0
@@ -24,12 +26,10 @@ nuget Microsoft.Build.Utilities.Core >= 17.4 copy_local:false
 nuget Microsoft.Build.Tasks.Core >= 17.4 copy_local: false
 nuget Nuget.Frameworks >= 6.3 copy_local: false
 nuget Microsoft.CodeAnalysis 4.5.0
-nuget FSharp.Analyzers.SDK
+nuget FSharp.Analyzers.SDK 0.23.0
 nuget ICSharpCode.Decompiler
 nuget Mono.Cecil >= 0.11.4
-nuget Newtonsoft.Json
 nuget FSharpLint.Core
-nuget System.Configuration.ConfigurationManager
 nuget Serilog >= 2.10.0
 nuget Serilog.Sinks.File >= 5.0.0
 nuget Serilog.Sinks.Console >= 4.0.0
@@ -38,7 +38,7 @@ nuget Destructurama.FSharp
 nuget FSharp.UMX >= 1.1
 nuget FSharp.Formatting >= 14.0
 nuget FsToolkit.ErrorHandling.TaskResult >= 4.4 framework: netstandard2.1 ,net6.0, net7.0, net8.0
-nuget IcedTasks >= 0.5
+nuget IcedTasks >= 0.9.2
 nuget FSharpx.Async >= 1.14
 nuget CliWrap >= 3.0
 nuget System.CommandLine prerelease
@@ -48,18 +48,19 @@ nuget Dotnet.ReproducibleBuilds copy_local:true
 
 nuget Microsoft.NETFramework.ReferenceAssemblies
 nuget Ionide.KeepAChangelog.Tasks copy_local: true
-nuget Expecto
 nuget Expecto.Diff
 nuget YoloDev.Expecto.TestSdk
 nuget AltCover
 nuget GitHubActionsTestLogger
-nuget Ionide.LanguageServerProtocol >= 0.4.19
+nuget Ionide.LanguageServerProtocol >= 0.4.20
 nuget Microsoft.Extensions.Caching.Memory
 nuget OpenTelemetry.Api >= 1.3.2
 nuget OpenTelemetry.Exporter.OpenTelemetryProtocol >= 1.3.2 # 1.4 bumps to 7.0 versions of System.Diagnostics libs, so can't use it
 nuget LinkDotNet.StringBuilder 1.18.0
 nuget CommunityToolkit.HighPerformance
 nuget System.Security.Cryptography.Pkcs 6.0.4
+nuget System.Net.Http 4.3.4 # pinned for security reasons
+nuget System.Text.RegularExpressions 4.3.1 # pinned for security reasons
 
 
 group Build
@@ -69,24 +70,17 @@ group Build
   framework: net6.0, net7.0
 
   nuget Fake.Core.Target
-  nuget Fake.Core.Process
-  nuget Fake.DotNet.Cli
   nuget Fake.Core.ReleaseNotes
   nuget Fake.DotNet.AssemblyInfoFile
   nuget Fake.DotNet.Paket
   nuget Fake.Tools.Git
-  nuget Fake.Core.Environment
   nuget Fake.Core.UserInput
-  nuget Fake.IO.FileSystem
   nuget Fake.IO.Zip
-  nuget Fake.DotNet.MsBuild
   nuget Fake.Api.GitHub
   nuget Microsoft.Build
-  nuget MSBuild.StructuredLogger
   nuget Octokit 0.48 // there's an API break in 0.50, so we need to pin this to prevent errors
   nuget Fantomas.Core 6.2.0
 
   nuget NuGet.Versioning 6.7.0
   nuget NuGet.Common 6.7.0
   nuget NuGet.Protocol 6.7.0
-