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

fixup! No longer support deleted items in bundle’s info.plist

Browse Source 
We still need to cache the ‘deleted’ key since delta items use this to indicate keys deleted in the local version.
This commit is contained in:
Allan Odgaard
2013-03-18 14:34:08 +01:00
parent 916725b0d2
commit 21bf41b0c6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Frameworks/bundles/src/io.cc
View File

@@ -9,6 +9,7 @@
namespace bundles
{
static std::string const kFieldChangedItems = "changed";
static std::string const kFieldDeletedItems = "deleted";
static std::string const kFieldMainMenu = "mainMenu";
static std::string const kSeparatorString = "------------------------------------";
@@ -117,7 +118,7 @@ namespace bundles
static plist::dictionary_t prune_dictionary (plist::dictionary_t const& plist)
{
static std::set<std::string> const DesiredKeys = { kFieldName, kFieldKeyEquivalent, kFieldTabTrigger, kFieldScopeSelector, kFieldSemanticClass, kFieldContentMatch, kFieldGrammarFirstLineMatch, kFieldGrammarScope, kFieldGrammarInjectionSelector, kFieldDropExtension, kFieldGrammarExtension, kFieldSettingName, kFieldHideFromUser, kFieldIsDeleted, kFieldIsDisabled, kFieldRequiredItems, kFieldUUID, kFieldMainMenu, kFieldIsDelta, kFieldChangedItems };
static std::set<std::string> const DesiredKeys = { kFieldName, kFieldKeyEquivalent, kFieldTabTrigger, kFieldScopeSelector, kFieldSemanticClass, kFieldContentMatch, kFieldGrammarFirstLineMatch, kFieldGrammarScope, kFieldGrammarInjectionSelector, kFieldDropExtension, kFieldGrammarExtension, kFieldSettingName, kFieldHideFromUser, kFieldIsDeleted, kFieldIsDisabled, kFieldRequiredItems, kFieldUUID, kFieldMainMenu, kFieldIsDelta, kFieldDeletedItems, kFieldChangedItems };
plist::dictionary_t res;
citerate(pair, plist)
@@ -155,7 +156,7 @@ namespace bundles
};
}
int32_t const property_cache_t::kPropertyCacheFormatVersion = 2;
int32_t const property_cache_t::kPropertyCacheFormatVersion = 3;
static void traverse (std::map<std::string, fs::node_t> const& heads, property_cache_t& plistCache)
{