Deduplicate and sort error codes

FSharp.sln

@@ -103,6 +103,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D58BFE8B-7C85-4D3B-B5F3-9A7BB90FF1EE}"
 	ProjectSection(SolutionItems) = preProject
 		src\Compiler\FSComp.txt = src\Compiler\FSComp.txt
+		src\Compiler\FSCompCheck.fsx = src\Compiler\FSCompCheck.fsx
 	EndProjectSection
 EndProject
 Global

azure-pipelines.yml

@@ -249,7 +249,7 @@ stages:
             continueOnError: true
             condition: not(succeeded())
 
-          # Check code formatting
+          # Check FSComp.txt error code sorting and code formatting
         - job: CheckCodeFormatting
           pool:
             vmImage: $(UbuntuMachineQueueName)
@@ -270,6 +270,10 @@ stages:
             env:
               DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
             displayName: Install tools
+          - script: dotnet fsi src/Compiler/FSCompCheck.fsx
+            env:
+              DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
+            displayName: Check error code sorting in src/Compiler/FSComp.txt
           - script: dotnet fantomas . -r --check
             env:
               DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1

src/Compiler/FSCompCheck.fsx

@@ -0,0 +1,32 @@
+let digits = set { '0' .. '9' }
+
+let rec intStringEndIndex i s =
+    if i >= String.length s then
+        String.length s - 1
+    elif Set.contains s[i] digits then
+        intStringEndIndex (i + 1) s
+    else
+        i - 1
+
+__SOURCE_DIRECTORY__ + "/FSComp.txt"
+|> System.IO.File.ReadAllLines
+|> Seq.fold
+    (fun counters line ->
+        let line = line.TrimStart [| ' '; '#' |]
+        let intStringEndIndex = intStringEndIndex 0 line
+
+        if intStringEndIndex >= 0 then // Line starts with an integer (error code)
+            let errorCode = line[..intStringEndIndex] |> int
+
+            match counters with
+            | [] -> [ errorCode ] // Initialise a counter
+            | head :: tail when errorCode >= head -> errorCode :: tail // Increment current counter
+            | _ -> errorCode :: counters // Start a new counter
+        else
+            counters)
+    []
+|> function
+    | [] -> failwith "FSComp.txt contained no error codes but expected at least one"
+    | [ _finalErrorCode ] -> () // Expected: One counter counted to the end
+    | _finalErrorCode :: counters ->
+        failwith $"Error codes not sorted in FSComp.txt, break(s) happened after {List.rev counters}"

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/StaticLet/StaticLetInUnionsAndRecords.fs

@@ -234,7 +234,7 @@ let ``Static let extension to builtin type`` compilation =
     compilation
     |> typecheck
     |> shouldFail
-    |> withDiagnostics [Error 3570, Line 4, Col 5, Line 4, Col 51, "Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead."]
+    |> withDiagnostics [Error 3573, Line 4, Col 5, Line 4, Col 51, "Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead."]
 
 [<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"QuotationsForStaticLetRecords.fs"|])>]
 let ``Static let - quotations support for records`` compilation =

tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs

@@ -816,7 +816,7 @@ x |> Seq.iter(fun r ->
             let report errorType code message =
                 match errorType with
                 | ErrorReportType.Error ->
-                    if code = 3217 then foundCorrectError <- true
+                    if code = 999 then foundCorrectError <- true
                     else foundWrongError <- true
                 | ErrorReportType.Warning -> printfn "PackageManagementWarning %d : %s" code message
             ResolvingErrorReport (report)
@@ -839,7 +839,7 @@ x |> Seq.iter(fun r ->
             let report errorType code message =
                 match errorType with
                 | ErrorReportType.Error ->
-                    if code = 3217 then foundCorrectError <- true
+                    if code = 999 then foundCorrectError <- true
                     else foundWrongError <- true
                 | ErrorReportType.Warning -> printfn "PackageManagementWarning %d : %s" code message
             ResolvingErrorReport (report)
@@ -886,7 +886,7 @@ x |> Seq.iter(fun r ->
             let report errorType code message =
                 match errorType with
                 | ErrorReportType.Error ->
-                    if code = 3217 then foundCorrectError <- true
+                    if code = 999 then foundCorrectError <- true
                     else foundWrongError <- true
                 | ErrorReportType.Warning -> printfn "PackageManagementWarning %d : %s" code message
             ResolvingErrorReport (report)

tests/fsharp/typecheck/sigs/neg46.bsl

@@ -1,13 +1,13 @@
 
 neg46.fs(6,8,6,26): typecheck error FS0912: This declaration element is not permitted in an augmentation
 
-neg46.fs(10,8,10,40): typecheck error FS3570: Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead.
+neg46.fs(10,8,10,40): typecheck error FS3573: Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead.
 
-neg46.fs(14,8,14,26): typecheck error FS3570: Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead.
+neg46.fs(14,8,14,26): typecheck error FS3573: Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead.
 
-neg46.fs(18,8,19,21): typecheck error FS3570: Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead.
+neg46.fs(18,8,19,21): typecheck error FS3573: Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead.
 
-neg46.fs(23,8,23,32): typecheck error FS3570: Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead.
+neg46.fs(23,8,23,32): typecheck error FS3573: Static bindings cannot be added to extrinsic augmentations. Consider using a 'static member' instead.
 
 neg46.fs(27,8,27,25): typecheck error FS0912: This declaration element is not permitted in an augmentation
 
@@ -37,4 +37,4 @@ neg46.fs(64,8,64,26): typecheck error FS0912: This declaration element is not pe
 
 neg46.fs(68,18,68,36): typecheck error FS0909: All implemented interfaces should be declared on the initial declaration of the type
 
-neg46.fs(73,18,73,36): typecheck error FS0909: All implemented interfaces should be declared on the initial declaration of the type
+neg46.fs(73,18,73,36): typecheck error FS0909: All implemented interfaces should be declared on the initial declaration of the type

tests/fsharpqa/Source/CompilerOptions/fsc/pdb/pdb04.fs

@@ -1,4 +1,4 @@
 // #Regression #NoMT #CompilerOptions #NoMono 
 // Regression test for FSharp1.0:3204 - Compiler throws exception when trying to use option "-g --pdb" on a locked file (or any non-accessible file)
-//<Expects id="FS1503" status="error">The pdb output file name cannot match the build output filename use --pdb:filename.pdb</Expects>
+//<Expects id="FS1001" status="error">The pdb output file name cannot match the build output filename use --pdb:filename.pdb</Expects>
 exit 1

tests/fsharpqa/Source/InteractiveSession/Misc/UnknownDependencyManager/script1.fsx

@@ -1,5 +1,5 @@
-//<Expects status="Error" span="(4,1)" id="FS3216">Package manager key 'unk' was not registered</Expects>
-//<Expects status="Error" span="(4,1)" id="FS3217">Processing of a script fragment has stopped because an exception has been raised</Expects>
+//<Expects status="Error" span="(4,1)" id="FS0998">Package manager key 'unk' was not registered</Expects>
+//<Expects status="Error" span="(4,1)" id="FS0999">Processing of a script fragment has stopped because an exception has been raised</Expects>
 
 #r "unk: blubblub"