Skip to content

Commit 90c46d2

Browse files
tarrinnealtarrinneal
authored
[pigeon] revert 3b5ae00 (#2987)
* start * Class file transfer and skeleton comments * relocate generator classes and update imports * merge main and changelog update * update openSink to openWriteSink * Revert "[pigeon] Relocates generator classes and updates imports (#2985)" This reverts commit 3b5ae00.
1 parent 3b5ae00 commit 90c46d2

12 files changed

Lines changed: 247 additions & 295 deletions

‎packages/pigeon/CHANGELOG.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
## 4.2.15
2-
3-
* Relocates generator classes.
4-
51
## 4.2.14
62

73
* [c++] Fixes reply sending non EncodableValue wrapped lists.

‎packages/pigeon/lib/cpp_generator.dart‎

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'dart:io';
6-
import 'package:path/path.dart' as path;
7-
85
import 'ast.dart';
96
import 'functional.dart';
10-
import 'generator.dart';
117
import 'generator_tools.dart';
12-
import 'pigeon_lib.dart' show Error, PigeonOptions, lineReader, openSink;
8+
import 'pigeon_lib.dart' show Error;
139

1410
/// General comment opening token.
1511
const String _commentPrefix = '//';
@@ -68,54 +64,6 @@ class CppOptions {
6864
}
6965
}
7066

71-
/// A [Generator] that generates C++ header code.
72-
class CppHeaderGenerator implements Generator {
73-
/// Constructor for [CppHeaderGenerator].
74-
const CppHeaderGenerator();
75-
76-
@override
77-
void generate(StringSink sink, PigeonOptions options, Root root) {
78-
final CppOptions cppOptions = options.cppOptions ?? const CppOptions();
79-
final CppOptions cppOptionsWithHeader = cppOptions.merge(CppOptions(
80-
copyrightHeader: options.copyrightHeader != null
81-
? lineReader(options.copyrightHeader!)
82-
: null));
83-
generateCppHeader(path.basenameWithoutExtension(options.cppHeaderOut!),
84-
cppOptionsWithHeader, root, sink);
85-
}
86-
87-
@override
88-
IOSink? shouldGenerate(PigeonOptions options) =>
89-
openSink(options.cppHeaderOut);
90-
91-
@override
92-
List<Error> validate(PigeonOptions options, Root root) =>
93-
validateCpp(options.cppOptions!, root);
94-
}
95-
96-
/// A [Generator] that generates C++ source code.
97-
class CppSourceGenerator implements Generator {
98-
/// Constructor for [CppSourceGenerator].
99-
const CppSourceGenerator();
100-
101-
@override
102-
void generate(StringSink sink, PigeonOptions options, Root root) {
103-
final CppOptions cppOptions = options.cppOptions ?? const CppOptions();
104-
final CppOptions cppOptionsWithHeader = cppOptions.merge(CppOptions(
105-
copyrightHeader: options.copyrightHeader != null
106-
? lineReader(options.copyrightHeader!)
107-
: null));
108-
generateCppSource(cppOptionsWithHeader, root, sink);
109-
}
110-
111-
@override
112-
IOSink? shouldGenerate(PigeonOptions options) =>
113-
openSink(options.cppSourceOut);
114-
115-
@override
116-
List<Error> validate(PigeonOptions options, Root root) => <Error>[];
117-
}
118-
11967
String _getCodecSerializerName(Api api) => '${api.name}CodecSerializer';
12068

12169
const String _pointerPrefix = 'pointer';

‎packages/pigeon/lib/dart_generator.dart‎

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'dart:io' show Directory, File, FileSystemEntity, IOSink;
5+
import 'dart:io' show Directory, File, FileSystemEntity;
66

77
import 'package:path/path.dart' as path;
88
import 'package:yaml/yaml.dart' as yaml;
99

1010
import 'ast.dart';
1111
import 'functional.dart';
12-
import 'generator.dart';
1312
import 'generator_tools.dart';
14-
import 'pigeon_lib.dart' show Error, PigeonOptions, lineReader, openSink;
1513

