From 6f837980eb7be2758bbb8f7fe8a1c482e8e9bae5 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Sat, 31 Aug 2024 13:54:52 -0500 Subject: [PATCH 1/2] All Snippet entries that have subsnippets but not generators. --- client/homebrew/editor/snippetbar/snippetbar.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index af493c961..0cf5b0cce 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -70,7 +70,9 @@ const Snippetbar = createClass({ mergeCustomizer : function(oldValue, newValue, key) { if(key == 'snippets') { const result = _.reverse(_.unionBy(_.reverse(newValue), _.reverse(oldValue), 'name')); // Join snippets together, with preference for the child theme over the parent theme - return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property. + return _.filter(result, function(snip) { + return(snip.hasOwnProperty('gen') || snip.hasOwnProperty('subsnippets')); + }); } }, From 5c9c342b10f2965375301c2aaa6aaf8d6bd1a642 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Fri, 6 Sep 2024 01:25:13 -0500 Subject: [PATCH 2/2] Update client/homebrew/editor/snippetbar/snippetbar.jsx Co-authored-by: Trevor Buckner --- client/homebrew/editor/snippetbar/snippetbar.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index 0cf5b0cce..c91a0bc47 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -70,9 +70,7 @@ const Snippetbar = createClass({ mergeCustomizer : function(oldValue, newValue, key) { if(key == 'snippets') { const result = _.reverse(_.unionBy(_.reverse(newValue), _.reverse(oldValue), 'name')); // Join snippets together, with preference for the child theme over the parent theme - return _.filter(result, function(snip) { - return(snip.hasOwnProperty('gen') || snip.hasOwnProperty('subsnippets')); - }); + return result.filter(snip.gen || snip.subsnippets); } },