mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-20 21:46:43 +00:00
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
390 lines
8.7 KiB
Plaintext
390 lines
8.7 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/none.carbon
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/impl/orphan.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/impl/orphan.carbon
|
|
|
|
// --- imports.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
class ImportedC {}
|
|
class ImportedD(T: type) {}
|
|
|
|
interface ImportedY {}
|
|
interface ImportedZ(T: type) {}
|
|
|
|
constraint ImportedN(T: type) {}
|
|
|
|
class ImportedAnyParam[T: type](X: T) {}
|
|
|
|
// --- class_definition_missing.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// This is the first owning decl of C, so it can be an anchor name.
|
|
class C;
|
|
|
|
impl C as ImportedY {}
|
|
|
|
// --- class_definition_missing_for_self_specific.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// This is the first owning decl of C, so it can be an anchor name.
|
|
class C;
|
|
|
|
impl ImportedD(C) as ImportedY {}
|
|
|
|
// --- class_definition_missing_for_interface_specific.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// This is the first owning decl of C, so it can be an anchor name.
|
|
class C;
|
|
|
|
impl ImportedC as ImportedZ(C) {}
|
|
|
|
// --- fail_imported_class.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// CHECK:STDERR: fail_imported_class.carbon:[[@LINE+2]]:1-29: error: orphan `impl` found; something in the self-type or constraint must be defined in the same file [ImplIsOrphan]
|
|
// CHECK:STDERR:
|
|
impl ImportedC as ImportedY {}
|
|
|
|
// --- fail_imported_class_for_self_specific.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// CHECK:STDERR: fail_imported_class_for_self_specific.carbon:[[@LINE+2]]:1-40: error: orphan `impl` found; something in the self-type or constraint must be defined in the same file [ImplIsOrphan]
|
|
// CHECK:STDERR:
|
|
impl ImportedD(ImportedC) as ImportedY {}
|
|
|
|
// --- fail_imported_class_for_interface_specific.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// CHECK:STDERR: fail_imported_class_for_interface_specific.carbon:[[@LINE+2]]:1-40: error: orphan `impl` found; something in the self-type or constraint must be defined in the same file [ImplIsOrphan]
|
|
// CHECK:STDERR:
|
|
impl ImportedC as ImportedZ(ImportedC) {}
|
|
|
|
// --- class_definition_after.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class C;
|
|
|
|
impl C as ImportedY {}
|
|
|
|
class C {}
|
|
|
|
// --- class_definition_after_for_self_specific.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class C;
|
|
|
|
impl ImportedD(C) as ImportedY {}
|
|
|
|
class C {}
|
|
|
|
// --- class_definition_after_for_interface_specific.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class C;
|
|
|
|
impl ImportedC as ImportedZ(C) {}
|
|
|
|
class C {}
|
|
|
|
// --- class_definition_before.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class C {}
|
|
|
|
impl C as ImportedY {}
|
|
|
|
// --- class_definition_before_for_self_specific.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class C {}
|
|
|
|
impl ImportedD(C) as ImportedY {}
|
|
|
|
// --- class_definition_before_for_interface_specific.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class C {}
|
|
|
|
impl ImportedC as ImportedZ(C) {}
|
|
|
|
// --- fail_generic_class_from_import.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// CHECK:STDERR: fail_generic_class_from_import.carbon:[[@LINE+2]]:1-47: error: orphan `impl` found; something in the self-type or constraint must be defined in the same file [ImplIsOrphan]
|
|
// CHECK:STDERR:
|
|
impl ImportedAnyParam(ImportedD) as ImportedY {}
|
|
|
|
// --- generic_class.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class D(T: type) {}
|
|
|
|
impl ImportedAnyParam(D) as ImportedY {}
|
|
|
|
// --- fail_generic_interface_from_import.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// CHECK:STDERR: fail_generic_interface_from_import.carbon:[[@LINE+2]]:1-47: error: orphan `impl` found; something in the self-type or constraint must be defined in the same file [ImplIsOrphan]
|
|
// CHECK:STDERR:
|
|
impl ImportedAnyParam(ImportedZ) as ImportedY {}
|
|
|
|
// --- generic_interface.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
interface Z(T: type) {}
|
|
|
|
impl ImportedAnyParam(Z) as ImportedY {}
|
|
|
|
// --- fail_generic_named_constraint_from_import.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// CHECK:STDERR: fail_generic_named_constraint_from_import.carbon:[[@LINE+2]]:1-47: error: orphan `impl` found; something in the self-type or constraint must be defined in the same file [ImplIsOrphan]
|
|
// CHECK:STDERR:
|
|
impl ImportedAnyParam(ImportedN) as ImportedY {}
|
|
|
|
// --- generic_named_constraint.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
constraint N(T: type) {}
|
|
|
|
impl ImportedAnyParam(N) as ImportedY {}
|
|
|
|
// --- todo_fail_orphan_in_class_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface Z {}
|
|
|
|
// Neither {} nor Z are defined within or by the scope of `C`.
|
|
class C {
|
|
impl {} as Z {}
|
|
}
|
|
|
|
// --- valid_in_fn_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface Z {}
|
|
|
|
fn F() {
|
|
class C {}
|
|
impl C as Z {}
|
|
}
|
|
|
|
// --- todo_fail_orphan_in_fn_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface Z {}
|
|
|
|
// Neither {} nor Z are defined within or by the scope of `F`.
|
|
fn F() {
|
|
impl {} as Z {}
|
|
}
|
|
|
|
// --- valid_in_generic_fn_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface Z {}
|
|
|
|
fn F(unused generic T: type) {
|
|
class C {}
|
|
impl C as Z {}
|
|
}
|
|
|
|
// --- fail_todo_orphan_in_generic_fn_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface Z {}
|
|
|
|
// Neither {} nor Z are defined within or by the scope of `F`.
|
|
fn F(unused generic T: type) {
|
|
// TODO: The error should be about being an orphan, not an unused binding.
|
|
// CHECK:STDERR: fail_todo_orphan_in_generic_fn_scope.carbon:[[@LINE+2]]:3-16: error: `impl` with unused generic binding [ImplUnusedBinding]
|
|
// CHECK:STDERR:
|
|
impl {} as Z {}
|
|
}
|
|
|
|
// --- valid_in_block_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface Z {}
|
|
|
|
fn F() {
|
|
if (true) {
|
|
class C {}
|
|
impl C as Z {}
|
|
}
|
|
}
|
|
|
|
// --- todo_fail_orphan_in_block_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface Z {}
|
|
|
|
fn F() {
|
|
class C {}
|
|
// Neither C nor Z are defined within or by this if block scope.
|
|
if (true) {
|
|
impl C as Z {}
|
|
}
|
|
}
|
|
|
|
// --- name_defined_by_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class C {
|
|
impl as ImportedY {}
|
|
};
|
|
|
|
// --- name_defined_in_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
fn F() {
|
|
class C {}
|
|
impl C as ImportedY {}
|
|
};
|
|
|
|
// --- name_defined_after_in_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
fn F() {
|
|
class C;
|
|
impl C as ImportedY {}
|
|
class C {}
|
|
};
|
|
|
|
// --- name_defined_in_nested_namespace_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
namespace N;
|
|
class N.C {}
|
|
|
|
impl N.C as ImportedY {}
|
|
|
|
// --- name_defined_after_in_nested_namespace_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
namespace N;
|
|
class N.C;
|
|
|
|
impl N.C as ImportedY {}
|
|
|
|
class N.C {}
|
|
|
|
// --- name_defined_in_nested_class_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class C {
|
|
class D {}
|
|
}
|
|
impl C.D as ImportedY {}
|
|
|
|
// --- name_defined_after_in_nested_class_scope.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
class C {
|
|
class D;
|
|
}
|
|
impl C.D as ImportedY {}
|
|
|
|
class C.D {}
|
|
|
|
// --- fail_todo_extern_class.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "use_extern_class";
|
|
|
|
// CHECK:STDERR: fail_todo_extern_class.carbon:[[@LINE+1]]:1-15: error: redeclaration of `class C` is redundant [RedeclRedundant]
|
|
extern class C;
|
|
|
|
// --- fail_use_extern_class.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "imports";
|
|
|
|
// A non-owning decl of C.
|
|
// CHECK:STDERR: fail_use_extern_class.carbon:[[@LINE+4]]:1-38: note: previously declared here [RedeclPrevDecl]
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_use_extern_class.carbon:[[@LINE+2]]:1-38: error: semantics TODO: `extern library` [SemanticsTodo]
|
|
// CHECK:STDERR:
|
|
extern library "extern_class" class C;
|
|
|
|
// TODO: This should be an orphan `impl`. `C` is owned by `extern_class`, so it
|
|
// can't be an anchor name. No error will be emitted until `extern library` is
|
|
// implemented for classes.
|
|
impl C as ImportedY {}
|
|
|
|
// --- imported_first_owning_decl.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
class ImportedClassDecl;
|
|
|
|
interface ImportedInterface {}
|
|
|
|
// --- todo_fail_imported_first_owning_decl.impl.carbon
|
|
impl library "[[@TEST_NAME]]";
|
|
|
|
// This is an owning decl, but not the first owning decl, which is in the api
|
|
// file. So it can not be an anchor name.
|
|
class ImportedClassDecl {}
|
|
|
|
// TODO: This should fail, there is no anchor name.
|
|
impl ImportedClassDecl as ImportedInterface {}
|