Merge branch 'main' into release-vsce-1.17

Cargo.toml

@@ -24,7 +24,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.21.0-dev.0"
+version = "0.24.0-dev.0"
 edition = "2021"
 authors = ["TabbyML Team"]
 homepage = "https://github.com/TabbyML/tabby"

clients/tabby-agent/src/codeCompletion/contexts.ts

@@ -95,6 +95,9 @@ export class CompletionContext {
   currSeg: string = "";
   withCorrectCompletionItem: boolean = false; // weather we are using completionItem or not
 
+  // is current suffix is at end of line excluding auto closed char
+  lineEnd: RegExpMatchArray | null = null;
+
   constructor(request: CompletionRequest) {
     this.filepath = request.filepath;
     this.language = request.language;
@@ -119,13 +122,13 @@ export class CompletionContext {
     this.relevantSnippetsFromChangedFiles = request.relevantSnippetsFromChangedFiles;
     this.snippetsFromOpenedFiles = request.relevantSnippetsFromOpenedFiles;
 
-    const lineEnd = isAtLineEndExcludingAutoClosedChar(this.currentLineSuffix);
-    this.mode = lineEnd ? "default" : "fill-in-line";
+    this.lineEnd = isAtLineEndExcludingAutoClosedChar(this.currentLineSuffix);
+    this.mode = this.lineEnd ? "default" : "fill-in-line";
     this.hash = hashObject({
       filepath: this.filepath,
       language: this.language,
       prefix: this.prefix,
-      currentLineSuffix: lineEnd ? "" : this.currentLineSuffix,
+      currentLineSuffix: this.lineEnd ? "" : this.currentLineSuffix,
       nextLines: this.suffixLines.slice(1).join(""),
       position: this.position,
       clipboard: this.clipboard,
@@ -209,7 +212,11 @@ export class CompletionContext {
   buildSegments(config: ConfigData["completion"]["prompt"]): TabbyApiComponents["schemas"]["Segments"] {
     // prefix && suffix
     const prefix = this.prefixLines.slice(Math.max(this.prefixLines.length - config.maxPrefixLines, 0)).join("");
-    const suffix = this.suffixLines.slice(0, config.maxSuffixLines).join("");
+    let suffix = this.suffixLines.slice(0, config.maxSuffixLines).join("");
+    // if it's end of line, we don't need to include the suffix
+    if (this.lineEnd) {
+      suffix = "\n" + suffix.split("\n").slice(1).join("\n");
+    }
 
     // filepath && git_url
     let relativeFilepathRoot: string | undefined = undefined;

clients/tabby-agent/src/codeCompletion/postprocess/calculateReplaceRange.ts

@@ -1,9 +1,11 @@
 import { PostprocessFilter } from "./base";
 import { CompletionItem } from "../solution";
 import { calculateReplaceRangeByBracketStack } from "./calculateReplaceRangeByBracketStack";
+import { calculateReplaceRangeBySemiColon } from "./calculateReplaceRangeBySemiColon";
 
 export function calculateReplaceRange(): PostprocessFilter {
   return async (item: CompletionItem): Promise<CompletionItem> => {
-    return calculateReplaceRangeByBracketStack(item);
+    const afterBracket = calculateReplaceRangeByBracketStack(item);
+    return calculateReplaceRangeBySemiColon(afterBracket);
   };
 }

clients/tabby-agent/src/codeCompletion/postprocess/calculateReplaceRangeByBracketStack.test.ts

@@ -125,8 +125,43 @@ describe("postprocess", () => {
       };
       await assertFilterResult(filter, context, completion, expected);
     });
+    it("should handle bracket case with semicolon", async () => {
+      const context = documentContext`
+        console.log("║");
+      `;
+      context.language = "typescript";
+      const completion = {
+        text: inline`
+                       ├hello world");┤
+        `,
+      };
+      const expected = {
+        text: inline`
+                       ├hello world");┤
+        `,
+        replaceSuffix: '");',
+      };
+      await assertFilterResult(filter, context, completion, expected);
+    });
+    it("should handle bracket case with semicolon", async () => {
+      const context = documentContext`
+        console.log(║);
+      `;
+      context.language = "typescript";
+      const completion = {
+        text: inline`
+                       ├a + b);┤
+        `,
+      };
+      const expected = {
+        text: inline`
+                       ├a + b);┤
+        `,
+        replaceSuffix: ");",
+      };
+      await assertFilterResult(filter, context, completion, expected);
+    });
   });
-
   describe("calculateReplaceRangeByBracketStack: bad cases", () => {
     const filter = calculateReplaceRangeByBracketStack;
     it("cannot handle the case of completion bracket stack is same with suffix but should not be replaced", async () => {

clients/tabby-agent/src/codeCompletion/postprocess/calculateReplaceRangeByBracketStack.ts

@@ -1,31 +1,28 @@
 import { logger } from "./base";
 import { CompletionItem } from "../solution";
-import { isBlank, findUnpairedAutoClosingChars } from "../../utils/string";
 
 export function calculateReplaceRangeByBracketStack(item: CompletionItem): CompletionItem {
   const context = item.context;
   const { currentLineSuffix } = context;
-  const suffixText = currentLineSuffix.trimEnd();
-  if (isBlank(suffixText)) {
-    return item;
-  }
-  const unpaired = findUnpairedAutoClosingChars(item.text).join("");
-  if (isBlank(unpaired)) {
+
+  if (!context.lineEnd) {
     return item;
   }
 
   let modified: CompletionItem | undefined = undefined;
-  if (suffixText.startsWith(unpaired)) {
-    modified = item.withSuffix(unpaired);
-  } else if (unpaired.startsWith(suffixText)) {
+  const suffixText = context.currentLineSuffix.trimEnd();
+  const lineEnd = context.lineEnd[0];
+  if (suffixText.startsWith(lineEnd)) {
+    modified = item.withSuffix(lineEnd);
+  } else if (lineEnd.startsWith(suffixText)) {
     modified = item.withSuffix(suffixText);
   }
   if (modified) {
     logger.trace("Adjust replace range by bracket stack.", {
       position: context.position,
       currentLineSuffix,
       completionText: item.text,
-      unpaired,
+      lineEnd,
       replaceSuffix: item.replaceSuffix,
     });
     return modified;