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 displayNameWithExtension: when creating backup name

Browse Source
This commit is contained in:
Allan Odgaard
2016-07-08 10:02:23 +02:00
parent a00a4c2d86
commit a425ec3c27
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Frameworks/document/src/OakDocument.mm
View File

@@ -145,16 +145,6 @@ NSString* OakDocumentMarksDidChangeNotification = @"OakDocumentMarksDidChangeN
NSString* OakDocumentDidSaveNotification = @"OakDocumentDidSaveNotification";
NSString* OakDocumentWillCloseNotification = @"OakDocumentWillCloseNotification";
static NSString* FileExtensionForGrammar (parse::grammar_ptr grammar)
{
if(grammar)
{
if(bundles::item_ptr grammarItem = bundles::lookup(grammar->uuid()))
return to_ns(grammarItem->value_for_field(bundles::kFieldGrammarExtension));
}
return nil;
}
@interface OakDocument ()
{
OBJC_WATCH_LEAKS(OakDocument);
@@ -527,14 +517,7 @@ private:
if(![[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nullptr])
return nil;
path = [path stringByAppendingPathComponent:[self.displayName stringByReplacingOccurrencesOfString:@"/" withString:@":"]];
if(_buffer && (!_path || _customName && OakIsEmptyString([_customName pathExtension])))
{
if(NSString* ext = FileExtensionForGrammar(_buffer->grammar()))
path = [path stringByAppendingPathExtension:ext];
}
path = [path stringByAppendingPathComponent:[self displayNameWithExtension:YES]];
return to_ns(path::unique(to_s(path)));
}