Skip to content

[pigeon] Improve style of generated Swift code #5938

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
auto-submit merged 9 commits into from
Jan 20, 2024
Merged

[pigeon] Improve style of generated Swift code #5938

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b58c016
Format generated code
stuartmorgan-g Jan 18, 2024
865d95c
Fix trailing whitespace in prologue
stuartmorgan-g Jan 18, 2024
b5aee8f
Various small fixes
stuartmorgan-g Jan 19, 2024
b11c297
semicolon
stuartmorgan-g Jan 19, 2024
89fa695
As generated
stuartmorgan-g Jan 19, 2024
c952664
Make whitespace fix more specific
stuartmorgan-g Jan 19, 2024
b8babf1
Version bump
stuartmorgan-g Jan 19, 2024
5a99908
Analyzer fixes
stuartmorgan-g Jan 20, 2024
0d9f663
Fix test
stuartmorgan-g Jan 20, 2024
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
Prev Previous commit
Next Next commit
Fix trailing whitespace in prologue
  • Loading branch information
@stuartmorgan-g
stuartmorgan-g committed Jan 18, 2024
commit 865d95c2c0d5a2967300bd0b754dfbe7dd7fec26
2 changes: 1 addition & 1 deletion packages/pigeon/lib/generator_tools.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ bool isVoid(TypeMirror type) {
void addLines(Indent indent, Iterable<String> lines, {String? linePrefix}) {
final String prefix = linePrefix ?? '';
for (final String line in lines) {
indent.writeln('$prefix$line');
indent.writeln('$prefix$line'.trimRight());
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/pigeon/test/swift_generator_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,8 +714,8 @@ void main() {
test('header', () {
final Root root = Root(apis: <Api>[], classes: <Class>[], enums: <Enum>[]);
final StringBuffer sink = StringBuffer();
final SwiftOptions swiftOptions = SwiftOptions(
copyrightHeader: makeIterable('hello world'),
const SwiftOptions swiftOptions = SwiftOptions(
copyrightHeader: ['hello world', ''],
);
const SwiftGenerator generator = SwiftGenerator();
generator.generate(
Expand All @@ -726,6 +726,8 @@ void main() {
);
final String code = sink.toString();
expect(code, startsWith('// hello world'));
// There should be no trailing whitespace on generated comments.
expect(code, isNot(matches(RegExp(r'^//.* $', multiLine: true))));
});

test('generics - list', () {
Expand Down