Fixing cae, when console is asked too early

DyCI · May 27, 2015 · bd29772 · bd29772
1 parent ebcb24b
commit bd29772
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 deletions.
diff --git a/Support/Xcode/Source/Classes/Plugin/SFDYCIPlugin.m b/Support/Xcode/Source/Classes/Plugin/SFDYCIPlugin.m
@@ -77,14 +77,28 @@ - (void)setupMenu {
         [subMenu addItem:[NSMenuItem separatorItem]];
 
         // Adding inject item
-        NSMenuItem *recompileAndInjectMenuItem =
-            [[NSMenuItem alloc] initWithTitle:@"Recompile and inject"
-                                       action:@selector(recompileAndInject:)
-                                keyEquivalent:@"x"];
+        NSMenuItem *recompileAndInjectMenuItem = [[NSMenuItem alloc] initWithTitle:@"Recompile and inject" action:@selector(recompileAndInject:) keyEquivalent:@"x"];
         [recompileAndInjectMenuItem setKeyEquivalentModifierMask:NSControlKeyMask];
         [recompileAndInjectMenuItem setTarget:self];
+
         [subMenu addItem:recompileAndInjectMenuItem];
 
+        NSMenuItem *verboseRecompilationItem = [[NSMenuItem alloc] initWithTitle:@"Use verbose recompilation" action:@selector(useVerboseRecompilationAction:) keyEquivalent:@""];
+        [verboseRecompilationItem setTarget:self];
+        [subMenu addItem:verboseRecompilationItem];
+
+
+    }
+}
+
+- (void)useVerboseRecompilationAction:(NSMenuItem *)useVerboseRecompilationItem {
+    CCPXCodeConsole * console = [CCPXCodeConsole consoleForKeyWindow];
+    if (useVerboseRecompilationItem.state == NSOffState) {
+        useVerboseRecompilationItem.state = NSOnState;
+        [console log:@"DYCI verbose recompilation turned ON"];
+    } else {
+        useVerboseRecompilationItem.state = NSOffState;
+        [console log:@"DYCI verbose recompilation turned OFF"];
     }
 }
 

diff --git a/...Xcode/Source/Classes/Recompiler/implementations/PythonScript/SFDYCIClangProxyRecompiler.m b/...Xcode/Source/Classes/Recompiler/implementations/PythonScript/SFDYCIClangProxyRecompiler.m
@@ -103,4 +103,12 @@ - (BOOL)canRecompileFileAtURL:(NSURL *)fileURL {
 }
 
 
+- (CCPXCodeConsole *)console {
+    if (!_console) {
+        _console = [CCPXCodeConsole consoleForKeyWindow];
+    }
+    return _console;
+}
+
+
 @end
diff --git a/...t/Xcode/Source/Classes/Recompiler/implementations/Xcode/SFDYCIXcodeObjectiveCRecompiler.m b/...t/Xcode/Source/Classes/Recompiler/implementations/Xcode/SFDYCIXcodeObjectiveCRecompiler.m
@@ -126,6 +126,14 @@ - (void)runCompilationCommand:(id<CDRSXcode_XCDependencyCommand>)command complet
 
 #pragma mark - Creating Dylib
 
+- (CCPXCodeConsole *)console {
+    if (!_console) {
+        _console = [CCPXCodeConsole consoleForKeyWindow];
+    }
+    return _console;
+}
+
+
 - (void)createDynamiclibraryWithCommand:(id <CDRSXcode_XCDependencyCommand>)command completion:(void (^)(NSError *))completion {
 
     SFDYCIClangParams * clangParams = [self.clangParamsExtractor extractParamsFromArguments:command.arguments];

diff --git a/Support/Xcode/Source/Classes/Xcode/Helpers/CCPRunOperation.m b/Support/Xcode/Source/Classes/Xcode/Helpers/CCPRunOperation.m
@@ -165,7 +165,7 @@ - (void)runOperation
         [standardOutputFileHandle waitForDataInBackgroundAndNotify];
         [standardErrorFileHandle waitForDataInBackgroundAndNotify];
 
-        [self.xcodeConsole appendText:[NSString stringWithFormat:@"%@ %@\n\n", self.task.launchPath, [self.task.arguments componentsJoinedByString:@" "]]];
+        [self.xcodeConsole debug:[NSString stringWithFormat:@"%@ %@\n\n", self.task.launchPath, [self.task.arguments componentsJoinedByString:@" "]]];
         [self.task launch];
     }
     @catch (NSException* exception)