Skip to content

[chore] Remove unneccessary empty lines from generated code #14337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bogdandrutu merged 1 commit into from
Jan 3, 2026
Merged

[chore] Remove unneccessary empty lines from generated code #14337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions internal/cmd/pdatagen/internal/pdata/one_of_field.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ func (ms {{ .structName }}) {{ .typeFuncName }}() {{ .typeName }} {
return {{ .typeName }}Empty
}

{{ range .values }}
{{ range .values -}}
{{ .GenerateAccessors $.baseStruct $.OneOfField }}
{{ end }}`
{{- end }}`

const oneOfAccessorTestTemplate = `func Test{{ .structName }}_{{ .typeFuncName }}(t *testing.T) {
tv := New{{ .structName }}()
Expand All @@ -32,21 +32,21 @@ const oneOfAccessorTestTemplate = `func Test{{ .structName }}_{{ .typeFuncName }

{{ range .values -}}
{{ .GenerateTests $.baseStruct $.OneOfField }}
{{ end }}
{{- end }}
`

const oneOfTestFailingUnmarshalProtoValuesTemplate = `
{{- range .fields }}
{{ range .fields -}}
{{ .GenTestFailingUnmarshalProtoValues }}
{{- end }}`

const oneOfTestValuesTemplate = `
{{- range .fields }}
{{ range .fields -}}
{{ .GenTestEncodingValues }}
{{- end }}`

const oneOfPoolOrigTemplate = `
{{- range .fields }}
{{ range .fields -}}
{{ .GenPool }}
{{- end }}`

Expand All @@ -58,36 +58,36 @@ func (m *{{ .protoName }}) Get{{ .originFieldName }}() any {
return nil
}

{{- range .fields }}
{{ range .fields -}}
{{ .GenOneOfMessages }}
{{- end }}`

const oneOfDeleteOrigTemplate = `switch ov := orig.{{ .originFieldName }}.(type) {
{{ range .fields -}}
case *{{ $.protoName }}_{{ .GetName }}:
{{ .GenDelete }}{{- end }}
}
`
{{ .GenDelete }}
{{ end -}}
}`

const oneOfCopyOrigTemplate = `switch t := src.{{ .originFieldName }}.(type) {
{{- range .fields }}
{{ range .fields -}}
case *{{ $.protoName }}_{{ .GetName }}:
{{ .GenCopy }}
{{- end }}
{{ end -}}
default:
dest.{{ .originFieldName }} = nil
}`

const oneOfMarshalJSONTemplate = `switch orig := orig.{{ .originFieldName }}.(type) {
{{- range .fields }}
{{ range .fields -}}
case *{{ $.protoName }}_{{ .GetName }}:
{{ .GenMarshalJSON }}
{{- end }}
{{ end -}}
}`

const oneOfUnmarshalJSONTemplate = `
{{- range .fields }}
{{ .GenUnmarshalJSON }}
{{ range .fields -}}
{{ .GenUnmarshalJSON }}
{{- end }}`

const oneOfSizeProtoTemplate = `switch orig := orig.{{ .originFieldName }}.(type) {
Expand All @@ -101,16 +101,16 @@ const oneOfSizeProtoTemplate = `switch orig := orig.{{ .originFieldName }}.(type
}`

const oneOfMarshalProtoTemplate = `switch orig := orig.{{ .originFieldName }}.(type) {
{{- range .fields }}
{{ range .fields -}}
case *{{ $.protoName }}_{{ .GetName }}:
{{ .GenMarshalProto }}
{{- end }}
{{ end -}}
}`

const oneOfUnmarshalProtoTemplate = `
{{- range .fields }}
{{ .GenUnmarshalProto }}
{{- end }}`
{{ end }}`

type OneOfField struct {
originFieldName string
Expand Down
8 changes: 4 additions & 4 deletions internal/cmd/pdatagen/internal/proto/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ const deleteOther = `{{ if ne .oneOfGroup "" -}}
ov.{{ .fieldName }} = {{ .defaultValue }}
ProtoPool{{ .oneOfMessageName }}.Put(ov)
}
{{ end }}`
{{- end -}}`

