Add keywords match mode selection to the file search command

- when selected 'Keywords', show another quick pick: 'All', 'Some'. When 'some' is selected - use logical OR. When 'all' is selected - use logical AND.
- remove redundant comments
- use '==' instead of '===' when comparing strings numbers
- [Pasted text]

Author: robertpiosik

apps/editor/src/commands/search-files-command/search-files-commands.ts

@@ -38,7 +38,7 @@ export const prompt_for_api_configuration = async (params: {
     if (default_api_configuration) {
       selected_api_configuration = default_api_configuration
       skipped = true
-    } else if (params.api_configurations.length === 1) {
+    } else if (params.api_configurations.length == 1) {
       selected_api_configuration = params.api_configurations[0]
       skipped = true
     }
@@ -62,7 +62,7 @@ export const prompt_for_api_configuration = async (params: {
       show_back_button: true
     })
 
-    if (result === 'back') return 'back'
+    if (result == 'back') return 'back'
     if (!result) return 'cancel'
     selected_api_configuration = result.item
   }

apps/editor/src/commands/search-files-command/utils/prompt-for-config.ts

@@ -0,0 +1,68 @@
+import * as vscode from 'vscode'
+import { t } from '@/i18n'
+
+export const prompt_for_keywords_match_mode = async (
+  last_mode: 'all' | 'some'
+): Promise<'all' | 'some' | 'back' | undefined> => {
+  const items: (vscode.QuickPickItem & { mode: 'all' | 'some' })[] = [
+    {
+      label: t('command.search.keywords.match-mode.all'),
+      description: t('command.search.keywords.match-mode.all-description'),
+      mode: 'all'
+    },
+    {
+      label: t('command.search.keywords.match-mode.some'),
+      description: t('command.search.keywords.match-mode.some-description'),
+      mode: 'some'
+    }
+  ]
+
+  const active_item = items.find((i) => i.mode == last_mode) || items[0]
+
+  const close_button = {
+    iconPath: new vscode.ThemeIcon('close'),
+    tooltip: t('common.close')
+  }
+
+  const quick_pick = vscode.window.createQuickPick<
+    vscode.QuickPickItem & { mode: 'all' | 'some' }
+  >()
+  quick_pick.items = items
+  quick_pick.activeItems = [active_item]
+  quick_pick.title = t('command.search.keywords.match-mode.title')
+  quick_pick.placeholder = t('command.search.keywords.match-mode.placeholder')
+  quick_pick.ignoreFocusOut = false
+  quick_pick.buttons = [vscode.QuickInputButtons.Back, close_button]
+
+  return new Promise((resolve) => {
+    let is_resolved = false
+
+    quick_pick.onDidTriggerButton((button) => {
+      if (button === vscode.QuickInputButtons.Back) {
+        resolve('back')
+        quick_pick.hide()
+      } else if (button === close_button) {
+        resolve(undefined)
+        quick_pick.hide()
+      }
+    })
+
+    quick_pick.onDidAccept(() => {
+      const selected = quick_pick.selectedItems[0]
+      if (selected) {
+        is_resolved = true
+        resolve(selected.mode)
+        quick_pick.hide()
+      }
+    })
+
+    quick_pick.onDidHide(() => {
+      if (!is_resolved) {
+        resolve(undefined)
+      }
+      quick_pick.dispose()
+    })
+
+    quick_pick.show()
+  })
+}

apps/editor/src/commands/search-files-command/utils/prompt-for-keywords-match-mode.ts

@@ -24,7 +24,7 @@ export const prompt_for_search_mode = async (
     }
   ]
 
