core : fix cutting the lines of a suggestion (#22)

* Fix the problem with cutting the lines of a suggestion after the first one.

* Remove the less important checks on cutting the suggestion.

---------

Co-authored-by: igardev <[email protected]>

Author: igardev

src/architect.ts

@@ -400,8 +400,7 @@ export class Architect {
                 return [];
             }
 
-            // TODO: this is disabled because it removes many useful suggestions
-            //completion = this.updateSuggestion(suggestionLines, document, position, linePrefix, lineSuffix);
+            completion = this.updateSuggestion(suggestionLines, lineSuffix);
 
             if (!isCachedResponse) this.lruResultCache.put(hashKey, completion)
             this.lastCompletion = this.getCompletionDetails(completion, position, inputPrefix, inputSuffix, prompt);
@@ -672,40 +671,14 @@ export class Architect {
         return discardSuggestion;
     }
 
-    // returns suggestion with removed trailing part, which is the same as the existing code
-    updateSuggestion = (suggestionLines: string[], document: vscode.TextDocument, position: vscode.Position, linePrefix: string, lineSuffix: string) => {
-        let updatedSuggestion = suggestionLines.join("\n");
-        if (suggestionLines.length == 1 && lineSuffix.trim() === "") return updatedSuggestion
-        // if suggestion is one line and the line suffix is a suffix of the line - remove the line suffix
-        if (suggestionLines.length == 1 && suggestionLines[0].endsWith(lineSuffix)) return suggestionLines[0].slice(0, -lineSuffix.length);
+    // cut part of the suggestion in some special cases
+    updateSuggestion = (suggestionLines: string[], lineSuffix: string) => {
+        if (lineSuffix.trim() != ""){
+            if (suggestionLines[0].endsWith(lineSuffix)) return suggestionLines[0].slice(0, -lineSuffix.length);
+            if (suggestionLines.length > 1) return suggestionLines[0];
+        } 
 
-        // if cursor on the last line just return the suggestion
-        if (position.line == document.lineCount - 1) return updatedSuggestion;
-
-        // if the following lines repeat the suggestion and the line suffix is empty - update suggestion
-        if (suggestionLines.length > 1
-            && (lineSuffix.trim() === "")) {
-            let linesToCompareCount = suggestionLines.length - 1
-            // if cursor on the last line don't discard
-            if (position.line + linesToCompareCount > document.lineCount - 1) return updatedSuggestion;
-            let indLastSuggestionLine =  suggestionLines.slice(1).reverse().findIndex((value, index) => value != document.lineAt((position.line + linesToCompareCount) - index).text)
-            return suggestionLines.slice(0, indLastSuggestionLine + 2).join("\n"); // if indLastSuggestionLine is -1 then all following lines are the same as the suggestion
-        }
-
-        // if the following lines repeat the suggestion and the first line ends with the line suffix update suggestion
-        if (suggestionLines.length > 1
-            && suggestionLines[0].endsWith(lineSuffix)
-            && suggestionLines.slice(1).every((value, index) => value === document.lineAt((position.line + 1) + index).text)){
-            return suggestionLines[0].slice(0, -lineSuffix.length);
-        }
-
-        // if there is a line suffix suggest only one line
-        if (suggestionLines.length > 1
-            && lineSuffix.trim() != ""){
-            return suggestionLines[0];
-        }
-
-        return updatedSuggestion;
+        return suggestionLines.join("\n");
     }
 
     private getCompletionDetails = (completion: string, position: vscode.Position, inputPrefix: string, inputSuffix: string, prompt: string) => {