From cc2735137da577281cc3b67415e30cbfd258c39a Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 30 Oct 2014 11:32:38 -0400 Subject: [PATCH 1/2] Restore the QuickOpen.basicMatchSort and friends. This change broke a few extensions. Looking at the fix, it seems that all QuickOpen plugins will likely need these functions, so we may as well re-export them as we have been doing rather than requiring the extensions to all add another import. If we do decide to deprecate these later, we should do so with deprecation warnings (something we weren't doing when these were moved to the StringMatch module). Revert "Marked as deprecated by adobe/brackets#2462 in Sprint 19" This reverts commit 49e08274a0bc9259d6dd94c03351e4c87bf570f9. --- src/search/QuickOpen.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/search/QuickOpen.js b/src/search/QuickOpen.js index f23edc9c5a4..446057adccb 100644 --- a/src/search/QuickOpen.js +++ b/src/search/QuickOpen.js @@ -949,4 +949,10 @@ define(function (require, exports, module) { exports.beginSearch = beginSearch; exports.addQuickOpenPlugin = addQuickOpenPlugin; exports.highlightMatch = highlightMatch; + + // accessing these from this module will ultimately be deprecated + exports.stringMatch = StringMatch.stringMatch; + exports.SearchResult = StringMatch.SearchResult; + exports.basicMatchSort = StringMatch.basicMatchSort; + exports.multiFieldSort = StringMatch.multiFieldSort; }); From 7e7f4a1fb3a3bc6793324af47ba8b0d04d3573bb Mon Sep 17 00:00:00 2001 From: Kevin Dangoor Date: Thu, 30 Oct 2014 11:35:15 -0400 Subject: [PATCH 2/2] Add clarifying comment for re-exported StringMatch functions in Quick Open. --- src/search/QuickOpen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search/QuickOpen.js b/src/search/QuickOpen.js index 446057adccb..d12a14401b4 100644 --- a/src/search/QuickOpen.js +++ b/src/search/QuickOpen.js @@ -950,7 +950,7 @@ define(function (require, exports, module) { exports.addQuickOpenPlugin = addQuickOpenPlugin; exports.highlightMatch = highlightMatch; - // accessing these from this module will ultimately be deprecated + // Convenience exports for functions that most QuickOpen plugins would need. exports.stringMatch = StringMatch.stringMatch; exports.SearchResult = StringMatch.SearchResult; exports.basicMatchSort = StringMatch.basicMatchSort;