Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 0967005

Browse files
zhongwuzwzhongwuzw
committed
clang tidy
1 parent 7c17b38 commit 0967005

File tree

7 files changed

+60
-56
lines changed

7 files changed

+60
-56
lines changed

‎shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ FLUTTER_DARWIN_EXPORT
7979
* @param package The name of the package from which the asset originates.
8080
* @return the file name to be used for lookup in the main bundle.
8181
*/
82-
- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset fromPackage:(nonnull NSString*)package;
82+
- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset
83+
fromPackage:(nonnull NSString*)package;
8384

8485
@end
8586

‎shell/platform/darwin/macos/framework/Headers/FlutterViewController.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ FLUTTER_DARWIN_EXPORT
9393
* @param package The name of the package from which the asset originates.
9494
* @return The file name to be used for lookup in the main bundle.
9595
*/
96-
- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset fromPackage:(nonnull NSString*)package;
96+
- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset
97+
fromPackage:(nonnull NSString*)package;
9798

9899
/**
99100
* The contentView (FlutterView)'s background color is set to black during

‎shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -90,37 +90,37 @@ - (NSString*)ICUDataPath {
9090
}
9191

9292
+ (NSString*)flutterAssetsName:(NSBundle*)bundle {
93-
if (bundle == nil) {
94-
bundle = [NSBundle bundleWithIdentifier:kAppBundleIdentifier];
95-
}
96-
if (bundle == nil) {
97-
bundle = [NSBundle mainBundle];
98-
}
99-
NSString* flutterAssetsName = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
100-
if (flutterAssetsName == nil) {
101-
flutterAssetsName = @"Contents/Frameworks/App.framework/Resources/flutter_assets";
102-
}
103-
return flutterAssetsName;
93+
if (bundle == nil) {
94+
bundle = [NSBundle bundleWithIdentifier:kAppBundleIdentifier];
95+
}
96+
if (bundle == nil) {
97+
bundle = [NSBundle mainBundle];
98+
}
99+
NSString* flutterAssetsName = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
100+
if (flutterAssetsName == nil) {
101+
flutterAssetsName = @"Contents/Frameworks/App.framework/Resources/flutter_assets";
102+
}
103+
return flutterAssetsName;
104104
}
105105

106106
+ (NSString*)lookupKeyForAsset:(NSString*)asset {
107-
return [self lookupKeyForAsset:asset fromBundle:nil];
107+
return [self lookupKeyForAsset:asset fromBundle:nil];
108108
}
109109

110110
+ (NSString*)lookupKeyForAsset:(NSString*)asset fromBundle:(nullable NSBundle*)bundle {
111-
NSString* flutterAssetsName = [FlutterDartProject flutterAssetsName:bundle];
112-
return [NSString stringWithFormat:@"%@/%@", flutterAssetsName, asset];
111+
NSString* flutterAssetsName = [FlutterDartProject flutterAssetsName:bundle];
112+
return [NSString stringWithFormat:@"%@/%@", flutterAssetsName, asset];
113113
}
114114

115115
+ (NSString*)lookupKeyForAsset:(NSString*)asset fromPackage:(NSString*)package {
116-
return [self lookupKeyForAsset:asset fromPackage:package fromBundle:nil];
116+
return [self lookupKeyForAsset:asset fromPackage:package fromBundle:nil];
117117
}
118118

119119
+ (NSString*)lookupKeyForAsset:(NSString*)asset
120120
fromPackage:(NSString*)package
121121
fromBundle:(nullable NSBundle*)bundle {
122-
return [self lookupKeyForAsset:[NSString stringWithFormat:@"packages/%@/%@", package, asset]
123-
fromBundle:bundle];
122+
return [self lookupKeyForAsset:[NSString stringWithFormat:@"packages/%@/%@", package, asset]
123+
fromBundle:bundle];
124124
}
125125

126126
@end

‎shell/platform/darwin/macos/framework/Source/FlutterEngine.mm

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -768,11 +768,11 @@ - (NSPasteboard*)pasteboard {
768768
}
769769

770770
- (NSString*)lookupKeyForAsset:(NSString*)asset {
771-
return [FlutterDartProject lookupKeyForAsset:asset];
771+
return [FlutterDartProject lookupKeyForAsset:asset];
772772
}
773773

774774
- (NSString*)lookupKeyForAsset:(NSString*)asset fromPackage:(NSString*)package {
775-
return [FlutterDartProject lookupKeyForAsset:asset fromPackage:package];
775+
return [FlutterDartProject lookupKeyForAsset:asset fromPackage:package];
776776
}
777777

778778
#pragma mark - FlutterBinaryMessenger
@@ -959,54 +959,54 @@ - (void)postMainThreadTask:(FlutterTask)task targetTimeInNanoseconds:(uint64_t)t
959959
@end
960960

961961
@implementation FlutterEngineRegistrar {
962-
NSString* _pluginKey;
963-
FlutterEngine* _flutterEngine;
962+
NSString* _pluginKey;
963+
FlutterEngine* _flutterEngine;
964964
}
965965

966966
- (instancetype)initWithPlugin:(NSString*)pluginKey flutterEngine:(FlutterEngine*)flutterEngine {
967-
self = [super init];
968-
if (self) {
969-
_pluginKey = [pluginKey copy];
970-
_flutterEngine = flutterEngine;
971-
}
972-
return self;
967+
self = [super init];
968+
if (self) {
969+
_pluginKey = [pluginKey copy];
970+
_flutterEngine = flutterEngine;
971+
}
972+
return self;
973973
}
974974

975975
#pragma mark - FlutterPluginRegistrar
976976

977977
- (id<FlutterBinaryMessenger>)messenger {
978-
return _flutterEngine.binaryMessenger;
978+
return _flutterEngine.binaryMessenger;
979979
}
980980

981981
- (id<FlutterTextureRegistry>)textures {
982-
return _flutterEngine.renderer;
982+
return _flutterEngine.renderer;
983983
}
984984

985985
- (NSView*)view {
986-
if (!_flutterEngine.viewController.viewLoaded) {
987-
[_flutterEngine.viewController loadView];
988-
}
989-
return _flutterEngine.viewController.flutterView;
986+
if (!_flutterEngine.viewController.viewLoaded) {
987+
[_flutterEngine.viewController loadView];
988+
}
989+
return _flutterEngine.viewController.flutterView;
990990
}
991991

992992
- (void)addMethodCallDelegate:(nonnull id<FlutterPlugin>)delegate
993993
channel:(nonnull FlutterMethodChannel*)channel {
994-
[channel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
995-
[delegate handleMethodCall:call result:result];
996-
}];
994+
[channel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
995+
[delegate handleMethodCall:call result:result];
996+
}];
997997
}
998998

999999
- (void)registerViewFactory:(nonnull NSObject<FlutterPlatformViewFactory>*)factory
10001000
withId:(nonnull NSString*)factoryId {
1001-
[[_flutterEngine platformViewController] registerViewFactory:factory withId:factoryId];
1001+
[[_flutterEngine platformViewController] registerViewFactory:factory withId:factoryId];
10021002
}
10031003

10041004
- (NSString*)lookupKeyForAsset:(NSString*)asset {
1005-
return [FlutterDartProject lookupKeyForAsset:asset];
1005+
return [FlutterDartProject lookupKeyForAsset:asset];
10061006
}
10071007

10081008
- (NSString*)lookupKeyForAsset:(NSString*)asset fromPackage:(NSString*)package {
1009-
return [FlutterDartProject lookupKeyForAsset:asset fromPackage:package];
1009+
return [FlutterDartProject lookupKeyForAsset:asset fromPackage:package];
10101010
}
10111011

10121012
@end

‎shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,8 @@
113113
* @param package The name of the package from which the asset originates.
114114
* @return The file name to be used for lookup in the main bundle.
115115
*/
116-
- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset fromPackage:(nonnull NSString*)package;
117-
118-
116+
- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset
117+
fromPackage:(nonnull NSString*)package;
119118

