github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update API to reflect that setting command runner can’t fail

Browse Source
This commit is contained in:
Allan Odgaard
2014-03-09 16:26:56 +07:00
parent 3e603dd238
commit 16c09c2a92
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Frameworks/DocumentWindow/src/DocumentCommand.mm
View File

@@ -80,14 +80,8 @@ bool delegate_t::accept_html_data (command::runner_ptr runner, char const* data,
{
_did_open_html_window = true;
if(_controller)
{
if(![_controller setCommandRunner:runner])
oak::kill_process_group_in_background(runner->process_id());
}
else
{
[HTMLOutputWindowController HTMLOutputWindowWithRunner:runner];
}
[_controller setCommandRunner:runner];
else [HTMLOutputWindowController HTMLOutputWindowWithRunner:runner];
}
return true;
}

2
Frameworks/DocumentWindow/src/DocumentController.h
View File

@@ -43,7 +43,7 @@ PUBLIC @interface DocumentController : NSObject
- (NSPoint)positionForWindowUnderCaret;
- (void)performBundleItem:(bundles::item_ptr const&)anItem;
- (BOOL)setCommandRunner:(command::runner_ptr const&)aRunner;
- (void)setCommandRunner:(command::runner_ptr const&)aRunner;
- (IBAction)toggleHTMLOutput:(id)sender;
- (IBAction)moveFocus:(id)sender;

3
Frameworks/DocumentWindow/src/DocumentController.mm
View File

@@ -1834,7 +1834,7 @@ namespace
else self.htmlOutputVisible = !self.htmlOutputVisible;
}
- (BOOL)setCommandRunner:(command::runner_ptr const&)aRunner
- (void)setCommandRunner:(command::runner_ptr const&)aRunner
{
_runner = aRunner;
if(self.htmlOutputInWindow || self.htmlOutputView.runningCommand)
@@ -1874,7 +1874,6 @@ namespace
[self.window makeFirstResponder:self.htmlOutputView.webView];
[self.htmlOutputView loadRequest:URLRequestForCommandRunner(_runner) environment:_runner->environment() autoScrolls:_runner->auto_scroll_output()];
}
return YES;
}
// =============================