merge and format

.config/dotnet-tools.json

@@ -2,8 +2,8 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "fantomas-tool": {
-      "version": "4.7.5",
+    "fantomas": {
+      "version": "5.0.0-alpha-006",
       "commands": [
         "fantomas"
       ]

.editorconfig

@@ -2,6 +2,13 @@ root = true
 
 [*.fs]
 fsharp_newline_between_type_definition_and_members=true
+fsharp_max_infix_operator_expression=80
+fsharp_max_array_or_list_width=80
+fsharp_max_array_or_list_number_of_items=5
+fsharp_max_dot_get_expression_width=80
+fsharp_multiline_block_brackets_on_same_column=true
+fsharp_keep_max_number_of_blank_lines=1
 
 [*.fsi]
 fsharp_newline_between_type_definition_and_members=true
+fsharp_keep_max_number_of_blank_lines=1

.fantomasignore

@@ -1,33 +1,56 @@
-**/*.fs
-**/*.fsx
-
-# absil  (to investigate)
-**/ilread.fsi
-
-# fsharp  (to investigate)
-**/range.fsi
-
-# utils  (to investigate)
-**/prim-parsing.fsi
-**/TaggedCollections.fsi
-
-# https://github.com/fsprojects/fantomas/issues/1974
-**/ParseHalpers.fsi
-
-# service  (to investigate)
-**/ServiceDeclarationLists.fsi
-
-# FSharp.Core (to investigate)
-**/fslib-extra-pervasives.fsi
-**/Nullable.fsi
-**/prim-types-prelude.fsi
-**/prim-types.fsi
-**/list.fsi
-**/Query.fsi
-**/resumable.fsi
-**/async.fsi
-
-## https://github.com/fsprojects/fantomas/issues/2230
-**/array.fsi
-**/tasks.fsi
-**/seq.fsi
+# Explicitly unformatted directories
+
+buildtools/
+docs/
+eng/
+fcs-samples/
+scripts/
+service/
+setup/
+tests/
+vsintegration/
+
+# Explicitly unformatted implementation files
+
+src/FSharp.Core/**/*.fs
+src/Compiler/**/*.fs
+src/Compiler/AbstractIL/**/*.fs
+src/Compiler/Checking/**/*.fs
+src/Compiler/CodeGen/**/*.fs
+src/Compiler/DependencyManager/**/*.fs
+src/Compiler/Driver/**/*.fs
+src/Compiler/Facilities/**/*.fs
+src/Compiler/Interactive/**/*.fs
+src/Compiler/Legacy/**/*.fs
+src/Compiler/Optimize/**/*.fs
+src/Compiler/Service/**/*.fs
+src/Compiler/Symbols/**/*.fs
+src/Compiler/SyntaxTree/**/*.fs
+src/Compiler/TypedTree/**/*.fs
+src/Compiler/Utilities/**/*.fs
+src/Microsoft.FSharp.Compiler/**/*.fs
+
+# Fantomas limitations on signature files  (to investigate)
+
+src/Compiler/AbstractIL/ilread.fsi
+src/Compiler/Utilities/range.fsi
+src/Compiler/Facilities/prim-parsing.fsi
+src/Compiler/Utilities/TaggedCollections.fsi
+src/Compiler/Service/ServiceDeclarationLists.fsi
+
+# Fantomas limitations on signature files in FSharp.Core (to investigate)
+
+src/FSharp.Core/fslib-extra-pervasives.fsi
+src/FSharp.Core/Nullable.fsi
+src/FSharp.Core/prim-types-prelude.fsi
+src/FSharp.Core/prim-types.fsi
+src/FSharp.Core/list.fsi
+src/FSharp.Core/Query.fsi
+src/FSharp.Core/resumable.fsi
+src/FSharp.Core/async.fsi
+
+# Fantomas limitations on signature files in FSharp.Core (https://github.com/fsprojects/fantomas/issues/2230)
+
+src/FSharp.Core/array.fsi
+src/FSharp.Core/tasks.fsi
+src/FSharp.Core/seq.fsi

.vscode/launch.json

@@ -11,51 +11,51 @@
     ],
     "configurations": [
         {
-            "name": "Launch FSI (Debug, .NET 5.0)",
+            "name": "Launch FSI (Debug, .NET 6.0)",
             "type": "coreclr",
             "request": "launch",
             // TODO: Shall we assume that it's already been built, or build it every time we debug?
             // "preLaunchTask": "Build (Debug)",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net5.0/fsi.dll",
+            "program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net6.0/fsi.dll",
             "cwd": "${workspaceFolder}/src",
-            "console": "integratedTerminal",
+            "console": "integratedTerminal", // This is the default to be able to run in Codespaces.
             "stopAtEntry": false,
             "justMyCode": false,
-            "enableStepFiltering": false,
+            "enableStepFiltering": true,
             "symbolOptions": {
                 "searchMicrosoftSymbolServer": true,
                 "searchNuGetOrgSymbolServer": true
             },
             "sourceLinkOptions": {
                 "*": {
-                    "enabled": false
+                    "enabled": true
                 }
             },
         },
         {
-            "name": "Launch FSC (Debug, .NET 5.0)",
+            "name": "Launch FSC (Debug, .NET 6.0)",
             "type": "coreclr",
             "request": "launch",
             // TODO: Shall we assume that it's already been built, or build it every time we debug?
             // "preLaunchTask": "Build (Debug)",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net5.0/fsc.dll",
+            "program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net6.0/fsc.dll",
             "args": [
                 "${input:argsPrompt}"
             ],
             "cwd": "${workspaceFolder}",
-            "console": "integratedTerminal",
+            "console": "integratedTerminal", // This is the default to be able to run in Codespaces.
             "stopAtEntry": false,
             "justMyCode": false,
-            "enableStepFiltering": false,
+            "enableStepFiltering": true,
             "symbolOptions": {
                 "searchMicrosoftSymbolServer": true,
                 "searchNuGetOrgSymbolServer": true
             },
             "sourceLinkOptions": {
                 "*": {
-                    "enabled": false
+                    "enabled": true
                 }
             },
         },

.vscode/settings.json

@@ -10,10 +10,16 @@
         "*.vsixmanifest": "xml",
         "*.vstemplate": "xml",
     },
+    "explorer.fileNesting.enabled": true,
+    "explorer.fileNesting.expand": false,
+    "explorer.fileNesting.patterns": {
+        "*.fs": "${capture}.fsi"
+    },
     "FSharp.suggestGitignore": false,
     "FSharp.enableMSBuildProjectGraph": true,
-    "FSharp.workspacePath": "FSharp.sln",
-    "FSharp.workspaceModePeekDeepLevel": 1,
+    "FSharp.workspacePath": "service/FSharp.Compiler.Service.sln",
+    "FSharp.workspaceModePeekDeepLevel": 2,
+    "FSharp.enableBackgroundServices": false,
     "FSharp.excludeProjectDirectories": [
         ".git",
         "eng",
@@ -28,9 +34,13 @@
     "csharp.suppressDotnetInstallWarning": true,
     "csharp.suppressDotnetRestoreNotification": true,
     "csharp.suppressHiddenDiagnostics": true,
-    "omnisharp.autoStart": true,
+    "omnisharp.autoStart": false,
+    "omnisharp.defaultLaunchSolution": "service/FSharp.Compiler.Service.sln",
     "omnisharp.enableMsBuildLoadProjectsOnDemand": true,
     "omnisharp.disableMSBuildDiagnosticWarning": true,
+    "omnisharp.enableRoslynAnalyzers": false,
+    "omnisharp.analyzeOpenDocumentsOnly": true,
+    "omnisharp.useModernNet": true,
     "razor.disabled": true,
     "powershell.promptToUpdatePowerShell": false,
     "powershell.integratedConsole.showOnStartup": false,

release-notes.md

@@ -27,6 +27,13 @@ These release notes track our current efforts to document changes to the F# proj
   is always implicit for this construct.
 * In FCS API, FSharpParsingOptions, `CompilingFsLib` --> `CompilingFSharpCore`
 * In FCS API, FSharpParsingOptions, `ErrorSeverityOptions` --> `DiagnosticOptions`
+* [SynIdent](https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-syntax-synident.html#SynIdent) was introduced in the Untyped Syntax Tree. 
+  This represent an `Ident` with potential additional information, stored as [IdentTrivia](https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-syntaxtrivia-identtrivia.html)).
+* `LongIdentWithDots` was renamed to [SynLongIdent](https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-syntax-synlongident.html) and also could contain `IdentTrivia`.
+  Due to this change, infix operators are stored as `SynExpr.LongIdent` instead of `SynExpr.Ident`.
+  `a + b` is parsed as `SynLongIdent([op_Addition], [], [Some (OriginalNotation "+")])`.
+* `SynMeasure` was extended with [SynMeasure.Paren](https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-syntax-synmeasure.html#Paren) case.
+* Dynamic expressions (like `x?y`) are now represented as [SynExpr.Dynamic](https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-syntax-synexpr.html#Dynamic) in the Untyped Syntax Tree.
 
 ### F# 6.0 / Visual Studio 17.0