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

Show as many parents as required to disambiguate file browser items

Browse Source
This commit is contained in:
Allan Odgaard
2018-10-30 13:45:38 +07:00
parent 0c0e9288bc
commit fd0ef648e1
1 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Frameworks/FileBrowser/src/FileBrowserView.mm
View File

@@ -418,20 +418,53 @@ static NSMutableIndexSet* MutableLongestCommonSubsequence (NSArray* lhs, NSArray
[self updateDisambiguationSuffixInParent:item];
}
- (NSString*)disambiguationSuffixForURL:(NSURL*)url numberOfParents:(NSInteger)numberOfParents
{
NSMutableArray* parentNames = [NSMutableArray array];
for(NSUInteger i = 0; i < numberOfParents; ++i)
{
NSNumber* flag;
if([url getResourceValue:&flag forKey:NSURLIsVolumeKey error:nil] && [flag boolValue])
return nil;
NSURL* parentURL;
if(![url getResourceValue:&parentURL forKey:NSURLParentDirectoryURLKey error:nil] || [url isEqual:parentURL])
return nil;
NSString* parentName;
if(![parentURL getResourceValue:&parentName forKey:NSURLLocalizedNameKey error:nil])
return nil;
[parentNames addObject:parentName];
url = parentURL;
}
return [[parentNames.reverseObjectEnumerator allObjects] componentsJoinedByString:@"/"];
}
- (void)updateDisambiguationSuffixInParent:(FileItem*)item
{
NSArray<FileItem*>* children = [item.arrangedChildren filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"URL.isFileURL == YES"]];
NSCountedSet* counts = [[NSCountedSet alloc] initWithArray:[children valueForKeyPath:@"localizedName"]];
NSArray* children = [item.arrangedChildren filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"URL.isFileURL == YES"]];
for(FileItem* child in children)
child.disambiguationSuffix = nil;
NSInteger showNumberOfParents = 1;
while(children.count)
{
NSString* suffix = nil;
if([counts countForObject:child.localizedName] > 1)
NSCountedSet* countOfConflicts = [[NSCountedSet alloc] initWithArray:[children valueForKeyPath:@"displayName"]];
NSMutableArray* conflictedChildren = [NSMutableArray array];
for(FileItem* child in children)
{
if(NSString* parentDisplayName = [NSFileManager.defaultManager displayNameAtPath:child.parentURL.path])
suffix = [@" — " stringByAppendingString:parentDisplayName];
if([countOfConflicts countForObject:child.displayName] == 1)
continue;
if(NSString* newSuffix = [self disambiguationSuffixForURL:child.URL numberOfParents:showNumberOfParents])
{
child.disambiguationSuffix = [@" — " stringByAppendingString:newSuffix];
[conflictedChildren addObject:child];
}
}
child.disambiguationSuffix = suffix;
children = conflictedChildren;
++showNumberOfParents;
}
}