mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-15 12:38:30 +00:00
Chandler Carruth
c608c35e12
There were a number of iterations on the design that weren't reflected in the initial port to the terminal rendering library. This PR tries to complete the rendering side of things to match the design we landed on: code-focused, with messages attached by lines to the code, and condensed as much as possible to avoid the vertical space. It also improves the styling to make things more visually distinguishable such as adding a `->` to the main error line, and making the underlines and connectors for it have a heavy weight (when the font supports that). Another major change is having multiple messages on a single line be drawn in source lexical order. This requires the connectors to cross without joining, but makes it easier to read the messages. This PR also has some refactorings to enable these improvements, and a _number_ of improvements to comment prose and terminology to try and avoid jargon and make things read more naturally. Sorry for the fact that Claude left a bunch of this mannerly language in comments despite my efforts, but I'm continuing to try and drive the prose towards something direct and simple to read. Some of the terminology improvements also needed to be made in the design doc and those have been made here. Note that I don't think this rendering is perfect or should be viewed as final. I'm happy to iterate on it further, and have a few adjustments in mind already, but would like to focus this on getting the _implementation_ of the current rendering design in place, and then we can make targeted changes or tweaks as needed. For example, I'm not yet fully happy with the rendering when messages are too long and we move them all the way to the left, but am leaving that for a follow-up. Assisted-by: Claude Code
198 lines
7.4 KiB
Plaintext
198 lines
7.4 KiB
Plaintext
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/int.carbon
|
|
//
|
|
// ARGS: --include-diagnostic-kind --diagnostic-snippets compile --phase=check %s
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/diagnostics/testdata/fail_rendering.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/diagnostics/testdata/fail_rendering.carbon
|
|
|
|
// Covers how diagnostics are drawn, which the rest of the test suite turns off.
|
|
// See /toolchain/docs/diagnostics_rendering.md.
|
|
|
|
// --- fail_one_message.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
fn F() {
|
|
// CHECK:STDERR: .-| fail_one_message.carbon:[[@LINE+12]]:23
|
|
// CHECK:STDERR: -> 17 | var unused_x: i32 = missing;
|
|
// CHECK:STDERR: : ^^^^^^^
|
|
// CHECK:STDERR: : '--| error: name `missing` not found [NameNotFound]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: .-| fail_one_message.carbon:[[@LINE+6]]:7
|
|
// CHECK:STDERR: -> 17 | var unused_x: i32 = missing;
|
|
// CHECK:STDERR: : ^^^^^^^^^^^^^
|
|
// CHECK:STDERR: : '--| warning: binding `unused_x` unused [UnusedBinding]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
var unused_x: i32 = missing;
|
|
}
|
|
|
|
// --- fail_note_in_same_file.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
fn G() {}
|
|
|
|
fn H() {
|
|
// CHECK:STDERR: .-| fail_note_in_same_file.carbon:[[@LINE+11]]:3
|
|
// CHECK:STDERR: 4 | fn G() {}
|
|
// CHECK:STDERR: : ----.---
|
|
// CHECK:STDERR: : '--| calling function declared here [InCallToEntity]
|
|
// CHECK:STDERR: :
|
|
// CHECK:STDERR: -> 18 | G(1);
|
|
// CHECK:STDERR: : ^^^^
|
|
// CHECK:STDERR: : '--| error: 1 argument passed to function expecting 0 arguments
|
|
// CHECK:STDERR: : | [CallArgCountMismatch]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
G(1);
|
|
}
|
|
|
|
// --- fail_wide_line_numbers.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
fn Wide() {
|
|
// Padding, so that the diagnostic below lands past line 9 and the frame has
|
|
// to move right to fit its line number.
|
|
//
|
|
//
|
|
//
|
|
// CHECK:STDERR: .-| fail_wide_line_numbers.carbon:[[@LINE+13]]:23
|
|
// CHECK:STDERR: -> 23 | var unused_y: i32 = also_missing;
|
|
// CHECK:STDERR: : ^^^^^^^^^^^^
|
|
// CHECK:STDERR: : '--| error: name `also_missing` not found
|
|
// CHECK:STDERR: : | [NameNotFound]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: .-| fail_wide_line_numbers.carbon:[[@LINE+6]]:7
|
|
// CHECK:STDERR: -> 23 | var unused_y: i32 = also_missing;
|
|
// CHECK:STDERR: : ^^^^^^^^^^^^^
|
|
// CHECK:STDERR: : '--| warning: binding `unused_y` unused [UnusedBinding]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
var unused_y: i32 = also_missing;
|
|
}
|
|
|
|
// --- declared.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
fn Declared();
|
|
|
|
// --- fail_across_files.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "declared";
|
|
|
|
fn Use() {
|
|
// CHECK:STDERR: .-| fail_across_files.carbon:[[@LINE+12]]:3
|
|
// CHECK:STDERR: -> 19 | Declared(1);
|
|
// CHECK:STDERR: : ^^^^^^^^^^^
|
|
// CHECK:STDERR: : '--| error: 1 argument passed to function expecting 0 arguments
|
|
// CHECK:STDERR: : | [CallArgCountMismatch]
|
|
// CHECK:STDERR: :
|
|
// CHECK:STDERR: |-| declared.carbon:4:1
|
|
// CHECK:STDERR: 4 | fn Declared();
|
|
// CHECK:STDERR: : -------.------
|
|
// CHECK:STDERR: : '--| calling function declared here [InCallToEntity]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
Declared(1);
|
|
}
|
|
|
|
// --- fail_two_spans_on_one_line.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// CHECK:STDERR: .-| fail_two_spans_on_one_line.carbon:[[@LINE+9]]:27
|
|
// CHECK:STDERR: -> 13 | fn Same() {} fn Twice() { Same(1); }
|
|
// CHECK:STDERR: : -----.----- ^^^^^^^
|
|
// CHECK:STDERR: : | '--| error: 1 argument passed to function expecting 0
|
|
// CHECK:STDERR: : | | arguments
|
|
// CHECK:STDERR: : | | [CallArgCountMismatch]
|
|
// CHECK:STDERR: : '-------------------------| calling function declared here [InCallToEntity]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
fn Same() {} fn Twice() { Same(1); }
|
|
|
|
// --- fail_non_ascii_source.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
fn Wide() {
|
|
// CHECK:STDERR: .-| fail_non_ascii_source.carbon:[[@LINE+14]]:19
|
|
// CHECK:STDERR: -> 19 | var text: i32 = "<E4><B8><96><E7><95><8C>";
|
|
// CHECK:STDERR: : ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
// CHECK:STDERR: : '--| error: name `Core.String` implicitly referenced here, but
|
|
// CHECK:STDERR: : | not found
|
|
// CHECK:STDERR: : | [CoreNameNotFound]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: .-| fail_non_ascii_source.carbon:[[@LINE+6]]:7
|
|
// CHECK:STDERR: -> 19 | var text: i32 = "<E4><B8><96><E7><95><8C>";
|
|
// CHECK:STDERR: : ^^^^^^^^^
|
|
// CHECK:STDERR: : '--| warning: binding `text` unused [UnusedBinding]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
var text: i32 = "世界";
|
|
}
|
|
|
|
// --- fail_tab_indented.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
fn Tabbed() {
|
|
// CHECK:STDERR: .-| fail_tab_indented.carbon:[[@LINE+13]]:26
|
|
// CHECK:STDERR: -> 18 | var also_missing: i32 = nowhere;
|
|
// CHECK:STDERR: : ^^^^^^^
|
|
// CHECK:STDERR: : '--| error: name `nowhere` not found
|
|
// CHECK:STDERR: : | [NameNotFound]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: .-| fail_tab_indented.carbon:[[@LINE+6]]:6
|
|
// CHECK:STDERR: -> 18 | var also_missing: i32 = nowhere;
|
|
// CHECK:STDERR: : ^^^^^^^^^^^^^^^^^
|
|
// CHECK:STDERR: : '--| warning: binding `also_missing` unused [UnusedBinding]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
var also_missing: i32 = nowhere;
|
|
}
|
|
|
|
// --- cpp_decl.h
|
|
|
|
struct Widget {};
|
|
void Use(Widget w, int extra);
|
|
|
|
// --- fail_cpp_interop.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import Cpp library "cpp_decl.h";
|
|
|
|
fn CallIt() {
|
|
// CHECK:STDERR: .-| fail_cpp_interop.carbon:[[@LINE+13]]:3
|
|
// CHECK:STDERR: -> 20 | Cpp.Use(1);
|
|
// CHECK:STDERR: : ^^^^^^^
|
|
// CHECK:STDERR: : '--| error: no matching function for call to 'Use' [CppInteropParseError]
|
|
// CHECK:STDERR: :
|
|
// CHECK:STDERR: |-| ./cpp_decl.h:3:6
|
|
// CHECK:STDERR: 3 | void Use(Widget w, int extra);
|
|
// CHECK:STDERR: : . ---------.---------
|
|
// CHECK:STDERR: : '---------------| candidate function not viable [CppInteropParseNote]
|
|
// CHECK:STDERR: : '----| requires 2 arguments, but 1 was provided
|
|
// CHECK:STDERR: : | [CppInteropParseNoteReason]
|
|
// CHECK:STDERR: '----
|
|
// CHECK:STDERR:
|
|
Cpp.Use(1);
|
|
}
|