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

fixup! Fix infinite loop for documents outside project folder

Browse Source
This commit is contained in:
Allan Odgaard
2013-02-05 23:31:08 +01:00
parent c351b89324
commit 2802a32df9
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -895,17 +895,14 @@ namespace
if(!_documentPath && !_projectPath)
return;
std::string projectDir = to_s(_projectPath ?: NSHomeDirectory());
std::string const documentDir = _documentPath ? to_s(_documentPath) : path::join(projectDir, "dummy");
if(!path::is_child(documentDir, projectDir))
projectDir = documentDir;
std::string const projectDir = to_s(_projectPath ?: NSHomeDirectory());
std::string const documentPath = _documentPath ? to_s(_documentPath) : path::join(projectDir, "dummy");
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
std::vector<std::string> res;
std::set<std::string> groups;
std::string dir = documentDir;
std::string dir = documentPath;
do {
dir = path::parent(dir);
@@ -930,12 +927,12 @@ namespace
}
}
} while(dir != projectDir);
} while(path::is_child(dir, projectDir) && dir != projectDir);
dispatch_async(dispatch_get_main_queue(), ^{
std::string const currentProjectDir = to_s(_projectPath ?: @"/");
std::string const currentDocumentDir = _documentPath ? to_s(_documentPath) : path::join(projectDir, "dummy");
if(projectDir == currentProjectDir && documentDir == currentDocumentDir)
std::string const currentProjectDir = to_s(_projectPath ?: NSHomeDirectory());
std::string const currentDocumentPath = _documentPath ? to_s(_documentPath) : path::join(projectDir, "dummy");
if(projectDir == currentProjectDir && currentDocumentPath == currentDocumentPath)
_externalScopeAttributes = res;
});