Fix display bug with multi-matches lines

atom · Apr 14, 2018 · 4638934 · 4638934
1 parent 0c83a1a
commit 4638934
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/project/result-row-view.js b/lib/project/result-row-view.js
@@ -112,16 +112,14 @@ class MatchRowView {
   }
 
   generatePreviewNode({matches, replacePattern, regex}) {
-    const lineText = matches[0].lineText
     const subnodes = [];
 
     let prevEnd = 0;
     for (const match of matches) {
       const range = Range.fromObject(match.range);
       const matchStart = range.start.column - match.lineTextOffset;
-      const matchEnd = range.end.column - match.lineTextOffset;
 
-      const prefix = match.lineText.slice(prevEnd, matchStart);
+      const prefix = match.lineText.slice(prevEnd - match.lineTextOffset, matchStart);
 
       let replacementText = ''
       if (replacePattern && regex) {
@@ -147,10 +145,11 @@ class MatchRowView {
           replacementText
         )
       );
-      prevEnd = matchEnd;
+      prevEnd = range.end.column;
     }
 
-    const suffix = lineText.slice(prevEnd);
+    const lastMatch = matches[matches.length - 1];
+    const suffix = lastMatch.lineText.slice(prevEnd - lastMatch.lineTextOffset);
 
     return $.span(
       {className: 'preview'},