mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-15 15:28:11 +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:
Chandler Carruth authored and 
GitHub committed
1 parent
0b7059a360
commit
d0badecd2a
888 files changed
+39731
-12799
No files matched your search
+45
-8
@@ -20,24 +20,56 @@ var d: auto = fn (ref x: i32) ->? ref i32 { return x; };
|
||||
// Tests that the compiler does not crash when a LambdaIntroducer (`fn`)
|
||||
// is left unconsumed inside an invalid binary operator sequence.
|
||||
|
||||
// CHECK:STDERR: fail_unconsumed_lambda_introducer.carbon:[[@LINE+12]]:10: error: whitespace missing around binary operator [BinaryOperatorRequiresWhitespace]
|
||||
// CHECK:STDERR: ╭─┤ fail_unconsumed_lambda_introducer.carbon:[[@LINE+40]]:10
|
||||
// CHECK:STDERR: -> │ require j%-fn->>
|
||||
// CHECK:STDERR: · ┳
|
||||
// CHECK:STDERR: · ┗━━┫ error: whitespace missing around binary operator
|
||||
// CHECK:STDERR: · ┃ [BinaryOperatorRequiresWhitespace]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_unconsumed_lambda_introducer.carbon:[[@LINE+10]]:16: error: expected expression [ExpectedExpr]
|
||||
// CHECK:STDERR: ╭─┤ fail_unconsumed_lambda_introducer.carbon:[[@LINE+33]]:16
|
||||
// CHECK:STDERR: -> │ require j%-fn->>
|
||||
// CHECK:STDERR: · ┳
|
||||
// CHECK:STDERR: · ┗━━┫ error: expected expression [ExpectedExpr]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_unconsumed_lambda_introducer.carbon:[[@LINE+8]]:16: error: whitespace missing before binary operator [BinaryOperatorRequiresWhitespace]
|
||||
// CHECK:STDERR: ╭─┤ fail_unconsumed_lambda_introducer.carbon:[[@LINE+27]]:16
|
||||
// CHECK:STDERR: -> │ require j%-fn->>
|
||||
// CHECK:STDERR: · ┳
|
||||
// CHECK:STDERR: · ┗━━┫ error: whitespace missing before binary operator
|
||||
// CHECK:STDERR: · ┃ [BinaryOperatorRequiresWhitespace]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_unconsumed_lambda_introducer.carbon:[[@LINE+6]]:17: error: expected expression [ExpectedExpr]
|
||||
// CHECK:STDERR: ╭─┤ fail_unconsumed_lambda_introducer.carbon:[[@LINE+20]]:17
|
||||
// CHECK:STDERR: -> │ require j%-fn->>
|
||||
// CHECK:STDERR: · ┳
|
||||
// CHECK:STDERR: · ┗━━┫ error: expected expression [ExpectedExpr]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_unconsumed_lambda_introducer.carbon:[[@LINE+4]]:17: error: expected `{` after return type [ExpectedLambdaBodyAfterReturnType]
|
||||
// CHECK:STDERR: ╭─┤ fail_unconsumed_lambda_introducer.carbon:[[@LINE+14]]:17
|
||||
// CHECK:STDERR: -> │ require j%-fn->>
|
||||
// CHECK:STDERR: · ┳
|
||||
// CHECK:STDERR: · ┗━━┫ error: expected `{` after return type
|
||||
// CHECK:STDERR: · ┃ [ExpectedLambdaBodyAfterReturnType]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_unconsumed_lambda_introducer.carbon:[[@LINE+2]]:17: error: expected `impls` in `require` declaration [RequireExpectedImpls]
|
||||
// CHECK:STDERR: ╭─┤ fail_unconsumed_lambda_introducer.carbon:[[@LINE+7]]:17
|
||||
// CHECK:STDERR: -> │ require j%-fn->>
|
||||
// CHECK:STDERR: · ┳
|
||||
// CHECK:STDERR: · ┗━━┫ error: expected `impls` in `require` declaration
|
||||
// CHECK:STDERR: · ┃ [RequireExpectedImpls]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
require j%-fn->>
|
||||
|
||||
// --- fail_expected_body.carbon
|
||||
|
||||
fn F() {
|
||||
// CHECK:STDERR: fail_expected_body.carbon:[[@LINE+2]]:19: error: expected `->`, `=>`, or `{` [ExpectedLambdaBody]
|
||||
// CHECK:STDERR: ╭─┤ fail_expected_body.carbon:[[@LINE+6]]:19
|
||||
// CHECK:STDERR: -> │ var x: auto = fn ;
|
||||
// CHECK:STDERR: · ┳
|
||||
// CHECK:STDERR: · ┗━━┫ error: expected `->`, `=>`, or `{` [ExpectedLambdaBody]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
var x: auto = fn ;
|
||||
}
|
||||
@@ -45,7 +77,12 @@ fn F() {
|
||||
// --- fail_expected_body_after_return_type.carbon
|
||||
|
||||
fn G() {
|
||||
// CHECK:STDERR: fail_expected_body_after_return_type.carbon:[[@LINE+2]]:26: error: expected `{` after return type [ExpectedLambdaBodyAfterReturnType]
|
||||
// CHECK:STDERR: ╭─┤ fail_expected_body_after_return_type.carbon:[[@LINE+7]]:26
|
||||
// CHECK:STDERR: -> │ var x: auto = fn -> i32 ;
|
||||
// CHECK:STDERR: · ┳
|
||||
// CHECK:STDERR: · ┗━━┫ error: expected `{` after return type
|
||||
// CHECK:STDERR: · ┃ [ExpectedLambdaBodyAfterReturnType]
|
||||
// CHECK:STDERR: ╰────
|
||||
// CHECK:STDERR:
|
||||
var x: auto = fn -> i32 ;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user