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

Deleted bundle items were returned when asking for disabled items

Browse Source 
This would cause deleted (delta) items to show up in the bundle editor (as it queries the bundle manager for disabled items and would thus also get the deleted ones).
This commit is contained in:
Allan Odgaard
2014-01-31 19:06:31 +07:00
parent 7ced73244f
commit 1092afde25
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Frameworks/bundles/src/query.cc
View File

@@ -13,9 +13,14 @@ namespace bundles
void add_callback (callback_t* cb) { Callbacks.add(cb); }
void remove_callback (callback_t* cb) { Callbacks.remove(cb); }
static bool deleted_or_disabled (item_ptr item)
static bool is_deleted (item_ptr item)
{
return item->deleted() || item->disabled() || item->bundle() && (item->bundle()->deleted() || item->bundle()->disabled());
return item->deleted() || item->bundle() && item->bundle()->deleted();
}
static bool is_disabled (item_ptr item)
{
return item->disabled() || item->bundle() && item->bundle()->disabled();
}
namespace
@@ -31,7 +36,7 @@ namespace bundles
std::multimap<std::string, item_ptr>& res = _cache[field];
iterate(item, AllItems)
{
if(deleted_or_disabled(*item))
if(is_deleted(*item) || is_disabled(*item))
continue;
citerate(value, (*item)->values_for_field(field))
res.emplace(*value, *item);
@@ -232,7 +237,7 @@ namespace bundles
{
iterate(item, AllItems)
{
if(!includeDisabledItems && deleted_or_disabled(*item))
if(is_deleted(*item) || !includeDisabledItems && is_disabled(*item))
continue;
double rank = 1.0;
@@ -295,7 +300,7 @@ namespace bundles
std::vector<item_ptr> res;
iterate(item, cache().menu(_uuid))
{
if(!includeDisabledItems && deleted_or_disabled(*item))
if(is_deleted(*item) || !includeDisabledItems && is_disabled(*item))
continue;
res.push_back(*item);
}