fix(agent): fix postprocess remove duplicated block closing line. (Ta…

…bbyML#1262)
lizaowei · Jan 22, 2024 · b3cbe36 · b3cbe36
1 parent f220ba9
commit b3cbe36
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...bby-agent/src/postprocess/golden/remove_duplication/duplicated_block_closing_line_01.toml b/...bby-agent/src/postprocess/golden/remove_duplication/duplicated_block_closing_line_01.toml
@@ -0,0 +1,22 @@
+description = 'Remove duplication: duplicated block closing line: case 01'
+
+[config]
+# use default config
+
+[context]
+filepath = 'checks.js'
+language = 'javascript'
+# indentation = '  ' # not specified
+text = '''
+function log(obj) {├
+  console.log(obj);
+};┤
+}
+'''
+
+[expected]
+text = '''
+function log(obj) {├
+  console.log(obj);┤
+}
+'''
diff --git a/clients/tabby-agent/src/postprocess/removeDuplicatedBlockClosingLine.ts b/clients/tabby-agent/src/postprocess/removeDuplicatedBlockClosingLine.ts
@@ -30,7 +30,10 @@ export function removeDuplicatedBlockClosingLine(): PostprocessFilter {
     }
     const suffixBeginningLine = suffixLines[suffixBeginningIndex]!;
 
-    if (inputEndingLine.startsWith(suffixBeginningLine) || suffixBeginningLine.startsWith(inputEndingLine)) {
+    if (
+      inputEndingLine.startsWith(suffixBeginningLine.trimEnd()) ||
+      suffixBeginningLine.startsWith(inputEndingLine.trimEnd())
+    ) {
       logger.debug({ inputLines, suffixLines }, "Removing duplicated block closing line");
       return inputLines
         .slice(0, inputLines.length - 1)