mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-21 21:16:39 +00:00
Switch tests to use the rendered form of diagnostics (#8070)
Historically, we disabled the rendered form in tests outside of `toolchain/diagnostics`. The idea was to keep tests shorter and avoid very long chains of autoupdate before stabilizing due to all the line numbers and other artifacts in the rendered form. This PR adds `--diagnostic-line-numbers=[all|first]` and defaults to `first` in tests. This keeps the rendered form so that we can easily code review that form and the visual cues it does or doesn't provide. But it removes all but the first location's line numbers to provide significantly more stability in tests. By default, tests get the full unicode line-drawing form of diagnostics so we can ensure all of the artifacts there make sense with the specific case being diagnosed, but we do retain some focused ASCII-rendering tests to ensure that fallback remains usable. There are some issues here that will be fixed in subsequent PRs. Notably, we try to keep the frame together in the check lines, and so force some parts to use the first location. This largely works, but fails in some edge cases, causing the entire frame to be located incorrectly. There is a TODO about this that we need to fix, and it only occurs 6 times across the test suite, so it didn't seem worth front-loading a fix for here. Assisted-by: Claude Code
This commit is contained in:
1 parent
0b7059a360
commit
d0badecd2a
888 files changed
+39731
-12799
No files matched your search
@@ -12,48 +12,107 @@
|
||||
// TIP: To dump output, run:
|
||||
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/function/declaration/fail_modifiers.carbon
|
||||
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+5]]:9-17: error: `protected` must appear before `default` [ModifierMustAppearBefore]
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+4]]:1-7: note: `default` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+15]]:9
|
||||
// CHECK:STDERR: -> │ default protected fn WrongOrder();
|
||||
// CHECK:STDERR: · ───┬─── ━━━━┳━━━━
|
||||
// CHECK:STDERR: · │ ┗━━┫ error: `protected` must appear before `default`
|
||||
// CHECK:STDERR: · │ ┃ [ModifierMustAppearBefore]
|
||||
// CHECK:STDERR: · ╰─────────────┤ `default` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-7: error: `default` not allowed; requires interface scope [ModifierRequiresInterface]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+7]]:1
|
||||
// CHECK:STDERR: -> │ default protected fn WrongOrder();
|
||||
// CHECK:STDERR: · ━━━┳━━━
|
||||
// CHECK:STDERR: · ┗━━┫ error: `default` not allowed; requires interface scope
|
||||
// CHECK:STDERR: · ┃ [ModifierRequiresInterface]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
default protected fn WrongOrder();
|
||||
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+5]]:9-15: error: `virtual` repeated on declaration [ModifierRepeated]
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+4]]:1-7: note: `virtual` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+14]]:9
|
||||
// CHECK:STDERR: -> │ virtual virtual fn DuplicateVirtual() {}
|
||||
// CHECK:STDERR: · ───┬─── ━━━┳━━━
|
||||
// CHECK:STDERR: · │ ┗━━┫ error: `virtual` repeated on declaration [ModifierRepeated]
|
||||
// CHECK:STDERR: · ╰────────────┤ `virtual` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-7: error: `virtual` not allowed; requires class scope [ModifierRequiresClass]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+7]]:1
|
||||
// CHECK:STDERR: -> │ virtual virtual fn DuplicateVirtual() {}
|
||||
// CHECK:STDERR: · ━━━┳━━━
|
||||
// CHECK:STDERR: · ┗━━┫ error: `virtual` not allowed; requires class scope
|
||||
// CHECK:STDERR: · ┃ [ModifierRequiresClass]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
virtual virtual fn DuplicateVirtual() {}
|
||||
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:9-17: error: `protected` not allowed on declaration with `private` [ModifierNotAllowedWith]
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-7: note: `private` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+8]]:9
|
||||
// CHECK:STDERR: -> │ private protected fn TwoAccess();
|
||||
// CHECK:STDERR: · ───┬─── ━━━━┳━━━━
|
||||
// CHECK:STDERR: · │ ┗━━┫ error: `protected` not allowed on declaration with `private`
|
||||
// CHECK:STDERR: · │ ┃ [ModifierNotAllowedWith]
|
||||
// CHECK:STDERR: · ╰─────────────┤ `private` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
private protected fn TwoAccess();
|
||||
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+5]]:10-16: error: `virtual` not allowed on declaration with `abstract` [ModifierNotAllowedWith]
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+4]]:1-8: note: `abstract` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+15]]:10
|
||||
// CHECK:STDERR: -> │ abstract virtual fn ModifiersConflict() {}
|
||||
// CHECK:STDERR: · ────┬─── ━━━┳━━━
|
||||
// CHECK:STDERR: · │ ┗━━┫ error: `virtual` not allowed on declaration with `abstract`
|
||||
// CHECK:STDERR: · │ ┃ [ModifierNotAllowedWith]
|
||||
// CHECK:STDERR: · ╰────────────┤ `abstract` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-8: error: `abstract` not allowed; requires class scope [ModifierRequiresClass]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+7]]:1
|
||||
// CHECK:STDERR: -> │ abstract virtual fn ModifiersConflict() {}
|
||||
// CHECK:STDERR: · ━━━━┳━━━
|
||||
// CHECK:STDERR: · ┗━━┫ error: `abstract` not allowed; requires class scope
|
||||
// CHECK:STDERR: · ┃ [ModifierRequiresClass]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
abstract virtual fn ModifiersConflict() {}
|
||||
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-4: error: `base` not allowed on `fn` declaration [ModifierNotAllowedOnDeclaration]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+7]]:1
|
||||
// CHECK:STDERR: -> │ base fn InvalidModifier();
|
||||
// CHECK:STDERR: · ━━┳━
|
||||
// CHECK:STDERR: · ┗━━┫ error: `base` not allowed on `fn` declaration
|
||||
// CHECK:STDERR: · ┃ [ModifierNotAllowedOnDeclaration]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
base fn InvalidModifier();
|
||||
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+8]]:9-13: error: `final` not allowed on declaration with `default` [ModifierNotAllowedWith]
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+7]]:1-7: note: `default` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+23]]:9
|
||||
// CHECK:STDERR: -> │ default final virtual fn ModifiersConflict2() {}
|
||||
// CHECK:STDERR: · ───┬─── ━━┳━━
|
||||
// CHECK:STDERR: · │ ┗━━┫ error: `final` not allowed on declaration with `default`
|
||||
// CHECK:STDERR: · │ ┃ [ModifierNotAllowedWith]
|
||||
// CHECK:STDERR: · ╰───────────┤ `default` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+5]]:15-21: error: `virtual` not allowed on declaration with `default` [ModifierNotAllowedWith]
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+4]]:1-7: note: `default` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+15]]:15
|
||||
// CHECK:STDERR: -> │ default final virtual fn ModifiersConflict2() {}
|
||||
// CHECK:STDERR: · ───┬─── ━━━┳━━━
|
||||
// CHECK:STDERR: · │ ┗━━┫ error: `virtual` not allowed on declaration with `default`
|
||||
// CHECK:STDERR: · │ ┃ [ModifierNotAllowedWith]
|
||||
// CHECK:STDERR: · ╰──────────────────┤ `default` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-7: error: `default` not allowed; requires interface scope [ModifierRequiresInterface]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+7]]:1
|
||||
// CHECK:STDERR: -> │ default final virtual fn ModifiersConflict2() {}
|
||||
// CHECK:STDERR: · ━━━┳━━━
|
||||
// CHECK:STDERR: · ┗━━┫ error: `default` not allowed; requires interface scope
|
||||
// CHECK:STDERR: · ┃ [ModifierRequiresInterface]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
default final virtual fn ModifiersConflict2() {}
|
||||
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:8-14: error: `private` must appear before `extern` [ModifierMustAppearBefore]
|
||||
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-6: note: `extern` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╭─┤ fail_modifiers.carbon:[[@LINE+8]]:8
|
||||
// CHECK:STDERR: -> │ extern private fn ExternOrderAndConflict() {}
|
||||
// CHECK:STDERR: · ───┬── ━━━┳━━━
|
||||
// CHECK:STDERR: · │ ┗━━┫ error: `private` must appear before `extern`
|
||||
// CHECK:STDERR: · │ ┃ [ModifierMustAppearBefore]
|
||||
// CHECK:STDERR: · ╰───────────┤ `extern` previously appeared here [ModifierPrevious]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
extern private fn ExternOrderAndConflict() {}
|
||||
|
||||
|
||||
Reference in new issue
Block a user