Skip to content
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

Jump to bottom

feat(gen-openapiv2): support trailing comments #2965

Merged
merged 5 commits into from Oct 31, 2022
Merged

feat(gen-openapiv2): support trailing comments #2965

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1c43be
feat(gen-openapiv2): support trailing comments
ionling Oct 19, 2022
e3fd1f9
feat(gen-openapiv2): add examplepb for trailing comments
ionling Oct 23, 2022
b7f67ca
fix typo
ionling Oct 27, 2022
a05787f
fix indent
ionling Oct 27, 2022
21f07cd
fix: regenerate the example files
ionling Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
345 changes: 345 additions & 0 deletions examples/internal/clients/abe/api/swagger.yaml
View file
Open in desktop

Large diffs are not rendered by default.

180 changes: 180 additions & 0 deletions examples/internal/clients/abe/api_a_bit_of_everything_service.go
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions examples/internal/clients/abe/model_a_bit_of_everything.go
View file
Open in desktop
Expand Up @@ -65,4 +65,11 @@ type ABitOfEverything struct {
RequiredStringField2 string `json:"requiredStringField2"`
RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"`
RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"`
TrailingOnly string `json:"trailingOnly,omitempty"`
// Trailing only dot.
TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"`
// Trailing both.
TrailingBoth string `json:"trailingBoth,omitempty"`
// This is a example of multi-line comments. Trailing multiline.
TrailingMultiline string `json:"trailingMultiline,omitempty"`
}
7 changes: 7 additions & 0 deletions examples/internal/clients/abe/model_a_bit_of_everything_1.go
View file
Open in desktop
Expand Up @@ -66,4 +66,11 @@ type ABitOfEverything1 struct {
RequiredStringField2 string `json:"requiredStringField2"`
RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"`
RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"`
TrailingOnly string `json:"trailingOnly,omitempty"`
// Trailing only dot.
TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"`
// Trailing both.
TrailingBoth string `json:"trailingBoth,omitempty"`
// This is a example of multi-line comments. Trailing multiline.
TrailingMultiline string `json:"trailingMultiline,omitempty"`
}
7 changes: 7 additions & 0 deletions examples/internal/clients/abe/model_a_bit_of_everything_2.go
View file
Open in desktop
Expand Up @@ -65,4 +65,11 @@ type ABitOfEverything2 struct {
RequiredStringField2 string `json:"requiredStringField2"`
RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"`
RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"`
TrailingOnly string `json:"trailingOnly,omitempty"`
// Trailing only dot.
TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"`
// Trailing both.
TrailingBoth string `json:"trailingBoth,omitempty"`
// This is a example of multi-line comments. Trailing multiline.
TrailingMultiline string `json:"trailingMultiline,omitempty"`
}
7 changes: 7 additions & 0 deletions examples/internal/clients/abe/model_a_bit_of_everything_3.go
View file
Open in desktop
Expand Up @@ -65,4 +65,11 @@ type ABitOfEverything3 struct {
RequiredStringField2 string `json:"requiredStringField2"`
RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"`
RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"`
TrailingOnly string `json:"trailingOnly,omitempty"`
// Trailing only dot.
TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"`
// Trailing both.
TrailingBoth string `json:"trailingBoth,omitempty"`
// This is a example of multi-line comments. Trailing multiline.
TrailingMultiline string `json:"trailingMultiline,omitempty"`
}
7 changes: 7 additions & 0 deletions examples/internal/clients/abe/model_a_bit_of_everything_4.go
View file
Open in desktop
Expand Up @@ -65,4 +65,11 @@ type ABitOfEverything4 struct {
RequiredStringField2 string `json:"requiredStringField2,omitempty"`
RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom,omitempty"`
RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom,omitempty"`
TrailingOnly string `json:"trailingOnly,omitempty"`
// Trailing only dot.
TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"`
// Trailing both.
TrailingBoth string `json:"trailingBoth,omitempty"`
// This is a example of multi-line comments. Trailing multiline.
TrailingMultiline string `json:"trailingMultiline,omitempty"`
}
7 changes: 7 additions & 0 deletions examples/internal/clients/abe/model_examplepb_a_bit_of_everything.go
View file
Open in desktop
Expand Up @@ -66,4 +66,11 @@ type ExamplepbABitOfEverything struct {
RequiredStringField2 string `json:"requiredStringField2"`
RequiredFieldBehaviorJsonNameCustom string `json:"required_field_behavior_json_name_custom"`
RequiredFieldSchemaJsonNameCustom string `json:"required_field_schema_json_name_custom"`
TrailingOnly string `json:"trailingOnly,omitempty"`
// Trailing only dot.
TrailingOnlyDot string `json:"trailingOnlyDot,omitempty"`
// Trailing both.
TrailingBoth string `json:"trailingBoth,omitempty"`
// This is a example of multi-line comments. Trailing multiline.
TrailingMultiline string `json:"trailingMultiline,omitempty"`
}
1,513 changes: 780 additions & 733 deletions examples/internal/proto/examplepb/a_bit_of_everything.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions examples/internal/proto/examplepb/a_bit_of_everything.proto
View file
Open in desktop
Expand Up @@ -406,6 +406,15 @@ message ABitOfEverything {
(google.api.field_behavior) = REQUIRED
];
string required_field_schema_json_name = 46 [json_name = "required_field_schema_json_name_custom"];

string trailing_only = 47; // Trailing only
string trailing_only_dot = 48; // Trailing only dot.
// Leading both
string trailing_both = 49; // Trailing both.
// Leading multiline
//
// This is a example of multi-line comments.
ionling marked this conversation as resolved.
Show resolved Hide resolved
string trailing_multiline = 50; // Trailing multiline.
}

// ABitOfEverythingRepeated is used to validate repeated path parameter functionality
Expand Down