-  const active_item = items.find((i) => i.mode === last_mode) || items[0]
+  const active_item = items.find((i) => i.mode == last_mode) || items[0]
 
   const close_button = {
     iconPath: new vscode.ThemeIcon('close'),

apps/editor/src/commands/search-files-command/utils/prompt-for-search-mode.ts

@@ -113,7 +113,7 @@ export const prompt_for_search_results = async (params: {
           const text = doc.getText()
 
           let regexes: RegExp[] = []
-          if (params.search_mode === 'keywords') {
+          if (params.search_mode == 'keywords') {
             regexes = params.search_term
               .split(',')
               .map((k) => k.trim())
@@ -140,7 +140,7 @@ export const prompt_for_search_results = async (params: {
           })
         } catch (error) {
           vscode.window.showErrorMessage(
-            t('command.context.check-references.error-opening', {
+            t('command.search.error.opening-file', {
               error: String(error)
             })
           )

apps/editor/src/commands/search-files-command/utils/prompt-for-search-results.ts

@@ -13,9 +13,9 @@ export const prompt_for_search_term = async (
   const input_box = vscode.window.createInputBox()
   input_box.title = t('command.search.title')
   input_box.prompt =
-    mode === 'keywords'
+    mode == 'keywords'
       ? t('command.search.prompt.keywords')
-      : mode === 'intelligent'
+      : mode == 'intelligent'
         ? t('command.search.prompt.intelligent')
         : t('command.search.prompt')
   input_box.placeholder = t('command.search.placeholder')

apps/editor/src/commands/search-files-command/utils/prompt-for-search-term.ts

@@ -39,7 +39,7 @@ export const prompt_for_shrink_mode = async (params: {
     shrink_quick_pick.onDidAccept(() => {
       is_resolved = true
       resolve(
-        shrink_quick_pick.selectedItems[0].label ===
+        shrink_quick_pick.selectedItems[0].label ==
           t('command.search.shrink.strip')
       )
       shrink_quick_pick.hide()

apps/editor/src/commands/search-files-command/utils/prompt-for-shrink-mode.ts

@@ -8,11 +8,12 @@ export const search_files_by_term = async (params: {
   files: string[]
   search_term: string
   search_mode: 'phrase' | 'keywords' | 'intelligent'
+  keywords_match_mode?: 'all' | 'some'
 }): Promise<string[]> => {
   const matched_files: string[] = []
 
   let regexes: RegExp[] = []
-  if (params.search_mode === 'keywords') {
+  if (params.search_mode == 'keywords') {
     const keywords = params.search_term
       .split(',')
       .map((k) => k.trim())
@@ -22,9 +23,17 @@ export const search_files_by_term = async (params: {
     regexes = [create_search_regex(params.search_term)]
   }
 
-  if (regexes.length === 0) return []
+  if (regexes.length == 0) return []
 
-  const matches_all = (text: string) => regexes.every((r) => r.test(text))
+  const matches_condition = (text: string) => {
+    if (
+      params.search_mode == 'keywords' &&
+      params.keywords_match_mode == 'some'
+    ) {
+      return regexes.some((r) => r.test(text))
+    }
+    return regexes.every((r) => r.test(text))
+  }
 
   for (const file_path of params.files) {
     try {
@@ -34,7 +43,7 @@ export const search_files_by_term = async (params: {
         continue
       }
 
-      if (matches_all(file_name)) {
+      if (matches_condition(file_name)) {
         matched_files.push(file_path)
         continue
       }
@@ -46,7 +55,7 @@ export const search_files_by_term = async (params: {
 
       const content = await fs.promises.readFile(file_path, 'utf-8')
 
-      if (matches_all(content)) {
+      if (matches_condition(content)) {
         matched_files.push(file_path)
       }
     } catch (error) {

apps/editor/src/commands/search-files-command/utils/search-files-by-term.ts

@@ -134,7 +134,7 @@ export const show_results_and_apply = async (params: {
       quick_pick.show()
     })
 
-    if (list_selection === 'back' || list_selection === 'cancel') {
+    if (list_selection == 'back' || list_selection == 'cancel') {
       return list_selection
     }
 
@@ -224,7 +224,7 @@ export const show_results_and_apply = async (params: {
         quick_pick_merge.show()
       })
 
-      if (choice === 'back') {
+      if (choice == 'back') {
         should_continue_loop = true
       } else if (!choice) {
         return 'cancel'

apps/editor/src/commands/search-files-command/utils/show-results-and-apply.ts

@@ -85,6 +85,8 @@ export const LAST_SEARCH_FILES_PHRASE_QUERY_STATE_KEY =
   'last-search-files-phrase-query'
 export const LAST_SEARCH_FILES_KEYWORDS_QUERY_STATE_KEY =
   'last-search-files-keywords-query'
+export const LAST_SEARCH_FILES_KEYWORDS_MATCH_MODE_STATE_KEY =
+  'last-search-files-keywords-match-mode'
 export const LAST_SEARCH_FILES_INTELLIGENT_QUERY_STATE_KEY =
   'last-search-files-intelligent-query'