v fmt: fix extra space for anon struct (#16131)

This commit is contained in:
Makhnev Petr 2022-10-21 11:38:19 +04:00 committed by GitHub
parent c684dd8c9b
commit 2e8b9e3b92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions

View File

@ -2133,7 +2133,7 @@ with a struct name.
```v ```v
struct Book { struct Book {
author struct { author struct {
name string name string
age int age int
} }

View File

@ -19,7 +19,7 @@ enum Selection {
struct App { struct App {
mut: mut:
gg &gg.Context = unsafe { nil } gg &gg.Context = unsafe { nil }
mouse struct { mouse struct {
mut: mut:
x f32 x f32
y f32 y f32

View File

@ -2,7 +2,7 @@ module amod
pub struct Foo { pub struct Foo {
pub mut: pub mut:
bar struct { bar struct {
pub mut: pub mut:
baz int baz int
} }

View File

@ -12,13 +12,14 @@ pub fn (mut f Fmt) struct_decl(node ast.StructDecl, is_anon bool) {
f.write('pub ') f.write('pub ')
} }
if node.is_union { if node.is_union {
f.write('union ') f.write('union')
} else { } else {
f.write('struct ') f.write('struct')
} }
f.write_language_prefix(node.language)
name := node.name.after('.') // strip prepended module name := node.name.after('.') // strip prepended module
if !is_anon { if !is_anon {
f.write(' ')
f.write_language_prefix(node.language)
f.write(name) f.write(name)
} }
f.write_generic_types(node.generic_types) f.write_generic_types(node.generic_types)

View File

@ -416,7 +416,7 @@ fn test_struct_update() {
// Test anon structs // Test anon structs
struct Book { struct Book {
x Foo x Foo
author struct { author struct {
name string name string
age int age int
} }