Merge pull request #31 from rhgills/master

Fix autocomplete for block arguments in TyphoonDefinition factory methods not including a variable name
appsquickly · Jul 20, 2013 · 83bfd6f · 83bfd6f
2 parents ccfd371 + defa1ae
commit 83bfd6f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/Source/Component/TyphoonDefinition.h b/Source/Component/TyphoonDefinition.h
@@ -23,6 +23,10 @@ typedef enum
     TyphoonScopeSingleton
 } TyphoonScope;
 
+typedef void(^TyphoonInitializerBlock)(TyphoonInitializer* initializer);
+typedef void(^TyphoonDefinitionBlock)(TyphoonDefinition* definition);
+
+
 
 @interface TyphoonDefinition : NSObject
 {
@@ -52,12 +56,11 @@ typedef enum
 
 + (TyphoonDefinition*)withClass:(Class)clazz key:(NSString*)key;
 
-+ (TyphoonDefinition*)withClass:(Class)clazz initialization:(void (^)(TyphoonInitializer*))initialization
-        properties:(void (^)(TyphoonDefinition*))properties;
++ (TyphoonDefinition*)withClass:(Class)clazz initialization:(TyphoonInitializerBlock)initialization properties:(TyphoonDefinitionBlock)properties;
 
-+ (TyphoonDefinition*)withClass:(Class)clazz initialization:(void (^)(TyphoonInitializer*))initialization;
++ (TyphoonDefinition*)withClass:(Class)clazz initialization:(TyphoonInitializerBlock)initialization;
 
-+ (TyphoonDefinition*)withClass:(Class)clazz properties:(void (^)(TyphoonDefinition*))properties;
++ (TyphoonDefinition*)withClass:(Class)clazz properties:(TyphoonDefinitionBlock)properties;
 
 /* ====================================================================================================================================== */
 #pragma mark Initializers

diff --git a/Source/Component/TyphoonDefinition.m b/Source/Component/TyphoonDefinition.m
@@ -34,26 +34,24 @@ + (TyphoonDefinition*)withClass:(Class)clazz key:(NSString*)key
     return [[TyphoonDefinition alloc] initWithClass:clazz key:key];
 }
 
-+ (TyphoonDefinition*)withClass:(Class)clazz initialization:(void (^)(TyphoonInitializer*))initialization
++ (TyphoonDefinition*)withClass:(Class)clazz initialization:(TyphoonInitializerBlock)initialization
 {
     return [TyphoonDefinition withClass:clazz key:nil initialization:initialization properties:nil];
 }
 
-+ (TyphoonDefinition*)withClass:(Class)clazz properties:(void (^)(TyphoonDefinition*))properties
++ (TyphoonDefinition*)withClass:(Class)clazz properties:(TyphoonDefinitionBlock)properties
 {
     return [TyphoonDefinition withClass:clazz key:nil initialization:nil properties:properties];
 }
 
-+ (TyphoonDefinition*)withClass:(Class)clazz initialization:(void (^)(TyphoonInitializer*))initialization
-        properties:(void (^)(TyphoonDefinition*))properties
++ (TyphoonDefinition*)withClass:(Class)clazz initialization:(TyphoonInitializerBlock)initialization properties:(TyphoonDefinitionBlock)properties
 {
     return [TyphoonDefinition withClass:clazz key:nil initialization:initialization properties:properties];
 }
 
-+ (TyphoonDefinition*)withClass:(Class)clazz key:(NSString*)key initialization:(void (^)(TyphoonInitializer*))initialization
-        properties:(void (^)(TyphoonDefinition*))properties
++ (TyphoonDefinition*)withClass:(Class)clazz key:(NSString*)key initialization:(TyphoonInitializerBlock)initialization properties:(TyphoonDefinitionBlock)properties
 {
-
+    
     TyphoonDefinition* definition = [[TyphoonDefinition alloc] initWithClass:clazz key:key];
     if (initialization)
     {
@@ -70,12 +68,12 @@ + (TyphoonDefinition*)withClass:(Class)clazz key:(NSString*)key initialization:(
     return definition;
 }
 
-+ (TyphoonDefinition*)withClass:(Class)clazz key:(NSString*)key initialization:(void (^)(TyphoonInitializer*))initialization
++ (TyphoonDefinition*)withClass:(Class)clazz key:(NSString*)key initialization:(TyphoonInitializerBlock)initialization
 {
     return [TyphoonDefinition withClass:clazz key:key initialization:initialization properties:nil];
 }
 
-+ (TyphoonDefinition*)withClass:(Class)clazz key:(NSString*)key properties:(void (^)(TyphoonDefinition*))properties
++ (TyphoonDefinition*)withClass:(Class)clazz key:(NSString*)key properties:(TyphoonDefinitionBlock)properties
 {
     return [TyphoonDefinition withClass:clazz key:key initialization:nil properties:properties];
 }