From a72a9af092c1bfcf9f8024d59c11cf222f07e1e7 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 2 Jan 2020 13:03:23 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../filtered_search/filtered_search_tokenizer.js        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'app/assets/javascripts/filtered_search/filtered_search_tokenizer.js')

diff --git a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js
index b5c4cb15aac..963e8fe5df5 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js
@@ -2,10 +2,11 @@ import './filtered_search_token_keys';
 
 export default class FilteredSearchTokenizer {
   static processTokens(input, allowedKeys) {
-    // Regex extracts `(token):(symbol)(value)`
+    // Regex extracts `(token):(operator)(symbol)(value)`
     // Values that start with a double quote must end in a double quote (same for single)
+
     const tokenRegex = new RegExp(
-      `(${allowedKeys.join('|')}):([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\\S+))`,
+      `(${allowedKeys.join('|')}):(=|!=)?([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\\S+))`,
       'g',
     );
     const tokens = [];
@@ -13,16 +14,22 @@ export default class FilteredSearchTokenizer {
     let lastToken = null;
     const searchToken =
       input
-        .replace(tokenRegex, (match, key, symbol, v1, v2, v3) => {
+        .replace(tokenRegex, (match, key, operator, symbol, v1, v2, v3) => {
           let tokenValue = v1 || v2 || v3;
           let tokenSymbol = symbol;
           let tokenIndex = '';
+          let tokenOperator = operator;
 
           if (tokenValue === '~' || tokenValue === '%' || tokenValue === '@') {
             tokenSymbol = tokenValue;
             tokenValue = '';
           }
 
+          if (tokenValue === '!=' || tokenValue === '=') {
+            tokenOperator = tokenValue;
+            tokenValue = '';
+          }
+
           tokenIndex = `${key}:${tokenValue}`;
 
           // Prevent adding duplicates
@@ -33,6 +40,7 @@ export default class FilteredSearchTokenizer {
               key,
               value: tokenValue || '',
               symbol: tokenSymbol || '',
+              operator: tokenOperator || '',
             });
           }
 
@@ -43,13 +51,12 @@ export default class FilteredSearchTokenizer {
 
     if (tokens.length > 0) {
       const last = tokens[tokens.length - 1];
-      const lastString = `${last.key}:${last.symbol}${last.value}`;
+      const lastString = `${last.key}:${last.operator}${last.symbol}${last.value}`;
       lastToken =
         input.lastIndexOf(lastString) === input.length - lastString.length ? last : searchToken;
     } else {
       lastToken = searchToken;
     }
-
     return {
       tokens,
       lastToken,
-- 
cgit v1.2.3