From 87b3caf92723e4e13d61481f70ed1d07cd7f6c9e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 1 Sep 2020 13:47:22 -0400
Subject: [PATCH] REFACTOR: Remove `_.reject`

---
 .../discourse/app/controllers/full-page-search.js        | 6 ++++--
 .../javascripts/discourse/app/lib/highlight-search.js    | 9 ++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
index 4531ce2786f..fb45871b847 100644
--- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
@@ -59,8 +59,10 @@ export default Controller.extend({
     if (!q) {
       return;
     }
-    // remove l which can be used for sorting
-    return _.reject(q.split(/\s+/), t => t === "l").join(" ");
+    return q
+      .split(/\s+/)
+      .filter(t => t !== "l")
+      .join(" ");
   },
 
   @discourseComputed("skip_context", "context")
diff --git a/app/assets/javascripts/discourse/app/lib/highlight-search.js b/app/assets/javascripts/discourse/app/lib/highlight-search.js
index 2eb3f7862dc..f900a909005 100644
--- a/app/assets/javascripts/discourse/app/lib/highlight-search.js
+++ b/app/assets/javascripts/discourse/app/lib/highlight-search.js
@@ -7,12 +7,11 @@ export const CLASS_NAME = "search-highlight";
 export default function(elem, term, opts = {}) {
   if (!isEmpty(term)) {
     // special case ignore "l" which is used for magic sorting
-    let words = _.reject(
-      term.match(new RegExp(`${SEARCH_PHRASE_REGEXP}|[^\\s]+`, "g")),
-      t => t === "l"
-    );
+    let words = term
+      .match(new RegExp(`${SEARCH_PHRASE_REGEXP}|[^\\s]+`, "g"))
+      .filter(t => t !== "l")
+      .map(w => w.replace(/^"(.*)"$/, "$1"));
 
-    words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
     const highlightOpts = {};
     if (!opts.defaultClassName) highlightOpts.className = CLASS_NAME;
     highlightHTML(elem, words, highlightOpts);