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

Do not overstrike settings items when searching all scopes

Browse Source
This commit is contained in:
Allan Odgaard
2014-09-06 10:39:51 +02:00
parent 461915cb34
commit b11a1d05a4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Frameworks/OakFilterList/src/BundleItemChooser.mm
View File

@@ -561,8 +561,11 @@ static std::vector<bundles::item_ptr> relevant_items_in_scope (scope::context_t
}
NSMutableAttributedString* title = CreateAttributedStringWithMarkedUpRanges(fullName, ranges);
if(!previousSettings.insert(pair.first).second)
[title addAttribute:NSStrikethroughStyleAttributeName value:@(NSUnderlineStyleSingle|NSUnderlinePatternSolid) range:NSMakeRange(0, [[NSString stringWithCxxString:pair.first] length])];
if(!self.searchAllScopes)
{
if(!previousSettings.insert(pair.first).second)
[title addAttribute:NSStrikethroughStyleAttributeName value:@(NSUnderlineStyleSingle|NSUnderlinePatternSolid) range:NSMakeRange(0, [[NSString stringWithCxxString:pair.first] length])];
}
rankedItems.emplace(rankedItems.size(), [BundleItemChooserItem bundleChooserItemWithItem:item title:title]);
}
@@ -571,8 +574,11 @@ static std::vector<bundles::item_ptr> relevant_items_in_scope (scope::context_t
auto const shellVariables = shell_variables(item);
bool eclipsed = false;
for(auto const& pair : shellVariables)
eclipsed = !previousVariables.insert(pair.first).second || eclipsed;
if(!self.searchAllScopes)
{
for(auto const& pair : shellVariables)
eclipsed = !previousVariables.insert(pair.first).second || eclipsed;
}
for(auto const& pair : shellVariables)
{