carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 12:21:06 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix formatting for imported impls. (#4194)

Browse Source 
`impl`s may be defined even if they have no scope if they were imported.
This commit is contained in:
Richard Smith
2024-08-07 15:58:53 +00:00
committed by GitHub
parent ab5fa938ab
commit 2a06c964b5
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/impl/lookup/import.carbon
Vendored
+4 -1
View File
@@ -179,7 +179,10 @@ fn G(c: Impl.C) {
// CHECK:STDOUT: witness = (imports.%import_ref.4)
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: impl @impl: %C as %.2;
// CHECK:STDOUT: impl @impl: %C as %.2 {
// CHECK:STDOUT: !members:
// CHECK:STDOUT: witness = imports.%import_ref.5
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: class @C {
// CHECK:STDOUT: !members:
toolchain/check/testdata/impl/lookup/no_prelude/import.carbon
Vendored
+4 -1
View File
@@ -154,7 +154,10 @@ fn G(c: Impl.C) {
// CHECK:STDOUT: witness = (imports.%import_ref.4)
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: impl @impl: %C as %.2;
// CHECK:STDOUT: impl @impl: %C as %.2 {
// CHECK:STDOUT: !members:
// CHECK:STDOUT: witness = imports.%import_ref.5
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: class @C {
// CHECK:STDOUT: !members:
toolchain/check/testdata/impl/no_prelude/interface_args.carbon
Vendored
+8 -2
View File
@@ -262,7 +262,10 @@ impl A as Factory(B) {
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: impl @impl: %A as %.6;
// CHECK:STDOUT: impl @impl: %A as %.6 {
// CHECK:STDOUT: !members:
// CHECK:STDOUT: witness = imports.%import_ref.11
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: class @A {
// CHECK:STDOUT: !members:
@@ -397,7 +400,10 @@ impl A as Factory(B) {
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: impl @impl: %A as %.6;
// CHECK:STDOUT: impl @impl: %A as %.6 {
// CHECK:STDOUT: !members:
// CHECK:STDOUT: witness = imports.%import_ref.11
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: class @A {
// CHECK:STDOUT: !members:
toolchain/sem_ir/formatter.cpp
+4 -2
View File
@@ -233,7 +233,7 @@ class FormatterImpl {
llvm::SaveAndRestore impl_scope(scope_, inst_namer_->GetScopeFor(id));
if (impl_info.scope_id.is_valid()) {
if (impl_info.is_defined()) {
out_ << ' ';
OpenBrace();
FormatCodeBlock(impl_info.body_block_id);
@@ -242,7 +242,9 @@ class FormatterImpl {
// always list the witness in this section.
IndentLabel();
out_ << "!members:\n";
FormatNameScope(impl_info.scope_id);
if (impl_info.scope_id.is_valid()) {
FormatNameScope(impl_info.scope_id);
}
Indent();
out_ << "witness = ";