120119
@end
121120

‎shell/platform/darwin/macos/framework/Source/FlutterViewController.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,11 +689,11 @@ - (void)onKeyboardLayoutChanged {
689689
}
690690

691691
- (NSString*)lookupKeyForAsset:(NSString*)asset {
692-
return [_engine lookupKeyForAsset:asset];
692+
return [_engine lookupKeyForAsset:asset];
693693
}
694694

695695
- (NSString*)lookupKeyForAsset:(NSString*)asset fromPackage:(NSString*)package {
696-
return [_engine lookupKeyForAsset:asset fromPackage:package];
696+
return [_engine lookupKeyForAsset:asset fromPackage:package];
697697
}
698698

699699
#pragma mark - FlutterViewReshapeListener

‎shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ id MockGestureEvent(NSEventType type, NSEventPhase phase, double magnification,
171171
}
172172

173173
TEST(FlutterViewControllerTest, testLookupKeyAssets) {
174-
ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testLookupKeyAssets]);
174+
ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testLookupKeyAssets]);
175175
}
176176

177177
} // namespace flutter::testing
@@ -731,15 +731,18 @@ - (bool)testViewWillAppearCalledMultipleTimes {
731731
}
732732

733733
- (bool)testLookupKeyAssets {
734-
FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:nil];
735-
NSString *key = [viewController lookupKeyForAsset:@"test.png"];
736-
EXPECT_TRUE([key isEqualToString:@"Contents/Frameworks/App.framework/Resources/flutter_assets/test.png"]);
737-
738-
NSString *packageKey = [viewController lookupKeyForAsset:@"test.png" fromPackage:@"test"];
739-
NSLog(@"%@",packageKey);
740-
EXPECT_TRUE([packageKey isEqualToString:@"Contents/Frameworks/App.framework/Resources/flutter_assets/packages/test/test.png"]);
741-
742-
return true;
734+
FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:nil];
735+
NSString* key = [viewController lookupKeyForAsset:@"test.png"];
736+
EXPECT_TRUE(
737+
[key isEqualToString:@"Contents/Frameworks/App.framework/Resources/flutter_assets/test.png"]);
738+
739+
NSString* packageKey = [viewController lookupKeyForAsset:@"test.png" fromPackage:@"test"];
740+
NSLog(@"%@", packageKey);
741+
EXPECT_TRUE([packageKey
742+
isEqualToString:
743+
@"Contents/Frameworks/App.framework/Resources/flutter_assets/packages/test/test.png"]);
744+
745+
return true;
743746
}
744747

745748
@end

0 commit comments

Comments
 (0)