do not restrict uncrustification to Objective-C files

benoitsan · Jul 18, 2013 · 785cde9 · mengelbrecht · Aug 21, 2013 · 785cde9
1 parent ceeddb5
commit 785cde9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Classes/BBUncrustify.m b/Classes/BBUncrustify.m
@@ -157,6 +157,13 @@ + (void)uncrustifyFilesAtURLs:(NSArray *)fileURLs configurationFileURL:(NSURL *)
     [fileURLs enumerateObjectsWithOptions:0 usingBlock:^(NSURL *fileURL, NSUInteger idx, BOOL *stop) {
         if ([[NSFileManager defaultManager] fileExistsAtPath:fileURL.path]) {
             NSMutableArray *args = NSMutableArray.array;
+
+            NSString *uti = [[NSWorkspace sharedWorkspace] typeOfFile:fileURL.path error:nil];
+            BOOL isObjectiveCFile = ([[NSWorkspace sharedWorkspace] type:uti conformsToType:(NSString *)kUTTypeObjectiveCSource] || [[NSWorkspace sharedWorkspace] type:uti conformsToType:(NSString *)kUTTypeCHeader]);
+            if (isObjectiveCFile) {
+                [args addObjectsFromArray:@[@"-l", @"OC"]];
+            }
+
             [args addObjectsFromArray:@[@"--frag", @"--no-backup"]];
             [args addObjectsFromArray:@[@"-c", configurationFileURL.path, fileURL.path]];
 

diff --git a/Classes/BBXcode.h b/Classes/BBXcode.h
@@ -127,7 +127,7 @@ typedef NS_ENUM (NSUInteger, BBCodeFormattingScheme) {
 + (IDEWorkspaceDocument *)currentWorkspaceDocument;
 + (IDESourceCodeDocument *)currentSourceCodeDocument;
 + (NSTextView *)currentSourceCodeTextView;
-+ (NSArray *)selectedObjCFileNavigableItems;
++ (NSArray *)selectedSourceCodeFileNavigableItems;
 + (BOOL)uncrustifyCodeOfDocument:(IDESourceCodeDocument *)document inWorkspace:(IDEWorkspace *)workspace;
 + (BOOL)uncrustifyCodeAtRanges:(NSArray *)ranges document:(IDESourceCodeDocument *)document inWorkspace:(IDEWorkspace *)workspace;
 @end
diff --git a/Classes/BBXcode.m b/Classes/BBXcode.m
@@ -88,9 +88,8 @@ + (NSTextView *)currentSourceCodeTextView {
     return nil;
 }
 
-+ (NSArray *)selectedObjCFileNavigableItems {
++ (NSArray *)selectedSourceCodeFileNavigableItems {
     NSMutableArray *mutableArray = [NSMutableArray array];
-
     id currentWindowController = [[NSApp keyWindow] windowController];
     if ([currentWindowController isKindOfClass:NSClassFromString(@"IDEWorkspaceWindowController")]) {
         IDEWorkspaceWindowController *workspaceController = currentWindowController;
@@ -104,7 +103,7 @@ + (NSArray *)selectedObjCFileNavigableItems {
                 if ([selectedObject isKindOfClass:NSClassFromString(@"IDEFileNavigableItem")]) {
                     IDEFileNavigableItem *fileNavigableItem = selectedObject;
                     NSString *uti = fileNavigableItem.documentType.identifier;
-                    if ([uti isEqualToString:(NSString *)kUTTypeObjectiveCSource] || [uti isEqualToString:(NSString *)kUTTypeCHeader]) {
+                    if ([[NSWorkspace sharedWorkspace] type:uti conformsToType:(NSString *)kUTTypeSourceCode]) {
                         [mutableArray addObject:fileNavigableItem];
                     }
                 }