github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-15 01:38:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use DocumentController over document_t

Browse Source
This commit is contained in:
Allan Odgaard
2012-09-18 02:04:14 +02:00
parent c26e5c2d36
commit 848d197f7a
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Applications/TextMate/src/AppController Commands.mm
View File

@@ -32,12 +32,9 @@ OAK_DEBUG_VAR(AppController_Commands);
{
// TODO set language according to snippet’s scope selector
// TODO mark document as “not modified”
document::document_ptr doc = document::create();
doc->open();
ng::editor_ptr editor = ng::editor_for_document(doc);
editor->snippet_dispatch(item->plist(), editor->variables(item->environment(), doc->path_attributes()));
document::show(doc);
doc->close();
DocumentController* controller = [[DocumentController alloc] init];
[[controller window] makeKeyAndOrderFront:self];
[controller performBundleItem:item];
}
break;

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

@@ -288,7 +288,7 @@ void run (bundle_command_t const& command, ng::buffer_t const& buffer, ng::range
else
{
if(document && document->is_open())
baseEnv = ng::editor_for_document(document)->variables(baseEnv, document->path_attributes());
baseEnv = ng::editor_for_document(document)->variables(baseEnv, to_s([controller scopeAttributes]));
else if(document)
baseEnv = document->variables(baseEnv);
else