Merge pull request #900 from nojaf/v20-beta

nojaf · web-flow · commit a97ca8798ba5 · 2024-01-31T08:29:53.000Z
v20 beta
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "fsharp-analyzers": {
-      "version": "0.21.0",
+      "version": "0.24.0",
       "commands": [
         "fsharp-analyzers"
       ]
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -26,8 +26,8 @@
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" />
-    <PackageVersion Include="FSharp.Analyzers.Build" Version="0.2.0" />
-    <PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.5.1" />
-    <PackageVersion Include="Ionide.Analyzers" Version="0.5.1" />
+    <PackageVersion Include="FSharp.Analyzers.Build" Version="0.3.0" />
+    <PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.8.0" />
+    <PackageVersion Include="Ionide.Analyzers" Version="0.8.0" />
   </ItemGroup>
 </Project>
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 20.0.0-beta-001 - 2024-01-31
+
+### Changed
+* Marking development of v20 as complete.
+
 ## 20.0.0-alpha-019 - 2024-01-29
 
 ### Fixed
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <FSharpAnalyzersOtherFlags>--analyzers-path &quot;$(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
         <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --analyzers-path &quot;$(PkgIonide_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
-        <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --exclude-analyzer PartialAppAnalyzer -c Release</FSharpAnalyzersOtherFlags>
+        <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --exclude-analyzers PartialAppAnalyzer -c Release</FSharpAnalyzersOtherFlags>
         <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --code-root ../.. --report &quot;../../reports/$(MSBuildProjectName)-$(TargetFramework).sarif&quot;</FSharpAnalyzersOtherFlags>
     </PropertyGroup>
 </Project>
diff --git a/src/FSharp.Formatting.ApiDocs/GenerateModel.fs b/src/FSharp.Formatting.ApiDocs/GenerateModel.fs
@@ -1869,7 +1869,7 @@ module internal SymbolReader =
             if allLinesHaveSameColumn then
                 trimmed
             else
-                $"<pre>{trimmed}</pre>"
+                $"<pre>%s{trimmed}</pre>"
 
     let rec readXmlElementAsHtml
         anyTagsOK
diff --git a/src/FSharp.Formatting.Literate/Evaluator.fs b/src/FSharp.Formatting.Literate/Evaluator.fs
@@ -567,7 +567,7 @@ module __FsiSettings =
                       StdErr = e.Result.Error.Merged }
 
                 let msg =
-                    $"Evaluation failed and --strict is on\n    file={file}\n    asExpression={asExpression}, text={text}\n    stdout={e.Result.Output.Merged}\n\    stderr={e.Result.Error.Merged}\n    inner exception={e.InnerException}"
+                    $"Evaluation failed and --strict is on\n    file=%A{file}\n    asExpression=%b{asExpression}, text=%s{text}\n    stdout=%s{e.Result.Output.Merged}\n\    stderr=%s{e.Result.Error.Merged}\n    inner exception=%A{e.InnerException}"
 
                 onError msg
 
diff --git a/src/FSharp.Formatting.Literate/ParsePynb.fs b/src/FSharp.Formatting.Literate/ParsePynb.fs
@@ -18,26 +18,26 @@ module internal ParsePynb =
             match this with
             | Markdown source -> source
             | Code code ->
-                let codeBlock = sprintf $"```{code.lang}\n{addLineEnd code.source}```"
+                let codeBlock = sprintf $"```%s{code.lang}\n%s{addLineEnd code.source}```"
 
                 match code.outputs with
                 | None -> codeBlock
                 | Some outputs ->
                     let outputsString = outputs |> String.concat "\n"
-                    sprintf $"{codeBlock}\n{outputsString}"
+                    sprintf $"%s{codeBlock}\n%s{outputsString}"
 
         member this.ToFsx() =
             match this with
-            | Markdown source -> $"(**\n{source}\n*)"
+            | Markdown source -> $"(**\n%s{source}\n*)"
             | Code code when code.lang = "fsharp" ->
                 let codeBlock = addLineEnd code.source
 
                 match code.outputs with
                 | None -> codeBlock
                 | Some outputs ->
                     let outputsString = outputs |> String.concat "\n"
-                    sprintf $"{codeBlock}\n(**\n{outputsString}\n*)"
-            | Code _ -> $"(**\n{this.ToMarkdown()}\n*)"
+                    sprintf $"%s{codeBlock}\n(**\n%s{outputsString}\n*)"
+            | Code _ -> $"(**\n%s{this.ToMarkdown()}\n*)"
 
     module Output =
         let (|TextHtml|_|) (x: JsonElement) =
@@ -48,14 +48,14 @@ module internal ParsePynb =
                     |> Seq.map (fun x -> x.GetString().Replace("\r\n", "\n") |> addLineEnd)
                     |> String.concat ""
 
-                Some $"<p>{html}</p>"
+                Some $"<p>%s{html}</p>"
             | _ -> None
 
         let (|TextPlain|_|) (x: JsonElement) =
             match x.TryGetProperty("text/plain") with
             | true, text ->
                 let text = text.EnumerateArray() |> Seq.map (fun x -> x.GetString()) |> String.concat ""
-                Some $"""<table class="pre"><tbody><tr><td><pre><code>{text}</code></pre></td></tr></tbody></table>"""
+                Some $"""<table class="pre"><tbody><tr><td><pre><code>%s{text}</code></pre></td></tr></tbody></table>"""
             | _ -> None
 
         let (|DisplayData|_|) (x: JsonElement) =
@@ -65,7 +65,7 @@ module internal ParsePynb =
                     match x.TryGetProperty("data") with
                     | true, TextHtml html -> html
                     | true, TextPlain text -> text
-                    | true, s -> failwith $"unknown output {s}"
+                    | true, s -> failwith $"unknown output %A{s}"
                     | false, _ -> failwith "no data property"
                     |> Some
                 else
@@ -82,7 +82,7 @@ module internal ParsePynb =
                         | _ -> failwith "no text property"
 
                     Some
-                        $"""<table class="pre"><tbody><tr><td><pre><code>{text}</code></pre></td></tr></tbody></table>"""
+                        $"""<table class="pre"><tbody><tr><td><pre><code>%s{text}</code></pre></td></tr></tbody></table>"""
                 else
                     None
             | _ -> failwith "no output_type property"
@@ -91,7 +91,7 @@ module internal ParsePynb =
             match output with
             | Stream stream -> stream
             | DisplayData displayData -> displayData
-            | s -> failwith $"""unknown output {s.GetProperty("output_type").GetString()}"""
+            | s -> failwith $"""unknown output %s{s.GetProperty("output_type").GetString()}"""
 
     let getSource (cell: JsonElement) =
         let source =
@@ -152,7 +152,7 @@ module internal ParsePynb =
             | _, Some _ -> failwith $"Markdown should not have outputs"
             | source, None -> Markdown source
         | "code" -> getCode cell
-        | _ -> failwith $"unknown cell type {cell_type}"
+        | _ -> failwith $"unknown cell type %s{cell_type}"
 
     let pynbStringToMarkdown (ipynb: string) =
         let json = JsonDocument.Parse(ipynb)
diff --git a/src/FSharp.Formatting.Markdown/MarkdownUtils.fs b/src/FSharp.Formatting.Markdown/MarkdownUtils.fs
@@ -167,7 +167,7 @@ module internal MarkdownUtils =
 
                       for (j, line) in List.indexed lines do
                           if i = 0 && j = 0 then
-                              yield $"{n} " + line
+                              yield $"%i{n} " + line
                           else
                               yield "  " + line
 
@@ -329,7 +329,7 @@ module internal MarkdownUtils =
                     else
                         let tempRoot = "fsdocs-secret-temp-root"
                         // We can't be sure code is a single html element, we could get multiple elements.
-                        let element = XElement.Parse($"<{tempRoot}>{code}</{tempRoot}>")
+                        let element = XElement.Parse($"<%s{tempRoot}>%s{code}</%s{tempRoot}>")
                         // ends-with is XPath 2.0 only, https://stackoverflow.com/questions/1525299/xpath-and-xslt-2-0-for-net
                         let attributes =
                             match System.Xml.XPath.Extensions.XPathEvaluate(element, "//*/@*[contains(., '.md')]") with
diff --git a/src/fsdocs-tool/BuildCommand.fs b/src/fsdocs-tool/BuildCommand.fs
@@ -128,7 +128,7 @@ type internal DocContent
                     Some uri
                 with _ ->
                     printfn
-                        $"Couldn't map markdown reference {markdownReference} that seemed to correspond to an input file"
+                        $"Couldn't map markdown reference %s{markdownReference} that seemed to correspond to an input file"
 
                     None
 
@@ -352,7 +352,7 @@ type internal DocContent
 
                           let evaluateNotebook ipynbFile =
                               let args =
-                                  $"repl --run {ipynbFile} --default-kernel fsharp --exit-after-run --output-path {ipynbFile}"
+                                  $"repl --run %s{ipynbFile} --default-kernel fsharp --exit-after-run --output-path %s{ipynbFile}"
 
                               let psi =
                                   ProcessStartInfo(
@@ -367,8 +367,8 @@ type internal DocContent
                                   p.WaitForExit()
                               with _ ->
                                   let msg =
-                                      $"Failed to evaluate notebook {ipynbFile} using dotnet-repl\n"
-                                      + $"""try running "{args}" at the command line and inspect the error"""
+                                      $"Failed to evaluate notebook %s{ipynbFile} using dotnet-repl\n"
+                                      + $"""try running "%s{args}" at the command line and inspect the error"""
 
                                   failwith msg
 
@@ -392,7 +392,7 @@ type internal DocContent
                                   psi.Arguments <- "tool list --global"
                                   p.Start() |> ignore
                                   let og = p.StandardOutput.ReadToEnd()
-                                  let output = $"{ol}\n{og}"
+                                  let output = $"%s{ol}\n%s{og}"
 
                                   if not (output.Contains("dotnet-repl")) then
                                       failwith failmsg
@@ -403,7 +403,7 @@ type internal DocContent
 
                           if evaluate then
                               checkDotnetReplInstall ()
-                              printfn $"  evaluating {inputFileFullPath} with dotnet-repl"
+                              printfn $"  evaluating %s{inputFileFullPath} with dotnet-repl"
                               evaluateNotebook inputFileFullPath
 
 
diff --git a/src/fsdocs-tool/ProjectCracker.fs b/src/fsdocs-tool/ProjectCracker.fs
@@ -459,7 +459,7 @@ module Crack =
             projectFiles
             |> List.filter (fun s ->
                 let isFSharpFormattingTestProject =
-                    s.Contains $"FSharp.ApiDocs.Tests{Path.DirectorySeparatorChar}files"
+                    s.Contains $"FSharp.ApiDocs.Tests%c{Path.DirectorySeparatorChar}files"
                     || s.EndsWith("FSharp.Formatting.TestHelpers.fsproj", StringComparison.Ordinal)
 
                 if isFSharpFormattingTestProject then

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`]`
`10`	`10`	`},`
`11`	`11`	`"fsharp-analyzers": {`
`12`		`- "version": "0.21.0",`
	`12`	`+ "version": "0.24.0",`
`13`	`13`	`"commands": [`
`14`	`14`	`"fsharp-analyzers"`
`15`	`15`	`]`