Fix method declarations, remove if statement fixer regex

mixpanel · Nov 18, 2013 · 8a36d06 · 8a36d06
1 parent a7e4aa6
commit 8a36d06
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/HelloMixpanel/HelloMixpanelTests/HelloMixpanelTests.m b/HelloMixpanel/HelloMixpanelTests/HelloMixpanelTests.m
@@ -79,7 +79,7 @@ - (void)tearDown
     self.mixpanel = nil;
 }
 
-- (void) setupHTTPServer
+- (void)setupHTTPServer
 {
     if (!self.httpServer) {
         self.httpServer = [[HTTPServer alloc] init];

diff --git a/HelloMixpanel/HelloMixpanelTests/MixpanelDummyHTTPConnection.h b/HelloMixpanel/HelloMixpanelTests/MixpanelDummyHTTPConnection.h
@@ -10,6 +10,6 @@
 
 @interface MixpanelDummyHTTPConnection : HTTPConnection
 
-+(int) getRequestCount;
++ (int)getRequestCount;
 
 @end
diff --git a/HelloMixpanel/HelloMixpanelTests/MixpanelDummyHTTPConnection.m b/HelloMixpanel/HelloMixpanelTests/MixpanelDummyHTTPConnection.m
@@ -18,7 +18,7 @@ + (void)initialize
     requestCount = 0;
 }
 
-+(int) getRequestCount
++ (int)getRequestCount
 {
     return requestCount;
 }
@@ -29,7 +29,7 @@ +(int) getRequestCount
     return [[HTTPDataResponse alloc] initWithData:[@"1" dataUsingEncoding:NSUTF8StringEncoding]];
 }
 
-- (BOOL) supportsMethod:(NSString *)method atPath:(NSString *)path
+- (BOOL)supportsMethod:(NSString *)method atPath:(NSString *)path
 {
     return [super supportsMethod:method atPath:path] || [method isEqualToString:@"POST"];
 }

diff --git a/Mixpanel/MPSurveyQuestionViewController.m b/Mixpanel/MPSurveyQuestionViewController.m
@@ -272,7 +272,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     return cell;
 }
 
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     MPSurveyTableViewCell *cell = (MPSurveyTableViewCell *)[tableView cellForRowAtIndexPath:indexPath];
     if (!cell.isChecked) {
@@ -286,7 +286,7 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *
     }
 }
 
--(void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath
+- (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     MPSurveyTableViewCell *cell = (MPSurveyTableViewCell *)[tableView cellForRowAtIndexPath:indexPath];
     if (cell.isChecked) {

diff --git a/fix_syntax.py b/fix_syntax.py
@@ -9,8 +9,7 @@
                 lambda m: '%s\n\n' % m.groups(1)), #add blank lines after interface or implementation declarations (except where the interface line ends in a '{')
             (r'(?<=[^\n])\n@end', lambda m: '\n\n@end' ), #add blank lines before @end
             (r'for[ ]*\((.*)\)\s*{\n', lambda m: 'for (%s) {\n' % m.group(1)), #correct spacing for for loops
-            (r'if[ ]*\((.*)\)\s*{\n', lambda m: 'if (%s) {\n' % m.group(1)), #correct spacing for if statements
-            (r'}\s*else\s*{', '} else {'), #correct spacing for if statements
+            (r'}\s*else\s*{', '} else {'), #correct spacing for else statements
             (r'for \([ ]*uint[ ]+', 'for (NSUInteger '), #use NSUinteger instead of uint
             (r'for \([ ]*int[ ]+', 'for (NSInteger '), #use NSinteger instead of int
             (r'\n([+-])[ ]*\((\w+\s*\*?)\)\s*', lambda m: '\n%s (%s)' % (m.group(1), m.group(2))), #proper spacing in method definitions