-
Notifications
You must be signed in to change notification settings - Fork 111
[ffigen] Propagate C/ObjC deprecation messages to Dart #3095
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.
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
Open
YATIN072007
wants to merge
2
commits into
dart-lang:main
Choose a base branch
from
YATIN072007:fix-deprecation-propagation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -156,7 +156,7 @@ String configPath(String directory, String file) => | |
| absPath(configPathForTest(directory, file)); | ||
|
|
||
| /// Returns the temp directory used to store bindings generated by tests. | ||
| String tmpDir = path.join(packagePathForTests, 'test', '.temp'); | ||
| String tmpDir = path.join(packagePathForTests, 'test', '.temp with spaces'); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you've mixed in changes from your other PR. Please revert these changes. |
||
|
|
||
| /// Generates actual file using library and tests using [expect] with expected. | ||
| /// | ||
|
|
||
174 changes: 174 additions & 0 deletions
174
pkgs/ffigen/test/unit_tests/deprecation_codegen_test.dart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
|
|
||
| import 'dart:ffi' as ffi; | ||
| import 'package:ffigen/src/code_generator.dart'; | ||
| import 'package:ffigen/src/code_generator/objc_interface.dart'; | ||
| import 'package:ffigen/src/code_generator/objc_methods.dart'; | ||
| import 'package:ffigen/src/config_provider/config.dart'; | ||
| import 'package:ffigen/src/config_provider/config_types.dart'; | ||
| import 'package:ffigen/src/context.dart'; | ||
| import 'package:ffigen/src/header_parser/clang_bindings/clang_bindings.dart'; | ||
| import 'package:ffigen/src/header_parser/sub_parsers/api_availability.dart'; | ||
| import 'package:logging/logging.dart'; | ||
| import 'package:test/test.dart'; | ||
|
|
||
| import '../test_utils.dart'; | ||
|
|
||
| void main() { | ||
| group('Deprecation Codegen', () { | ||
| late Context context; | ||
|
|
||
| setUp(() { | ||
| // Set a dummy clang to bypass libclang loading. | ||
| clang = Clang.fromLookup(<T extends ffi.NativeType>(String name) { | ||
| return ffi.Pointer<ffi.Void>.fromAddress(0).cast<T>(); | ||
| }); | ||
|
|
||
| final ffiGen = FfiGenerator( | ||
| output: Output(dartFile: Uri.file('unused.dart')), | ||
| headers: Headers(entryPoints: [Uri.file('unused.h')]), | ||
| functions: Functions.includeAll, | ||
| structs: Structs.includeAll, | ||
| enums: Enums.includeAll, | ||
| typedefs: Typedefs.includeAll, | ||
| objectiveC: const ObjectiveC( | ||
| interfaces: Interfaces.includeAll, | ||
| protocols: Protocols.includeAll, | ||
| categories: Categories.includeAll, | ||
| ), | ||
| ); | ||
| context = Context(Logger('test'), ffiGen); | ||
| }); | ||
|
|
||
| test('func_deprecated', () { | ||
| final func = Func( | ||
| name: 'func_deprecated', | ||
| returnType: voidType, | ||
| originalName: 'func_deprecated', | ||
| )..deprecatedMessage = 'Deprecated'; | ||
|
|
||
| final library = Library( | ||
| context: context, | ||
| bindings: [func], | ||
| ); | ||
| library.forceFillNamesForTesting(); | ||
|
|
||
| final generated = library.generate(); | ||
| expect(generated, contains('@Deprecated("Deprecated")')); | ||
| expect(generated, contains('void func_deprecated()')); | ||
| }); | ||
|
|
||
| test('struct_deprecated', () { | ||
| final struct = Struct( | ||
| name: 'DeprecatedStruct', | ||
| context: context, | ||
| )..deprecatedMessage = 'struct deprecated'; | ||
|
|
||
| final library = Library( | ||
| context: context, | ||
| bindings: [struct], | ||
| ); | ||
| library.forceFillNamesForTesting(); | ||
|
|
||
| final generated = library.generate(); | ||
| expect(generated, contains('@Deprecated("struct deprecated")')); | ||
| expect(generated, contains('final class DeprecatedStruct extends ffi.Opaque')); | ||
| }); | ||
|
|
||
| test('enum_deprecated', () { | ||
| final enumClass = EnumClass( | ||
| name: 'DeprecatedEnum', | ||
| context: context, | ||
| )..deprecatedMessage = 'enum deprecated'; | ||
|
|
||
| final library = Library( | ||
| context: context, | ||
| bindings: [enumClass], | ||
| ); | ||
| library.forceFillNamesForTesting(); | ||
|
|
||
| final generated = library.generate(); | ||
| expect(generated, contains('@Deprecated("enum deprecated")')); | ||
| expect(generated, contains('class DeprecatedEnum')); | ||
| }); | ||
|
|
||
| test('typedef_deprecated', () { | ||
| final typedef = Typealias( | ||
| name: 'DeprecatedTypedef', | ||
| type: intType, | ||
| )..deprecatedMessage = 'typedef deprecated'; | ||
|
|
||
| final library = Library( | ||
| context: context, | ||
| bindings: [typedef], | ||
| ); | ||
| library.forceFillNamesForTesting(); | ||
|
|
||
| final generated = library.generate(); | ||
| expect(generated, contains('@Deprecated("typedef deprecated")')); | ||
| expect(generated, contains('typedef DeprecatedTypedef = ffi.Int;')); | ||
| }); | ||
|
|
||
| test('objc_interface_deprecated', () { | ||
| final itf = ObjCInterface( | ||
| originalName: 'DeprecatedInterface', | ||
| apiAvailability: ApiAvailability( | ||
| alwaysDeprecated: true, | ||
| deprecatedMessage: 'interface deprecated', | ||
| externalVersions: null, | ||
| ), | ||
| context: context, | ||
| ); | ||
|
|
||
| final library = Library( | ||
| context: context, | ||
| bindings: [itf], | ||
| ); | ||
| library.forceFillNamesForTesting(); | ||
|
|
||
| final generated = library.generate(); | ||
| expect(generated, contains('@Deprecated("interface deprecated")')); | ||
| expect(generated, contains('extension type DeprecatedInterface')); | ||
| }); | ||
|
|
||
| test('objc_method_deprecated', () { | ||
| final itf = ObjCInterface( | ||
| originalName: 'InterfaceWithDeprecatedMethod', | ||
| apiAvailability: ApiAvailability(externalVersions: null), | ||
| context: context, | ||
| ); | ||
| final method = ObjCMethod( | ||
| context: context, | ||
| originalName: 'deprecatedMethod', | ||
| name: 'deprecatedMethod', | ||
| kind: ObjCMethodKind.method, | ||
| isClassMethod: false, | ||
| isOptional: false, | ||
| returnType: voidType, | ||
| params: [], | ||
| family: null, | ||
| apiAvailability: ApiAvailability( | ||
| alwaysDeprecated: true, | ||
| deprecatedMessage: 'method deprecated', | ||
| externalVersions: null, | ||
| ), | ||
| ownershipAttribute: null, | ||
| consumesSelfAttribute: false, | ||
| deprecatedMessage: 'method deprecated', | ||
| ); | ||
| itf.addMethod(method); | ||
|
|
||
| // We need to fill the method's msgSend to avoid late initialization error during generation | ||
| method.msgSend = context.objCBuiltInFunctions.getMsgSendFunc(voidType, []); | ||
|
|
||
| final library = Library( | ||
| context: context, | ||
| bindings: [itf], | ||
| ); | ||
| library.forceFillNamesForTesting(); | ||
|
|
||
| final generated = library.generate(); | ||
| expect(generated, contains('@Deprecated("method deprecated")')); | ||
| expect(generated, contains('void deprecatedMethod()')); | ||
| }); | ||
| }); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
|
|
||
| import 'package:ffigen/src/code_generator/utils.dart'; | ||
| import 'package:test/test.dart'; | ||
|
|
||
| void main() { | ||
| test('makeDeprecatedAnnotation', () { | ||
| expect(makeDeprecatedAnnotation(null), ''); | ||
| expect(makeDeprecatedAnnotation(''), "@Deprecated('Deprecated')"); | ||
| expect(makeDeprecatedAnnotation('foo'), '@Deprecated("foo")'); | ||
| expect(makeDeprecatedAnnotation('foo "bar"'), r'@Deprecated("foo \"bar\"")'); | ||
| expect(makeDeprecatedAnnotation(r'foo $bar'), r'@Deprecated("foo \$bar")'); | ||
| }); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you're setting a dummy
clangindeprecation_codegen_test.dart, why do you also need this environment variable stuff? Seems like they do the same job.