Merge branch 'master-skrew'

Auto saving in Xcode before injection
DyCI · May 7, 2015 · 710b3b9 · 710b3b9
2 parents 0db5f8d + f3c32ea
commit 710b3b9
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 5 deletions.
diff --git a/Support/Xcode/Binary/SFDYCIPlugin.xcplugin/Contents/Info.plist b/Support/Xcode/Binary/SFDYCIPlugin.xcplugin/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14A314h</string>
+	<string>14D136</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -23,17 +23,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6A279r</string>
+	<string>6D1002</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>14A314e</string>
+	<string>14D125</string>
 	<key>DTSDKName</key>
 	<string>macosx10.10</string>
 	<key>DTXcode</key>
-	<string>0600</string>
+	<string>0631</string>
 	<key>DTXcodeBuild</key>
-	<string>6A279r</string>
+	<string>6D1002</string>
 	<key>DVTPlugInCompatibilityUUIDs</key>
 	<array>
 		<string>640F884E-CE55-4B40-87C0-8869546CAB7A</string>

diff --git a/Support/Xcode/Binary/SFDYCIPlugin.xcplugin/Contents/MacOS/SFDYCIPlugin b/Support/Xcode/Binary/SFDYCIPlugin.xcplugin/Contents/MacOS/SFDYCIPlugin
diff --git a/Support/Xcode/Source/Classes/SFDYCIHelper.h b/Support/Xcode/Source/Classes/SFDYCIHelper.h
@@ -10,6 +10,33 @@
 #import <AppKit/AppKit.h>
 
 
+@interface IDEEditorContext : NSObject
+- (id)editor;
+@end
+
+@interface IDEEditorDocument : NSDocument
+- (void)ide_saveDocument:(id)arg1;
+@end
+
+@interface IDEEditorArea : NSObject
+- (IDEEditorContext *)lastActiveEditorContext;
+@property(readonly) IDEEditorDocument *primaryEditorDocument;
+@end
+
+@interface IDENavigatorArea : NSObject
+- (id)currentNavigator;
+@end
+
+@interface IDEWorkspaceTabController : NSObject
+@property (readonly) IDENavigatorArea *navigatorArea;
+@end
+
+@interface IDEWorkspaceWindowController : NSObject
+@property (readonly) IDEWorkspaceTabController *activeWorkspaceTabController;
+- (IDEEditorArea *)editorArea;
+@end
+
+
 @interface SFDYCIHelper : NSObject {
 
 }

diff --git a/Support/Xcode/Source/Classes/SFDYCIHelper.m b/Support/Xcode/Source/Classes/SFDYCIHelper.m
@@ -79,7 +79,29 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
 }
 
 
+- (IDEEditorDocument *)currentDocument
+{
+    NSWindowController *currentWindowController = [[NSApp keyWindow] windowController];
+    if ([currentWindowController isKindOfClass:NSClassFromString(@"IDEWorkspaceWindowController")]) {
+        IDEWorkspaceWindowController *workspaceController = (IDEWorkspaceWindowController *)currentWindowController;
+        IDEEditorArea *editorArea = [workspaceController editorArea];
+        return editorArea.primaryEditorDocument;
+    }
+    return nil;
+}
+
 - (void)recompileAndInject:(id)sender {
+
+    if ([self currentDocument]) {
+        [[self currentDocument] saveDocument:nil];
+    }
+
+    dispatch_async(dispatch_get_main_queue(), ^{ // This add a little delay for saving, maybe a perform:withDelay will be better ?
+        [self recompileAndInjectAfterSave: nil];
+    });
+}
+
+- (void)recompileAndInjectAfterSave:(id)sender {
    NSLog(@"Yupee :)");
    NSResponder * firstResponder = [[NSApp keyWindow] firstResponder];
    NSLog(@"firstResponder = %@", firstResponder);