const deleteMessage = `{{ if .repeated -}}
for i := range orig.{{ .fieldName }} {
{{ if .nullable -}}
Delete{{ .messageName }}(orig.{{ .fieldName }}[i], true)
{{- else -}}
{{ else -}}
Delete{{ .messageName }}(&orig.{{ .fieldName }}[i], false)
{{- end }}
{{- end -}}
}
{{- else if ne .oneOfGroup "" -}}
Delete{{ .messageName }}(ov.{{ .fieldName }}, true)
Expand All @@ -30,7 +30,7 @@ const deleteMessage = `{{ if .repeated -}}
Delete{{ .messageName }}(orig.{{ .fieldName }}, true)
{{- else -}}
Delete{{ .messageName }}(&orig.{{ .fieldName }}, false)
{{- end }}
{{- end -}}
`

func (pf *Field) GenDelete() string {
Expand Down
16 changes: 8 additions & 8 deletions internal/cmd/pdatagen/internal/proto/proto_size.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ const sizeProtoI8 = `{{ if .repeated -}}
l *= 8
n+= {{ .protoTagSize }} + proto.Sov(uint64(l)) + l
}
{{- else if ne .oneOfGroup "" -}}
{{- else if ne .oneOfGroup "" }}
n+= {{ add .protoTagSize 8 }}
{{- else -}}
{{- else }}
{{- if not .nullable -}}
if orig.{{ .fieldName }} != {{ .defaultValue }} {
{{- else -}}
Expand All @@ -33,9 +33,9 @@ const sizeProtoI4 = `{{ if .repeated -}}
l *= 4
n+= + {{ .protoTagSize }} + proto.Sov(uint64(l)) + l
}
{{- else if ne .oneOfGroup "" -}}
{{- else if ne .oneOfGroup "" }}
n+= {{ add .protoTagSize 4 }}
{{- else -}}
{{- else }}
{{- if not .nullable -}}
if orig.{{ .fieldName }} != {{ .defaultValue }} {
{{- else -}}
Expand All @@ -50,7 +50,7 @@ const sizeProtoBool = `{{ if .repeated -}}
if l > 0 {
n+= + {{ .protoTagSize }} + proto.Sov(uint64(l)) + l
}
{{- else if ne .oneOfGroup "" -}}
{{- else if ne .oneOfGroup "" }}
n+= {{ add .protoTagSize 1 }}
{{- else -}}
{{- if not .nullable -}}
Expand All @@ -62,17 +62,17 @@ const sizeProtoBool = `{{ if .repeated -}}
}
{{- end }}`

const sizeProtoVarint = `{{ if .repeated -}}
const sizeProtoVarint = `{{ if .repeated }}
if len(orig.{{ .fieldName }}) > 0 {
l = 0
for _, e := range orig.{{ .fieldName }} {
l += proto.Sov(uint64(e))
}
n+= {{ .protoTagSize }} + proto.Sov(uint64(l)) + l
}
{{- else if ne .oneOfGroup "" -}}
{{- else if ne .oneOfGroup "" }}
n+= {{ .protoTagSize }} + proto.Sov(uint64(orig.{{ .fieldName }}))
{{- else -}}
{{- else }}
{{- if not .nullable -}}
if orig.{{ .fieldName }} != {{ .defaultValue }} {
{{- else -}}
Expand Down
4 changes: 3 additions & 1 deletion internal/cmd/pdatagen/internal/proto/templates/message.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ func Delete{{ .messageName }}(orig *{{ .messageName }}, nullable bool) {
return
}

{{ range .fields }}{{ .GenDelete }}{{ end }}
{{- range .fields }}
{{ .GenDelete }}
{{- end }}
orig.Reset()
if nullable {
protoPool{{ .messageName }}.Put(orig)
Expand Down
13 changes: 4 additions & 9 deletions pdata/internal/generated_proto_anyvalue.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 15 additions & 27 deletions pdata/internal/generated_proto_anyvalue_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions pdata/internal/generated_proto_arrayvalue.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions pdata/internal/generated_proto_exemplar.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading