Move diagnostic kind name to the end of the diagnostic. (#4437)

Also surround it in square brackets rather than parentheses. This
matches the format used by Clang and GCC, and means diagnostics will
still match the `file:line:col: error: ` pattern used by some IDE tools.

Before:
```console
fail_builtins.carbon:11:11: error(AliasRequiresNameRef): alias initializer must be a name reference
```

After:
```console
fail_builtins.carbon:11:11: error: alias initializer must be a name reference [AliasRequiresNameRef]
```

Also tighten up test regex to only match on `STDERR` lines that list a
file name.
This commit is contained in:
Richard Smith
2024-10-23 16:56:23 +00:00
committed by GitHub
parent f206072216
commit 2e63da1a40
528 changed files with 1929 additions and 1928 deletions
+5 -5
View File
@@ -9,27 +9,27 @@
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/if/fail_errors.carbon
fn F() {
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:6: error(ExpectedParenAfter): expected `(` after `if`
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:6: error: expected `(` after `if` [ExpectedParenAfter]
// CHECK:STDERR: if a {}
// CHECK:STDERR: ^
// CHECK:STDERR:
if a {}
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:7: error(ExpectedExpr): expected expression
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:7: error: expected expression [ExpectedExpr]
// CHECK:STDERR: if () {}
// CHECK:STDERR: ^
// CHECK:STDERR:
if () {}
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:9: error(ExpectedCloseSymbol): unexpected tokens before `)`
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:9: error: unexpected tokens before `)` [ExpectedCloseSymbol]
// CHECK:STDERR: if (b c) {}
// CHECK:STDERR: ^
// CHECK:STDERR:
if (b c) {}
if (d)
// CHECK:STDERR: fail_errors.carbon:[[@LINE+7]]:1: error(ExpectedCodeBlock): expected braced code block
// CHECK:STDERR: fail_errors.carbon:[[@LINE+7]]:1: error: expected braced code block [ExpectedCodeBlock]
// CHECK:STDERR: }
// CHECK:STDERR: ^
// CHECK:STDERR:
// CHECK:STDERR: fail_errors.carbon:[[@LINE+3]]:1: error(ExpectedExpr): expected expression
// CHECK:STDERR: fail_errors.carbon:[[@LINE+3]]:1: error: expected expression [ExpectedExpr]
// CHECK:STDERR: }
// CHECK:STDERR: ^
}