1614
/// Documentation comment open symbol.
1715
const String _docCommentPrefix = '///';
@@ -67,64 +65,6 @@ String _escapeForDartSingleQuotedString(String raw) {
6765
/// Calculates the name of the codec class that will be generated for [api].
6866
String _getCodecName(Api api) => '_${api.name}Codec';
6967

70-
/// A [Generator] that generates Dart source code.
71-
class DartGenerator implements Generator {
72-
/// Constructor for [DartGenerator].
73-
const DartGenerator();
74-
75-
@override
76-
void generate(StringSink sink, PigeonOptions options, Root root) {
77-
final DartOptions dartOptionsWithHeader = _dartOptionsWithCopyrightHeader(
78-
options.dartOptions, options.copyrightHeader);
79-
generateDart(dartOptionsWithHeader, root, sink);
80-
}
81-
82-
@override
83-
IOSink? shouldGenerate(PigeonOptions options) => openSink(options.dartOut);
84-
85-
@override
86-
List<Error> validate(PigeonOptions options, Root root) => <Error>[];
87-
}
88-
89-
DartOptions _dartOptionsWithCopyrightHeader(
90-
DartOptions? dartOptions, String? copyrightHeader) {
91-
dartOptions = dartOptions ?? const DartOptions();
92-
return dartOptions.merge(DartOptions(
93-
copyrightHeader:
94-
copyrightHeader != null ? lineReader(copyrightHeader) : null));
95-
}
96-
97-
/// A [Generator] that generates Dart test source code.
98-
class DartTestGenerator implements Generator {
99-
/// Constructor for [DartTestGenerator].
100-
const DartTestGenerator();
101-
102-
@override
103-
void generate(StringSink sink, PigeonOptions options, Root root) {
104-
final DartOptions dartOptionsWithHeader = _dartOptionsWithCopyrightHeader(
105-
options.dartOptions, options.copyrightHeader);
106-
generateTestDart(
107-
dartOptionsWithHeader,
108-
root,
109-
sink,
110-
dartOutPath: options.dartOut!,
111-
testOutPath: options.dartTestOut!,
112-
);
113-
}
114-
115-
@override
116-
IOSink? shouldGenerate(PigeonOptions options) {
117-
if (options.dartTestOut != null) {
118-
return openSink(options.dartTestOut);
119-
} else {
120-
return null;
121-
}
122-
}
123-
124-
@override
125-
List<Error> validate(PigeonOptions options, Root root) => <Error>[];
126-
}
127-
12868
/// Writes the codec that will be used by [api].
12969
/// Example:
13070
///

‎packages/pigeon/lib/generator.dart‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎packages/pigeon/lib/generator_tools.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'dart:mirrors';
99
import 'ast.dart';
1010

1111
/// The current version of pigeon. This must match the version in pubspec.yaml.
12-
const String pigeonVersion = '4.2.15';
12+
const String pigeonVersion = '4.2.14';
1313

1414
/// Read all the content from [stdin] to a String.
1515
String readStdin() {

‎packages/pigeon/lib/java_generator.dart‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'dart:io';
6-
7-
import 'package:path/path.dart' as path;
8-
95
import 'ast.dart';
106
import 'functional.dart';
11-
import 'generator.dart';
127
import 'generator_tools.dart';
13-
import 'pigeon_lib.dart'
14-
show Error, PigeonOptions, TaskQueueType, lineReader, openSink;
8+
import 'pigeon_lib.dart' show TaskQueueType;
159

1610
/// Documentation open symbol.
1711
const String _docCommentPrefix = '/**';
@@ -90,30 +84,6 @@ class JavaOptions {
9084
}
9185
}
9286

93-
/// A [Generator] that generates Java source code.
94-
class JavaGenerator implements Generator {
95-
/// Constructor for [JavaGenerator].
96-
const JavaGenerator();
97-
98-
@override
99-
void generate(StringSink sink, PigeonOptions options, Root root) {
100-
JavaOptions javaOptions = options.javaOptions ?? const JavaOptions();
101-
javaOptions = javaOptions.merge(JavaOptions(
102-
className: javaOptions.className ??
103-
path.basenameWithoutExtension(options.javaOut!),
104-
copyrightHeader: options.copyrightHeader != null
105-
? lineReader(options.copyrightHeader!)
106-
: null));
107-
generateJava(javaOptions, root, sink);
108-
}
109-
110-
@override
111-
IOSink? shouldGenerate(PigeonOptions options) => openSink(options.javaOut);
112-
113-
@override
114-
List<Error> validate(PigeonOptions options, Root root) => <Error>[];
115-
}
116-
11787
/// Calculates the name of the codec that will be generated for [api].
11888
String _getCodecName(Api api) => '${api.name}Codec';
11989

‎packages/pigeon/lib/kotlin_generator.dart‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'dart:io';
6-
75
import 'ast.dart';
86
import 'functional.dart';
9-
import 'generator.dart';
107
import 'generator_tools.dart';
11-
import 'pigeon_lib.dart'
12-
show Error, PigeonOptions, TaskQueueType, lineReader, openSink;
8+
import 'pigeon_lib.dart' show TaskQueueType;
139

1410
/// Documentation open symbol.
1511
const String _docCommentPrefix = '/**';
@@ -68,29 +64,6 @@ class KotlinOptions {
6864
}
6965
}
7066

