Add CodeActions for Number Constants: Convert between bases, Add digit group separators

.config/dotnet-tools.json

@@ -1,36 +1,36 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "fake-cli": {
-      "version": "5.23.0",
-      "commands": [
-        "fake"
-      ]
-    },
-    "paket": {
-      "version": "7.2.1",
-      "commands": [
-        "paket"
-      ]
-    },
-    "octonav": {
-      "version": "0.0.1",
-      "commands": [
-        "octonav"
-      ]
-    },
-    "dotnet-reportgenerator-globaltool": {
-      "version": "5.0.2",
-      "commands": [
-        "reportgenerator"
-      ]
-    },
-    "fantomas": {
-      "version": "6.1.0",
-      "commands": [
-        "fantomas"
-      ]
-    }
-  }
-}
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "fake-cli": {
+      "version": "5.23.0",
+      "commands": [
+        "fake"
+      ]
+    },
+    "paket": {
+      "version": "7.2.1",
+      "commands": [
+        "paket"
+      ]
+    },
+    "octonav": {
+      "version": "0.0.1",
+      "commands": [
+        "octonav"
+      ]
+    },
+    "dotnet-reportgenerator-globaltool": {
+      "version": "5.0.2",
+      "commands": [
+        "reportgenerator"
+      ]
+    },
+    "fantomas": {
+      "version": "6.2.0",
+      "commands": [
+        "fantomas"
+      ]
+    }
+  }
+}

.editorconfig

@@ -17,7 +17,7 @@ insert_final_newline = ignore
 [*.md]
 trim_trailing_whitespace = false
 
-[*.fs, *.fsx]
+[*.{fs,fsx}]
 indent_size = 2
 fsharp_max_array_or_list_width=80
 fsharp_max_dot_get_expression_width=80

.github/workflows/build.yml

@@ -16,9 +16,9 @@ on:
 jobs:
   build:
     env:
-      TEST_TIMEOUT_MINUTES: 30
+      TEST_TIMEOUT_MINUTES: 40
       FSAC_TEST_DEFAULT_TIMEOUT : 120000 #ms, individual test timeouts
-    timeout-minutes: 30 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc
+    timeout-minutes: 40 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]

src/FsAutoComplete.Core/AdaptiveExtensions.fs

@@ -42,8 +42,7 @@ module AdaptiveExtensions =
 
 
 module Utils =
-  let cheapEqual (a: 'T) (b: 'T) =
-    ShallowEqualityComparer<'T>.Instance.Equals(a, b)
+  let cheapEqual (a: 'T) (b: 'T) = ShallowEqualityComparer<'T>.Instance.Equals(a, b)
 
 /// <summary>
 /// Maps and calls dispose before mapping of new values. Useful for cleaning up callbacks like AddMarkingCallback for tracing purposes.
@@ -75,8 +74,7 @@ module AVal =
   /// <summary>
   /// Maps and calls dispose before mapping of new values. Useful for cleaning up callbacks like AddMarkingCallback for tracing purposes.
   /// </summary>
-  let mapDisposableTuple mapper value =
-    MapDisposableTupleVal(mapper, value) :> aval<_>
+  let mapDisposableTuple mapper value = MapDisposableTupleVal(mapper, value) :> aval<_>
 
   /// <summary>
   /// Calls a mapping function which creates additional dependencies to be tracked.
@@ -124,14 +122,12 @@ module AVal =
 
     /// <summary>Creates an observable on the aval that will be executed whenever the avals value changed.</summary>
     /// <param name="aval">The aval to get out-of-date information from.</param>
