fix: review comments

Author: AbhishekA1509

src/Shared/Components/CodeEditor/CodeEditor.tsx

@@ -43,8 +43,8 @@ import { getCodeEditorTheme } from './CodeEditor.theme'
 import { CodeEditorRenderer } from './CodeEditorRenderer'
 import {
     blurOnEscape,
-    getOpenSearchPanel,
-    getOpenSearchPanelWithReplace,
+    openSearchPanel,
+    openSearchPanelWithReplace,
     replaceAll,
     showReplaceFieldState,
 } from './Commands'
@@ -203,17 +203,25 @@ const CodeEditor = <DiffView extends boolean = false>({
         setLhsCode(newLhsValue)
     }
 
+    const openSearchPanelWrapper: typeof openSearchPanel = (view) => {
+        onSearchPanelOpen()
+        return openSearchPanel(view)
+    }
+
+    const openSearchPanelWithReplaceWrapper: typeof openSearchPanelWithReplace = (view) => {
+        onSearchPanelOpen()
+        return openSearchPanelWithReplace(view)
+    }
+
     // EXTENSIONS
     const getBaseExtensions = (): Extension[] => [
         basicSetup(basicSetupOptions),
         themeExtension,
         keymap.of([
             ...vscodeKeymap.filter(({ key }) => key !== 'Mod-Alt-Enter' && key !== 'Mod-Enter' && key !== 'Mod-f'),
-            ...(!disableSearch
-                ? [{ key: 'Mod-f', run: getOpenSearchPanel(onSearchPanelOpen), scope: 'editor search-panel' }]
-                : []),
+            ...(!disableSearch ? [{ key: 'Mod-f', run: openSearchPanelWrapper, scope: 'editor search-panel' }] : []),
             { key: 'Mod-Enter', run: replaceAll, scope: 'editor search-panel' },
-            { key: 'Mod-Alt-f', run: getOpenSearchPanelWithReplace(onSearchPanelOpen), scope: 'editor search-panel' },
+            { key: 'Mod-Alt-f', run: openSearchPanelWithReplaceWrapper, scope: 'editor search-panel' },
             { key: 'Escape', run: blurOnEscape, stopPropagation: true },
         ]),
         indentationMarkers(),

src/Shared/Components/CodeEditor/Commands/findAndReplace.ts

@@ -37,22 +37,19 @@ export const getShowReplaceField = (state: EditorState) => {
     return curState || false
 }
 
-export const getOpenSearchPanel: (onSearchPanelOpen: () => void) => Command =
-    (onSearchPanelOpen: () => void) => (view: EditorView) => {
-        view.dispatch({
-            effects: [setShowReplaceField.of(searchPanelOpen(view.state) ? getShowReplaceField(view.state) : false)],
-        })
-        cmOpenSearchPanel(view)
-        onSearchPanelOpen()
-        return true
-    }
+export const openSearchPanel: Command = (view: EditorView) => {
+    view.dispatch({
+        effects: [setShowReplaceField.of(searchPanelOpen(view.state) ? getShowReplaceField(view.state) : false)],
+    })
+    cmOpenSearchPanel(view)
+    return true
+}
 
-export const getOpenSearchPanelWithReplace: (onSearchPanelOpen: () => void) => Command =
-    (onSearchPanelOpen: () => void) => (view: EditorView) => {
-        getOpenSearchPanel(onSearchPanelOpen)(view)
-        view.dispatch({ effects: [setShowReplaceField.of(!view.state.readOnly && true)] })
-        return true
-    }
+export const openSearchPanelWithReplace: Command = (view: EditorView) => {
+    openSearchPanel(view)
+    view.dispatch({ effects: [setShowReplaceField.of(!view.state.readOnly && true)] })
+    return true
+}
 
 export const replaceAll: Command = (view: EditorView) => {
     const isReplaceEnabled = getShowReplaceField(view.state)

src/Shared/Components/CodeEditor/Extensions/findAndReplace.tsx

@@ -103,6 +103,9 @@ const FindReplace = ({ view, defaultQuery, defaultShowReplace, onSearchBarAction
         search = query.search,
         wholeWord = query.wholeWord,
     }: FindReplaceQuery) => {
+        // Calling this irrespective of whether the query has changed or not
+        onSearchBarAction()
+
         const newQuery = new SearchQuery({
             caseSensitive,
             regexp,
@@ -111,7 +114,6 @@ const FindReplace = ({ view, defaultQuery, defaultShowReplace, onSearchBarAction
             wholeWord,
         })
 
-        onSearchBarAction()
         if (!newQuery.eq(query)) {
             setQuery(newQuery)
             view.dispatch({ effects: setSearchQuery.of(newQuery) })