feat: add ignoreMatchingLines prop support for line-by-line mode

Author: Lruihao

README-zh.md

@@ -124,7 +124,7 @@ Vue.use(CodeDiff)
 | hideHeader | 隐藏头部栏 | boolean | - | false |
 | hideStat | 隐藏头部栏中的统计信息 | boolean | - | false |
 | theme          | 用于切换日间模式/夜间模式                                                                                                               | ThemeType | light , dark               | light      |
-| ignoreMatchingLines | 给出一个模式来忽略匹配行，例如：'(time\|token)'（**仅支持 side-by-side**） | string | - |  |
+| ignoreMatchingLines | 给出一个模式来忽略匹配行，例如：'(time\|token)' | string | - |  |
 
 ## 组件事件
 

README.md

@@ -126,7 +126,7 @@ Not recommended, but the relevant capabilities are retained to facilitate migrat
 | hideHeader | Hide header bar | boolean | - | false |
 | hideStat | Hide statistical part in the header bar | boolean | - | false |
 | theme          | Add dark mode                                                                                                                                                           | ThemeType | light , dark               | light       |
-| ignoreMatchingLines | Give a pattern to ignore matching lines eg: '(time\|token)' (**Only support side-by-side**) | string | - | undefined |
+| ignoreMatchingLines | Give a pattern to ignore matching lines eg: '(time\|token)' | string | - | undefined |
 
 ## Events
 

src/CodeDiff.vue

@@ -21,7 +21,7 @@ interface Props {
   hideHeader?: boolean
   hideStat?: boolean
   theme?: 'light' | 'dark'
-  // Give a pattern to ignore matching lines eg: '(time|token)' (**Only support side-by-side**)
+  // Give a pattern to ignore matching lines eg: '(time|token)'
   ignoreMatchingLines?: string
 }
 
@@ -70,7 +70,7 @@ const newString = computed(() => {
 
 const raw = computed(() =>
   isUnifiedViewer.value
-    ? createUnifiedDiff(oldString.value, newString.value, props.language, props.diffStyle, props.context)
+    ? createUnifiedDiff(oldString.value, newString.value, props.language, props.diffStyle, props.context, props.ignoreMatchingLines)
     : createSplitDiff(oldString.value, newString.value, props.language, props.diffStyle, props.context, props.ignoreMatchingLines),
 )
 const diffChange = ref(raw.value)

src/utils.ts

@@ -361,8 +361,10 @@ export function createUnifiedDiff(
   language = 'plaintext',
   diffStyle = 'word',
   context = 10,
+  ignoreMatchingLines?: string,
 ): UnifiedViewerChange {
   const changes = diffLines(oldString, newString)
+  const ignoreRegex = ignoreMatchingLines ? new RegExp(ignoreMatchingLines) : undefined
 
   let delNum = 0
   let addNum = 0
@@ -372,7 +374,7 @@ export function createUnifiedDiff(
   const result: UnifiedViewerChange = {
     changes: rawChanges,
     collector: [],
-    stat: calcDiffStat(changes),
+    stat: calcDiffStat(changes, ignoreRegex),
   }
 
   for (let i = 0; i < changes.length; i++) {
@@ -434,7 +436,11 @@ export function createUnifiedDiff(
           delNum++
 
           const code = getHighlightCode(language, renderWords(nextLine, curLine, diffStyle))
-          rawChanges.push({ type: DiffType.DELETE, code, delNum })
+          rawChanges.push({
+            type: ignoreRegex?.test(curLine) ? DiffType.EQUAL : DiffType.DELETE,
+            code,
+            delNum,
+          })
         }
 
         for (let j = 0; j < nextLines.length; j++) {
@@ -443,7 +449,11 @@ export function createUnifiedDiff(
           addNum++
 
           const code = getHighlightCode(language, renderWords(curLine, nextLine, diffStyle))
-          rawChanges.push({ type: DiffType.ADD, code, addNum })
+          rawChanges.push({
+            type: ignoreRegex?.test(nextLine) ? DiffType.EQUAL : DiffType.ADD,
+            code,
+            addNum,
+          })
         }
 
         skip = true