From 6f837980eb7be2758bbb8f7fe8a1c482e8e9bae5 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Sat, 31 Aug 2024 13:54:52 -0500 Subject: [PATCH 1/3] 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/3] 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); } }, From e5d0051075ea180b423d8386bef395a46eb00c89 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Sep 2024 15:57:33 -0400 Subject: [PATCH 3/3] Create pull_request_template.md --- .github/pull_request_template.md | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..b02835726 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,36 @@ + + +## Description + + +## Related Issues or Discussions + +- Closes # + +## QA Instructions, Screenshots, Recordings + +_Please replace this line with instructions on how to test or view your changes, as well as any before/after +images for UI changes._ + +### Reviewer Checklist + +_Please replace the list below with specific features you want reviewers to look at._ + +*Reviewers, refer to this list when testing features, or suggest new items * +- [ ] Verify new features are functional + - [ ] Feature A does X + - [ ] Feature B does Y +- [ ] Verify old features have not broken + - [ ] Feature Z can still be used +- [ ] Test for edge cases / try to break things + - [ ] Feature A handles negative numbers +- [ ] Identify opportunities for simplification and refactoring +- [ ] Check for code legibility and appropriate comments + +
Copy this list