Merge pull request #56869 from software-mansion-labs/289Adam289/56559…

…-revert-syntax-color Revert syntax range color back to black
Expensify · Feb 18, 2025 · eb2423b · eb2423b
2 parents c9c93d8 + c71d083
commit eb2423b
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 92 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -6225,7 +6225,6 @@ const CONST = {
             LOWER_THAN: 'lt',
             LOWER_THAN_OR_EQUAL_TO: 'lte',
         },
-        SYNTAX_RANGE_NAME: 'syntax',
         SYNTAX_ROOT_KEYS: {
             TYPE: 'type',
             STATUS: 'status',

diff --git a/src/components/Search/SearchRouter/buildSubstitutionsMap.ts b/src/components/Search/SearchRouter/buildSubstitutionsMap.ts
@@ -33,8 +33,7 @@ function buildSubstitutionsMap(
 ): SubstitutionMap {
     const parsedQuery = parse(query) as {ranges: SearchAutocompleteQueryRange[]};
 
-    const searchAutocompleteQueryRanges = parsedQuery.ranges.filter((range) => range.key !== CONST.SEARCH.SYNTAX_RANGE_NAME);
-
+    const searchAutocompleteQueryRanges = parsedQuery.ranges;
     if (searchAutocompleteQueryRanges.length === 0) {
         return {};
     }

diff --git a/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts b/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts
@@ -1,11 +1,10 @@
-import type {SearchAutocompleteQueryRange, SearchAutocompleteQueryRangeKey} from '@components/Search/types';
+import type {SearchAutocompleteQueryRange, SearchFilterKey} from '@components/Search/types';
 import {parse} from '@libs/SearchParser/autocompleteParser';
 import {sanitizeSearchValue} from '@libs/SearchQueryUtils';
-import CONST from '@src/CONST';
 
 type SubstitutionMap = Record<string, string>;
 
-const getSubstitutionMapKey = (filterKey: SearchAutocompleteQueryRangeKey, value: string) => `${filterKey}:${value}`;
+const getSubstitutionMapKey = (filterKey: SearchFilterKey, value: string) => `${filterKey}:${value}`;
 
 /**
  * Given a plaintext query and a SubstitutionMap object, this function will return a transformed query where:
@@ -22,7 +21,7 @@ const getSubstitutionMapKey = (filterKey: SearchAutocompleteQueryRangeKey, value
 function getQueryWithSubstitutions(changedQuery: string, substitutions: SubstitutionMap) {
     const parsed = parse(changedQuery) as {ranges: SearchAutocompleteQueryRange[]};
 
-    const searchAutocompleteQueryRanges = parsed.ranges.filter((range) => range.key !== CONST.SEARCH.SYNTAX_RANGE_NAME);
+    const searchAutocompleteQueryRanges = parsed.ranges;
 
     if (searchAutocompleteQueryRanges.length === 0) {
         return changedQuery;

diff --git a/src/components/Search/SearchRouter/getUpdatedSubstitutionsMap.ts b/src/components/Search/SearchRouter/getUpdatedSubstitutionsMap.ts
@@ -1,9 +1,8 @@
-import type {SearchAutocompleteQueryRange, SearchAutocompleteQueryRangeKey} from '@components/Search/types';
+import type {SearchAutocompleteQueryRange, SearchFilterKey} from '@components/Search/types';
 import {parse} from '@libs/SearchParser/autocompleteParser';
-import CONST from '@src/CONST';
 import type {SubstitutionMap} from './getQueryWithSubstitutions';
 
-const getSubstitutionsKey = (filterKey: SearchAutocompleteQueryRangeKey, value: string) => `${filterKey}:${value}`;
+const getSubstitutionsKey = (filterKey: SearchFilterKey, value: string) => `${filterKey}:${value}`;
 
 /**
  * Given a plaintext query and a SubstitutionMap object,
@@ -19,7 +18,7 @@ const getSubstitutionsKey = (filterKey: SearchAutocompleteQueryRangeKey, value:
 function getUpdatedSubstitutionsMap(query: string, substitutions: SubstitutionMap): SubstitutionMap {
     const parsedQuery = parse(query) as {ranges: SearchAutocompleteQueryRange[]};
 
-    const searchAutocompleteQueryRanges = parsedQuery.ranges.filter((range) => range.key !== CONST.SEARCH.SYNTAX_RANGE_NAME);
+    const searchAutocompleteQueryRanges = parsedQuery.ranges;
 
     if (searchAutocompleteQueryRanges.length === 0) {
         return {};

diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
@@ -98,8 +98,6 @@ type SearchFilterKey =
     | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS
     | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.POLICY_ID;
 
-type SearchAutocompleteQueryRangeKey = SearchFilterKey | typeof CONST.SEARCH.SYNTAX_RANGE_NAME;
-
 type UserFriendlyKey = ValueOf<typeof CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS>;
 
 type QueryFilters = Array<{
@@ -132,7 +130,7 @@ type SearchAutocompleteResult = {
 };
 
 type SearchAutocompleteQueryRange = {
-    key: SearchAutocompleteQueryRangeKey;
+    key: SearchFilterKey;
     length: number;
     start: number;
     value: string;
@@ -161,5 +159,4 @@ export type {
     SearchAutocompleteResult,
     PaymentData,
     SearchAutocompleteQueryRange,
-    SearchAutocompleteQueryRangeKey,
 };
diff --git a/src/libs/SearchAutocompleteUtils.ts b/src/libs/SearchAutocompleteUtils.ts
@@ -173,7 +173,7 @@ function filterOutRangesWithCorrectValue(
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG:
             return tagList.get().includes(range.value);
         default:
-            return true;
+            return false;
     }
 }
 
@@ -200,10 +200,6 @@ function parseForLiveMarkdown(
         .map((range) => {
             let type = 'mention-user';
 
-            if (range.key === CONST.SEARCH.SYNTAX_RANGE_NAME) {
-                type = CONST.SEARCH.SYNTAX_RANGE_NAME;
-            }
-
             if ((range.key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO || CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM) && (userLogins.get().includes(range.value) || range.value === userDisplayName)) {
                 type = 'mention-here';
             }

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
@@ -287,34 +287,19 @@ function peg$parse(input, options) {
           start: location().end.offset,
           length: 0,
         };
-        return {
-          key: "syntax",
-          value: key,
-          start: location().start.offset,
-          length: location().end.offset - location().start.offset,
-        };
+        return;
       }
 
       autocomplete = {
         key,
         ...value[value.length - 1],
       };
-      const result = value
+      return value
         .filter((filter) => filter.length > 0)
         .map((filter) => ({
           key,
           ...filter,
         }));
-
-      return [
-        {
-          key: "syntax",
-          value: key,
-          start: location().start.offset,
-          length: result[0].start - location().start.offset,
-        },
-        ...result,
-      ];
     };
   var peg$f3 = function() { autocomplete = null; };
   var peg$f4 = function(parts, empty) {

diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
@@ -36,34 +36,19 @@ defaultFilter
           start: location().end.offset,
           length: 0,
         };
-        return {
-          key: "syntax",
-          value: key,
-          start: location().start.offset,
-          length: location().end.offset - location().start.offset,
-        };
+        return;
       }
 
       autocomplete = {
         key,
         ...value[value.length - 1],
       };
-      const result = value
+      return value
         .filter((filter) => filter.length > 0)
         .map((filter) => ({
           key,
           ...filter,
         }));
-
-      return [
-        {
-          key: "syntax",
-          value: key,
-          start: location().start.offset,
-          length: result[0].start - location().start.offset,
-        },
-        ...result,
-      ];
     }
 
 freeTextFilter = _ (identifier / ",") _ { autocomplete = null; }

diff --git a/tests/unit/SearchAutocompleteParserTest.ts b/tests/unit/SearchAutocompleteParserTest.ts
@@ -13,9 +13,7 @@ const tests = [
                 length: 3,
             },
             ranges: [
-                {key: 'syntax', value: 'type', start: 0, length: 5},
                 {key: 'type', value: 'expense', start: 5, length: 7},
-                {key: 'syntax', value: 'status', start: 13, length: 7},
                 {key: 'status', value: 'all', start: 20, length: 3},
             ],
         },
@@ -25,11 +23,8 @@ const tests = [
         expected: {
             autocomplete: null,
             ranges: [
-                {key: 'syntax', value: 'taxRate', start: 0, length: 9},
                 {key: 'taxRate', value: 'rate1', start: 9, length: 5},
-                {key: 'syntax', value: 'expenseType', start: 15, length: 13},
                 {key: 'expenseType', value: 'card', start: 28, length: 4},
-                {key: 'syntax', value: 'cardID', start: 33, length: 5},
                 {key: 'cardID', value: 'Big Bank', start: 38, length: 10},
             ],
         },
@@ -39,11 +34,8 @@ const tests = [
         expected: {
             autocomplete: null,
             ranges: [
-                {key: 'syntax', value: 'taxRate', start: 0, length: 8},
                 {key: 'taxRate', value: 'rate1', start: 8, length: 5},
-                {key: 'syntax', value: 'expenseType', start: 14, length: 12},
                 {key: 'expenseType', value: 'card', start: 26, length: 4},
-                {key: 'syntax', value: 'cardID', start: 31, length: 7},
                 {key: 'cardID', value: 'Big Bank', start: 38, length: 10},
             ],
         },
@@ -58,10 +50,8 @@ const tests = [
                 value: 'meal & entertainment',
             },
             ranges: [
-                {key: 'syntax', value: 'expenseType', start: 11, length: 13},
                 {key: 'expenseType', length: 4, start: 24, value: 'cash'},
                 {key: 'expenseType', length: 4, start: 29, value: 'card'},
-                {key: 'syntax', value: 'category', start: 80, length: 9},
                 {key: 'category', length: 6, start: 89, value: 'travel'},
                 {key: 'category', length: 5, start: 96, value: 'hotel'},
                 {key: 'category', length: 22, start: 102, value: 'meal & entertainment'},
@@ -78,11 +68,8 @@ const tests = [
                 value: 'a b',
             },
             ranges: [
-                {key: 'syntax', value: 'type', start: 0, length: 5},
                 {key: 'type', value: 'expense', start: 5, length: 7},
-                {key: 'syntax', value: 'status', start: 13, length: 7},
                 {key: 'status', value: 'all', start: 20, length: 3},
-                {key: 'syntax', value: 'category', start: 24, length: 9},
                 {key: 'category', value: 'a b', start: 33, length: 5},
             ],
         },
@@ -105,7 +92,7 @@ const tests = [
         query: 'tag:,,',
         expected: {
             autocomplete: null,
-            ranges: [{key: 'syntax', value: 'tag', start: 0, length: 4}],
+            ranges: [],
         },
     },
     {
@@ -118,9 +105,7 @@ const tests = [
                 length: 3,
             },
             ranges: [
-                {key: 'syntax', value: 'in', start: 0, length: 3},
                 {key: 'in', value: '123456', start: 3, length: 6},
-                {key: 'syntax', value: 'currency', start: 10, length: 9},
                 {key: 'currency', value: 'USD', start: 19, length: 3},
             ],
         },
@@ -135,7 +120,6 @@ const tests = [
                 length: 4,
             },
             ranges: [
-                {key: 'syntax', value: 'tag', start: 0, length: 4},
                 {key: 'tag', value: 'aa', start: 4, length: 2},
                 {key: 'tag', value: 'bbb', start: 7, length: 3},
                 {key: 'tag', value: 'cccc', start: 11, length: 4},
@@ -151,7 +135,7 @@ const tests = [
                 start: 9,
                 length: 0,
             },
-            ranges: [{key: 'syntax', value: 'category', start: 0, length: 9}],
+            ranges: [],
         },
     },
     {
@@ -163,10 +147,7 @@ const tests = [
                 start: 21,
                 length: 0,
             },
-            ranges: [
-                {key: 'syntax', value: 'category', start: 0, length: 9},
-                {key: 'category', value: 'Advertising', start: 9, length: 11},
-            ],
+            ranges: [{key: 'category', value: 'Advertising', start: 9, length: 11}],
         },
     },
     {
@@ -179,7 +160,6 @@ const tests = [
                 length: 12,
             },
             ranges: [
-                {key: 'syntax', value: 'in', start: 0, length: 3},
                 {key: 'in', value: 'Big Room', start: 3, length: 10},
                 {key: 'in', value: 'small room', start: 14, length: 12},
             ],
@@ -194,20 +174,15 @@ const tests = [
                 start: 12,
                 length: 3,
             },
-            ranges: [
-                {key: 'syntax', value: 'category', start: 0, length: 12},
-                {key: 'category', value: 'Car', start: 12, length: 3},
-            ],
+            ranges: [{key: 'category', value: 'Car', start: 12, length: 3}],
         },
     },
     {
         query: 'type:expense status:all word',
         expected: {
             autocomplete: null,
             ranges: [
-                {key: 'syntax', value: 'type', start: 0, length: 5},
                 {key: 'type', value: 'expense', start: 5, length: 7},
-                {key: 'syntax', value: 'status', start: 13, length: 7},
                 {key: 'status', value: 'all', start: 20, length: 3},
             ],
         },
@@ -222,16 +197,11 @@ const tests = [
                 length: 4,
             },
             ranges: [
-                {key: 'syntax', value: 'in', start: 0, length: 3},
                 {key: 'in', value: 'Big Room', start: 3, length: 10},
-                {key: 'syntax', value: 'from', start: 14, length: 5},
                 {key: 'from', value: 'Friend', start: 19, length: 6},
-                {key: 'syntax', value: 'category', start: 26, length: 9},
                 {key: 'category', value: 'Car', start: 35, length: 3},
                 {key: 'category', value: 'Cell Phone', start: 39, length: 12},
-                {key: 'syntax', value: 'status', start: 52, length: 7},
                 {key: 'status', value: 'all', start: 59, length: 3},
-                {key: 'syntax', value: 'expenseType', start: 63, length: 13},
                 {key: 'expenseType', value: 'card', start: 76, length: 4},
                 {key: 'expenseType', value: 'cash', start: 81, length: 4},
             ],
@@ -247,15 +217,11 @@ const tests = [
                 length: 8,
             },
             ranges: [
-                {key: 'syntax', value: 'currency', start: 0, length: 9},
                 {key: 'currency', value: 'PLN', start: 9, length: 3},
                 {key: 'currency', value: 'USD', start: 13, length: 3},
-                {key: 'syntax', value: 'taxRate', start: 25, length: 9},
                 {key: 'taxRate', value: 'tax', start: 34, length: 3},
-                {key: 'syntax', value: 'tag', start: 66, length: 4},
                 {key: 'tag', value: 'General Overhead', start: 70, length: 18},
                 {key: 'tag', value: 'IT', start: 89, length: 2},
-                {key: 'syntax', value: 'expenseType', start: 92, length: 13},
                 {key: 'expenseType', value: 'card', start: 105, length: 4},
                 {key: 'expenseType', value: 'distance', start: 110, length: 8},
             ],