@lvce-editor/extension-host-worker 4.7.0 → 4.8.0

package/dist/extensionHostWorkerMain.js

@@ -5251,30 +5251,43 @@ const getLineMatchRegex = (line, lineNumber, query, matchCase) => {
   return [];
 };
 
-const getLineMatchText = (line, lineNumber, query, queryLower, matchCase) => {
+const doesMatchWord = (line, index, wordBoundaries) => {
+  if (index === 0) {
+    return true;
+  }
+  const char = line.charAt(index - 1);
+  return wordBoundaries.includes(char);
+};
+const getLineMatchText = (line, lineNumber, query, queryLower, matchCase, matchWholeWord) => {
+  // TODO support multiple matches per line
   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
-    }];
+  if (index === -1) {
+    return [];
   }
-  return [];
+  const wordBoundaries = [' ', '\t', '-'];
+  if (matchWholeWord && !doesMatchWord(line, index, wordBoundaries)) {
+    return [];
+  }
+  return [{
+    type: Match,
+    text: line,
+    start: index,
+    end: index + query.length,
+    lineNumber
+  }];
 };
 
-const getLineMatch = (line, lineNumber, query, queryLower, useRegularExpression, matchCase) => {
+const getLineMatch = (line, lineNumber, query, queryLower, useRegularExpression, matchCase, matchWholeWord) => {
   if (useRegularExpression) {
     return getLineMatchRegex(line, lineNumber, query, matchCase);
   }
-  return getLineMatchText(line, lineNumber, query, queryLower, matchCase);
+  return getLineMatchText(line, lineNumber, query, queryLower, matchCase, matchWholeWord);
 };
 
 const UseRegularExpression = 1 << 1; // 2
+const MatchWholeWord = 1 << 3; // 8
 const MatchCase = 1 << 4; // 16
  // 128
 
@@ -5285,9 +5298,10 @@ const splitLines = lines => {
 const textSearchInText = (file, content, query, flags = 0) => {
   const matchCase = flags & MatchCase;
   const useRegularExpression = flags & UseRegularExpression;
+  const matchWholeWord = flags & MatchWholeWord;
   const lines = splitLines(content);
   const queryLower = query.toLowerCase();
-  const results = lines.flatMap((line, i) => getLineMatch(line, i, query, queryLower, useRegularExpression, matchCase));
+  const results = lines.flatMap((line, i) => getLineMatch(line, i, query, queryLower, useRegularExpression, matchCase, matchWholeWord));
   if (results.length > 0) {
     return [{
       type: File$3,
@@ -5406,6 +5420,7 @@ const matchesUri = (uri, relativeRoot, include, exclude) => {
   }
   return true;
 };
+
 const textSearch = async (scheme, root, query, options, assetDir) => {
   string(scheme);
   string(root);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "keywords": [
     "web-worker"