@lvce-editor/extension-host-worker 3.13.0 → 3.15.0

package/dist/extensionHostWorkerMain.js

@@ -4596,34 +4596,72 @@ const searchFile = async uri => {
   return all;
 };
 
+const getTextSearchRegex = (query, matchCase) => {
+  const flags = matchCase ? 'u' : 'iu';
+  const regex = new RegExp(query, flags);
+  return regex;
+};
+
+const getLineMatchRegex = (line, lineNumber, query, matchCase) => {
+  const regex = getTextSearchRegex(query, matchCase);
+  const match = line.match(regex);
+  if (match && typeof match.index === 'number') {
+    return [{
+      type: Match,
+      text: line,
+      start: match.index,
+      end: match.index + match[0].length,
+      lineNumber
+    }];
+  }
+  return [];
+};
+
+const getLineMatchText = (line, lineNumber, query, queryLower, matchCase) => {
+  const lineToQuery = matchCase ? line : line.toLowerCase();
+  const actualQuery = matchCase ? query : queryLower;
+  const index = lineToQuery.indexOf(actualQuery);
+  if (index !== -1) {
+    return [{
+      type: Match,
+      text: line,
+      start: index,
+      end: index + query.length,
+      lineNumber
+    }];
+  }
+  return [];
+};
+
+const getLineMatch = (line, lineNumber, query, queryLower, useRegularExpression, matchCase) => {
+  if (useRegularExpression) {
+    return getLineMatchRegex(line, lineNumber, query, matchCase);
+  }
+  return getLineMatchText(line, lineNumber, query, queryLower, matchCase);
+};
+
+const UseRegularExpression = 1 << 1; // 2
+const MatchCase = 1 << 4; // 16
+ // 128
+
 const splitLines = lines => {
   return lines.split('\n');
 };
 
-const textSearchInText = (file, content, query) => {
-  const results = [];
+const textSearchInText = (file, content, query, flags = 0) => {
+  const matchCase = flags & MatchCase;
+  const useRegularExpression = flags & UseRegularExpression;
   const lines = splitLines(content);
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    const index = line.indexOf(query);
-    if (index !== -1) {
-      results.push({
-        type: Match,
-        text: line,
-        start: index,
-        end: index + query.length,
-        lineNumber: i
-      });
-    }
-  }
+  const queryLower = query.toLowerCase();
+  const results = lines.flatMap((line, i) => getLineMatch(line, i, query, queryLower, useRegularExpression, matchCase));
   if (results.length > 0) {
-    results.unshift({
+    return [{
       type: File$3,
       text: file,
       start: 0,
       end: 0,
       lineNumber: 0
-    });
+    }, ...results];
   }
   return results;
 };
@@ -4722,6 +4760,18 @@ const textSearch$1 = async (scheme, root, query) => {
   return all;
 };
 
+const matchesUri = (uri, relativeRoot, include, exclude) => {
+  if (!uri.startsWith(relativeRoot)) {
+    return false;
+  }
+  if (include && typeof include === 'string' && !uri.includes(include)) {
+    return false;
+  }
+  if (exclude && typeof exclude === 'string' && uri.includes(exclude)) {
+    return false;
+  }
+  return true;
+};
 const textSearch = async (scheme, root, query, options, assetDir) => {
   string(scheme);
   string(root);
@@ -4729,13 +4779,14 @@ const textSearch = async (scheme, root, query, options, assetDir) => {
   const files = getFiles();
   const relativeRoot = root.slice('memfs://'.length);
   const allResults = [];
+  const flags = options.flags || 0;
   for (const [key, value] of Object.entries(files)) {
-    if (!key.startsWith(relativeRoot)) {
+    if (!matchesUri(key, relativeRoot, options.include, options.exclude)) {
       continue;
     }
     if (value.type === File$1) {
       const relativeUri = key.slice(relativeRoot.length + 1);
-      const results = textSearchInText(relativeUri, value.content, query);
+      const results = textSearchInText(relativeUri, value.content, query, flags);
       allResults.push(...results);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "3.13.0",
+  "version": "3.15.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "main": "dist/extensionHostWorkerMain.js",
   "type": "module",