From ee259cd49f73796ca7fb6a7f6b99eec2da443f98 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Tue, 20 Jun 2023 17:34:31 +0200
Subject: [PATCH] fix search

---
 .../lib/components/results/SearchHelper.ts    | 146 ++++++++++--------
 .../search/src/lib/context/context.tsx        |   2 +-
 2 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/libs/remix-ui/search/src/lib/components/results/SearchHelper.ts b/libs/remix-ui/search/src/lib/components/results/SearchHelper.ts
index fb6b096df2..7cb34a0d42 100644
--- a/libs/remix-ui/search/src/lib/components/results/SearchHelper.ts
+++ b/libs/remix-ui/search/src/lib/components/results/SearchHelper.ts
@@ -1,9 +1,18 @@
 import { EOL } from 'os'
 import { SearchResultLineLine } from '../../types'
+import isElectron from 'is-electron'
 
 
 export const getDirectory = async (dir: string, plugin: any) => {
-    let result = []
+  let result = []
+
+  if (isElectron()) {
+
+    const files = await plugin.call('fs', 'glob', dir, '**/*')
+    // only get path property of files
+    result = files.map(x => x.path)
+  } else {
+
     const files = await plugin.call('fileManager', 'readdir', dir)
     const fileArray = normalize(files)
     for (const fi of fileArray) {
@@ -16,94 +25,95 @@ export const getDirectory = async (dir: string, plugin: any) => {
         }
       }
     }
-    return result
   }
+  return result
+}
 
-  const normalize = filesList => {
-    const folders = []
-    const files = []
-    Object.keys(filesList || {}).forEach(key => {
-      if (filesList[key].isDirectory) {
-        folders.push({
-          filename: key,
-          data: filesList[key]
-        })
-      } else {
-        files.push({
-          filename: key,
-          data: filesList[key]
-        })
-      }
-    })
-    return [...folders, ...files]
-  }
+const normalize = filesList => {
+  const folders = []
+  const files = []
+  Object.keys(filesList || {}).forEach(key => {
+    if (filesList[key].isDirectory) {
+      folders.push({
+        filename: key,
+        data: filesList[key]
+      })
+    } else {
+      files.push({
+        filename: key,
+        data: filesList[key]
+      })
+    }
+  })
+  return [...folders, ...files]
+}
 
 export const findLinesInStringWithMatch = (str: string, re: RegExp) => {
-    return str
-        .split(/\r?\n/)
-        .map(function (line, i) {
-            const matchResult = matchesInString(line, re)
-            if (matchResult.length) {
-                return {
-                    lines: splitLines(matchResult, i),
-                }
-            }
-        })
-        .filter(Boolean)
+  return str
+    .split(/\r?\n/)
+    .map(function (line, i) {
+      const matchResult = matchesInString(line, re)
+      if (matchResult.length) {
+        return {
+          lines: splitLines(matchResult, i),
+        }
+      }
+    })
+    .filter(Boolean)
 }
 
 const matchesInString = (str: string, re: RegExp) => {
-    let a: RegExpExecArray
-    const results:RegExpExecArray[] = [];
-    while ((a = re.exec(str || '')) !== null) {
-        results.push(a);
-    }
-    return results
+  let a: RegExpExecArray
+  const results: RegExpExecArray[] = [];
+  while ((a = re.exec(str || '')) !== null) {
+    results.push(a);
+  }
+  return results
 }
 
 const splitLines = (matchResult: RegExpExecArray[], lineNumber: number) => {
-    return matchResult.map((matchResultPart, i) => {
-        const result:SearchResultLineLine = {
-            left: matchResultPart.input.substring(0, matchResultPart.index),
-            right: matchResultPart.input.substring(matchResultPart.index + matchResultPart[0].length),
-            center: matchResultPart[0],
-            position : {
-                start: {
-                    line: lineNumber,
-                    column: matchResultPart.index,
-                },
-                end: {
-                    line: lineNumber,
-                    column: matchResultPart.index + matchResultPart[0].length,
-                },
-            },
-        }
-        return result
-    })
+  return matchResult.map((matchResultPart, i) => {
+    const result: SearchResultLineLine = {
+      left: matchResultPart.input.substring(0, matchResultPart.index),
+      right: matchResultPart.input.substring(matchResultPart.index + matchResultPart[0].length),
+      center: matchResultPart[0],
+      position: {
+        start: {
+          line: lineNumber,
+          column: matchResultPart.index,
+        },
+        end: {
+          line: lineNumber,
+          column: matchResultPart.index + matchResultPart[0].length,
+        },
+      },
+    }
+    return result
+  })
 }
 
 function getEOL(text) {
-    const m = text.match(/\r\n|\n/g);
-    const u = m && m.filter(a => a === '\n').length;
-    const w = m && m.length - u;
-    if (u === w) {
-        return EOL; // use the OS default
-    }
-    return u > w ? '\n' : '\r\n';
+  const m = text.match(/\r\n|\n/g);
+  const u = m && m.filter(a => a === '\n').length;
+  const w = m && m.length - u;
+  if (u === w) {
+    return EOL; // use the OS default
+  }
+  return u > w ? '\n' : '\r\n';
 }
 
-export const replaceAllInFile = (string: string, re:RegExp, newText: string) => {
+export const replaceAllInFile = (string: string, re: RegExp, newText: string) => {
   return string.replace(re, newText)
 }
 
 export const replaceTextInLine = (str: string, searchResultLine: SearchResultLineLine, newText: string) => {
-    return str
+  return str
     .split(/\r?\n/)
     .map(function (line, i) {
-        if (i === searchResultLine.position.start.line) {
-            return searchResultLine.left + newText + searchResultLine.right
-        }
-        return line
+      if (i === searchResultLine.position.start.line) {
+        return searchResultLine.left + newText + searchResultLine.right
+      }
+      return line
     }).join(getEOL(str))
 }
 
diff --git a/libs/remix-ui/search/src/lib/context/context.tsx b/libs/remix-ui/search/src/lib/context/context.tsx
index f754ebde2f..e89adecfc2 100644
--- a/libs/remix-ui/search/src/lib/context/context.tsx
+++ b/libs/remix-ui/search/src/lib/context/context.tsx
@@ -311,7 +311,6 @@ export const SearchProvider = ({
   }
 
   useEffect(() => {
-    return
     plugin.on('filePanel', 'setWorkspace', async workspace => {
       value.setSearchResults(null)
       value.clearUndo()
@@ -418,6 +417,7 @@ export const SearchProvider = ({
   }, [state.count])
 
   useEffect(() => {
+    console.log('STATE CHANGED', files)
     if (state.find) {
       (async () => {
         try {