71-
/// A [Generator] that generates Kotlin source code.
72-
class KotlinGenerator implements Generator {
73-
/// Constructor for [KotlinGenerator].
74-
const KotlinGenerator();
75-
76-
@override
77-
void generate(StringSink sink, PigeonOptions options, Root root) {
78-
KotlinOptions kotlinOptions =
79-
options.kotlinOptions ?? const KotlinOptions();
80-
kotlinOptions = kotlinOptions.merge(KotlinOptions(
81-
copyrightHeader: options.copyrightHeader != null
82-
? lineReader(options.copyrightHeader!)
83-
: null));
84-
generateKotlin(kotlinOptions, root, sink);
85-
}
86-
87-
@override
88-
IOSink? shouldGenerate(PigeonOptions options) => openSink(options.kotlinOut);
89-
90-
@override
91-
List<Error> validate(PigeonOptions options, Root root) => <Error>[];
92-
}
93-
9467
/// Calculates the name of the codec that will be generated for [api].
9568
String _getCodecName(Api api) => '${api.name}Codec';
9669

‎packages/pigeon/lib/objc_generator.dart‎

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'dart:io';
6-
75
import 'ast.dart';
86
import 'functional.dart';
9-
import 'generator.dart';
107
import 'generator_tools.dart';
11-
import 'pigeon_lib.dart'
12-
show Error, PigeonOptions, TaskQueueType, lineReader, openSink;
8+
import 'pigeon_lib.dart' show Error, TaskQueueType;
139

1410
/// Documentation comment open symbol.
1511
const String _docCommentPrefix = '///';
@@ -67,53 +63,6 @@ class ObjcOptions {
6763
}
6864
}
6965

70-
/// A [Generator] that generates Objective-C header code.
71-
class ObjcHeaderGenerator implements Generator {
72-
/// Constructor for [ObjcHeaderGenerator].
73-
const ObjcHeaderGenerator();
74-
75-
@override
76-
void generate(StringSink sink, PigeonOptions options, Root root) {
77-
final ObjcOptions objcOptions = options.objcOptions ?? const ObjcOptions();
78-
final ObjcOptions objcOptionsWithHeader = objcOptions.merge(ObjcOptions(
79-
copyrightHeader: options.copyrightHeader != null
80-
? lineReader(options.copyrightHeader!)
81-
: null));
82-
generateObjcHeader(objcOptionsWithHeader, root, sink);
83-
}
84-
85-
@override
86-
IOSink? shouldGenerate(PigeonOptions options) =>
87-
openSink(options.objcHeaderOut);
88-
89-
@override
90-
List<Error> validate(PigeonOptions options, Root root) =>
91-
validateObjc(options.objcOptions!, root);
92-
}
93-
94-
/// A [Generator] that generates Objective-C source code.
95-
class ObjcSourceGenerator implements Generator {
96-
/// Constructor for [ObjcSourceGenerator].
97-
const ObjcSourceGenerator();
98-
99-
@override
100-
void generate(StringSink sink, PigeonOptions options, Root root) {
101-
final ObjcOptions objcOptions = options.objcOptions ?? const ObjcOptions();
102-
final ObjcOptions objcOptionsWithHeader = objcOptions.merge(ObjcOptions(
103-
copyrightHeader: options.copyrightHeader != null
104-
? lineReader(options.copyrightHeader!)
105-
: null));
106-
generateObjcSource(objcOptionsWithHeader, root, sink);
107-
}
108-
109-
@override
110-
IOSink? shouldGenerate(PigeonOptions options) =>
111-
openSink(options.objcSourceOut);
112-
113-
@override
114-
List<Error> validate(PigeonOptions options, Root root) => <Error>[];
115-
}
116-
11766
/// Calculates the ObjC class name, possibly prefixed.
11867
String _className(String? prefix, String className) {
11968
if (prefix != null) {

0 commit comments

Comments
 (0)