-    let onValueChangedWeak (aval: #aval<_>) =
-      Observable.Create(fun (obs: IObserver<_>) -> aval.AddCallback(obs.OnNext))
+    let onValueChangedWeak (aval: #aval<_>) = Observable.Create(fun (obs: IObserver<_>) -> aval.AddCallback(obs.OnNext))
 
 module ASet =
   /// Creates an amap with the keys from the set and the values given by mapping and
   /// adaptively applies the given mapping function to all elements and returns a new amap containing the results.
-  let mapAtoAMap mapper src =
-    src |> ASet.mapToAMap mapper |> AMap.mapA (fun _ v -> v)
+  let mapAtoAMap mapper src = src |> ASet.mapToAMap mapper |> AMap.mapA (fun _ v -> v)
 
 module AMap =
   open FSharp.Data.Traceable
@@ -476,8 +472,7 @@ module AsyncAVal =
   /// <summary>
   /// Creates a constant async adaptive value always holding the given value.
   /// </summary>
-  let constant (value: 'a) =
-    ConstantVal(Task.FromResult value) :> asyncaval<_>
+  let constant (value: 'a) = ConstantVal(Task.FromResult value) :> asyncaval<_>
 
   /// <summary>
   /// Creates a constant async adaptive value always holding the task.

src/FsAutoComplete.Core/CodeGeneration.fs

@@ -99,11 +99,9 @@ module CodeGenerationUtils =
       for _ in 0 .. count - 1 do
         x.WriteLine ""
 
-    member __.Indent i =
-      indentWriter.Indent <- indentWriter.Indent + i
+    member __.Indent i = indentWriter.Indent <- indentWriter.Indent + i
 
-    member __.Unindent i =
-      indentWriter.Indent <- max 0 (indentWriter.Indent - i)
+    member __.Unindent i = indentWriter.Indent <- max 0 (indentWriter.Indent - i)
 
     member __.Dump() = indentWriter.InnerWriter.ToString()
 
@@ -210,8 +208,7 @@ module CodeGenerationUtils =
       let revd = List.rev xs
       Some(List.rev revd.Tail, revd.Head)
 
-  let bracket (str: string) =
-    if str.Contains(" ") then "(" + str + ")" else str
+  let bracket (str: string) = if str.Contains(" ") then "(" + str + ")" else str
 
   let formatType ctx (typ: FSharpType) =
     let genericDefinition =
@@ -364,8 +361,7 @@ module CodeGenerationUtils =
     else
       displayName
 
-  let isEventMember (m: FSharpMemberOrFunctionOrValue) =
-    m.IsEvent || hasAttribute<CLIEventAttribute> m.Attributes
+  let isEventMember (m: FSharpMemberOrFunctionOrValue) = m.IsEvent || hasAttribute<CLIEventAttribute> m.Attributes
 
   /// Rename a given argument if the identifier has been used
 
@@ -446,8 +442,7 @@ module CodeGenerationUtils =
 
         writer.Unindent ctx.Indentation
 
-    let memberPrefix (m: FSharpMemberOrFunctionOrValue) =
-      if m.IsDispatchSlot then "override " else "member "
+    let memberPrefix (m: FSharpMemberOrFunctionOrValue) = if m.IsDispatchSlot then "override " else "member "
 
     match m with
     | MemberInfo.PropertyGetSet(getter, setter) ->
@@ -588,8 +583,7 @@ module CodeGenerationUtils =
   /// Use this hack when FCS doesn't return enough information on .NET properties and events.
   /// we use this to filter out the 'meta' members in favor of providing the underlying members for template generation
   /// eg: a property _also_ has the relevant get/set members, so we don't need them.
-  let isSyntheticMember (m: FSharpMemberOrFunctionOrValue) =
-    m.IsProperty || m.IsEventAddMethod || m.IsEventRemoveMethod
+  let isSyntheticMember (m: FSharpMemberOrFunctionOrValue) = m.IsProperty || m.IsEventAddMethod || m.IsEventRemoveMethod
 
   let isAbstractNonVirtualMember (m: FSharpMemberOrFunctionOrValue) =
     // is an abstract member
@@ -733,8 +727,7 @@ module CodeGenerationUtils =
     | _ -> lastValidToken
 
   /// The code below is responsible for handling the code generation and determining the insert position
-  let getLineIdent (lineStr: string) =
-    lineStr.Length - lineStr.TrimStart(' ').Length
+  let getLineIdent (lineStr: string) = lineStr.Length - lineStr.TrimStart(' ').Length
 
   let formatMembersAt
     startColumn

src/FsAutoComplete.Core/Commands.fs

@@ -66,8 +66,7 @@ module private Result =
 
 module AsyncResult =
 
-  let inline mapErrorRes ar : Async<CoreResponse<'a>> =
-    AsyncResult.foldResult id CoreResponse.ErrorRes ar
+  let inline mapErrorRes ar : Async<CoreResponse<'a>> = AsyncResult.foldResult id CoreResponse.ErrorRes ar
 
   let recoverCancellationGeneric (ar: Async<Result<'t, exn>>) recoverInternal =
     AsyncResult.foldResult id recoverInternal ar
@@ -584,8 +583,7 @@ module Commands =
         | false, None -> currentIndex, false, acc
 
       // Signature looks like <T> is Async<unit>
-      let inline removeSignPrefix (s: String) =
-        s.Split(" is ") |> Array.tryLast |> Option.defaultValue ""
+      let inline removeSignPrefix (s: String) = s.Split(" is ") |> Array.tryLast |> Option.defaultValue ""
 
       let hints =
         Array.init ((contents: ISourceText).GetLineCount()) (fun line -> (contents: ISourceText).GetLineString line)
@@ -697,8 +695,7 @@ module Commands =
         //TODO: unite with `CodeFix/ResolveNamespace`
         //TODO: Handle Nearest AND TopLevel. Currently it's just Nearest (vs. ResolveNamespace -> TopLevel) (#789)
 
-        let detectIndentation (line: string) =
-          line |> Seq.takeWhile ((=) ' ') |> Seq.length
+        let detectIndentation (line: string) = line |> Seq.takeWhile ((=) ' ') |> Seq.length
 
         // adjust line
         let pos =
@@ -1683,8 +1680,7 @@ type Commands
   member x.TryGetFileCheckerOptionsWithLinesAndLineStr(file: string<LocalPath>, pos) =
     state.TryGetFileCheckerOptionsWithLinesAndLineStr(file, pos)
 
-  member x.TryGetFileCheckerOptionsWithLines(file: string<LocalPath>) =
-    state.TryGetFileCheckerOptionsWithLines file
+  member x.TryGetFileCheckerOptionsWithLines(file: string<LocalPath>) = state.TryGetFileCheckerOptionsWithLines file
 
   member x.TryGetFileVersion = state.TryGetFileVersion
 
@@ -1967,8 +1963,7 @@ type Commands
     includeExternal
     =
     async {
-      let getAllSymbols () =
-        if includeExternal then tyRes.GetAllEntities true else []
+      let getAllSymbols () = if includeExternal then tyRes.GetAllEntities true else []
 
       let! res = tyRes.TryGetCompletions pos lineStr filter getAllSymbols
 
@@ -2180,11 +2175,9 @@ type Commands
 
         let summarySection = "/// <summary></summary>"
 
-        let parameterSection (name, _type) =
-          $"/// <param name=\"%s{name}\"></param>"
+        let parameterSection (name, _type) = $"/// <param name=\"%s{name}\"></param>"
 
-        let genericArg name =
-          $"/// <typeparam name=\"'%s{name}\"></typeparam>"
+        let genericArg name = $"/// <typeparam name=\"'%s{name}\"></typeparam>"
 
         let returnsSection = "/// <returns></returns>"
 
@@ -2261,15 +2254,13 @@ type Commands
                 return usages |> Seq.map (fun u -> u.Range)
           }
 
-      let tryGetFileSource symbolFile =
-        state.TryGetFileSource symbolFile |> Async.singleton
+      let tryGetFileSource symbolFile = state.TryGetFileSource symbolFile |> Async.singleton
 
       let tryGetProjectOptionsForFsproj (fsprojPath: string<LocalPath>) =
         state.ProjectController.GetProjectOptionsForFsproj(UMX.untag fsprojPath)
         |> Async.singleton
 
-      let getAllProjectOptions () =
-        state.ProjectController.ProjectOptions |> Seq.map snd |> Async.singleton
+      let getAllProjectOptions () = state.ProjectController.ProjectOptions |> Seq.map snd |> Async.singleton
 
       return!
         Commands.symbolUseWorkspace
@@ -2301,14 +2292,11 @@ type Commands
     }
 
   member x.SymbolImplementationProject (tyRes: ParseAndCheckResults) (pos: Position) lineStr =
-    let getProjectOptions filePath =
-      state.GetProjectOptions' filePath |> Async.singleton
+    let getProjectOptions filePath = state.GetProjectOptions' filePath |> Async.singleton
 
-    let getUsesOfSymbol (filePath, opts, sym: FSharpSymbol) =
-      checker.GetUsesOfSymbol(filePath, opts, sym)
+    let getUsesOfSymbol (filePath, opts, sym: FSharpSymbol) = checker.GetUsesOfSymbol(filePath, opts, sym)
 
-    let getAllProjects () =
-      state.FSharpProjectOptions |> Seq.toList |> Async.singleton
+    let getAllProjects () = state.FSharpProjectOptions |> Seq.toList |> Async.singleton
 
     Commands.symbolImplementationProject getProjectOptions getUsesOfSymbol getAllProjects tyRes pos lineStr
     |> x.AsCancellable tyRes.FileName
@@ -2469,8 +2457,7 @@ type Commands
       match tyResOpt with
       | None -> ()
       | Some tyRes ->
-        let getSourceLine lineNo =
-          (source :> ISourceText).GetLineString(lineNo - 1)
+        let getSourceLine lineNo = (source :> ISourceText).GetLineString(lineNo - 1)
 
         let! simplified = SimplifyNames.getSimplifiableNames (tyRes.GetCheckResults, getSourceLine)
         let simplified = Array.ofSeq simplified
@@ -2513,8 +2500,7 @@ type Commands
     let version = Version.info ()
     version.GitSha
 
-  member __.Quit() =
-    async { return [ CoreResponse.InfoRes "quitting..." ] }
+  member __.Quit() = async { return [ CoreResponse.InfoRes "quitting..." ] }
 
   member x.ScopesForFile(file: string<LocalPath>) =
     let getParseResultsForFile file =
@@ -2567,8 +2553,7 @@ type Commands
   member __.SetWorkspaceRoot(root: string option) = workspaceRoot <- root
   // linterConfiguration <- Lint.loadConfiguration workspaceRoot linterConfigFileRelativePath
 
-  member __.SetLinterConfigRelativePath(relativePath: string option) =
-    linterConfigFileRelativePath <- relativePath
+  member __.SetLinterConfigRelativePath(relativePath: string option) = linterConfigFileRelativePath <- relativePath
   // linterConfiguration <- Lint.loadConfiguration workspaceRoot linterConfigFileRelativePath
 
   // member __.FSharpLiterate (file: string<LocalPath>) =

src/FsAutoComplete.Core/CompilerServiceInterface.fs

@@ -103,8 +103,7 @@ type FSharpCompilerServiceChecker(hasAnalyzers, typecheckCacheSize, parallelRefe
         "mscorlib" ]
       |> List.map (fun p -> p + ".dll")
 
-    let containsBadRef (s: string) =
-      badRefs |> List.exists (fun r -> s.EndsWith r)
+    let containsBadRef (s: string) = badRefs |> List.exists (fun r -> s.EndsWith r)
 
     fun (projOptions: FSharpProjectOptions) ->
       { projOptions with
@@ -122,8 +121,7 @@ type FSharpCompilerServiceChecker(hasAnalyzers, typecheckCacheSize, parallelRefe
     { projectOptions with
         SourceFiles = files }
 
-  let (|Reference|_|) (opt: string) =
-    if opt.StartsWith "-r:" then Some(opt.[3..]) else None
+  let (|Reference|_|) (opt: string) = if opt.StartsWith "-r:" then Some(opt.[3..]) else None
 
   /// ensures that all file paths are absolute before being sent to the compiler, because compilation of scripts fails with relative paths
   let resolveRelativeFilePaths (projectOptions: FSharpProjectOptions) =

src/FsAutoComplete.Core/DocumentationFormatter.fs

@@ -167,11 +167,9 @@ module DocumentationFormatter =
         }
         |> String.concat ""
 
-      let typeConstraint (tc: FSharpType) =
-        sprintf ":> %s" (tc |> format displayContext |> fst)
+      let typeConstraint (tc: FSharpType) = sprintf ":> %s" (tc |> format displayContext |> fst)
 
-      let enumConstraint (ec: FSharpType) =
-        sprintf "enum<%s>" (ec |> format displayContext |> fst)
+      let enumConstraint (ec: FSharpType) = sprintf "enum<%s>" (ec |> format displayContext |> fst)
 
       let delegateConstraint (tc: FSharpGenericParameterDelegateConstraint) =
         sprintf
@@ -485,8 +483,7 @@ module DocumentationFormatter =
         with _ ->
           "Unknown"
 
-    let formatName (parameter: FSharpParameter) =
-      parameter.Name |> Option.defaultValue parameter.DisplayName
+    let formatName (parameter: FSharpParameter) = parameter.Name |> Option.defaultValue parameter.DisplayName
 
     let isDelegate =
       match func.EnclosingEntitySafe with

src/FsAutoComplete.Core/DotnetNewTemplate.fs

@@ -118,8 +118,7 @@ module DotnetNewTemplate =
 
             ] } ]
 
-  let isMatch (filterstr: string) (x: string) =
-    x.ToLower().Contains(filterstr.ToLower())
+  let isMatch (filterstr: string) (x: string) = x.ToLower().Contains(filterstr.ToLower())
 
   let nameMatch (filterstr: string) (x: string) = x.ToLower() = filterstr.ToLower()