Fix inline completion when first line has prefix and suffix

Author: hetzge

plugin/src/de/hetzge/eclipse/aicoder/inline/InlineCompletion.java

@@ -17,33 +17,15 @@ public record InlineCompletion(
 		int widgetLineIndex,
 		IRegion modelRegion,
 		int widgetOffset,
-		String firstLineContent,
-		String content,
-		/*
-		 * if the completion is not the end of the line, this contains the next letter (otherwise null)
-		 */
-		String firstLineSuffixCharacter,
+		String content, // the whole completion content
+		List<String> lines, // the completion content line by line
+		String firstLineFillPrefix,
+		String firstLineFillSuffix,
+		String firstLineSuffix, // the existing suffix of the line that is being completed
+		String firstLineSuffixCharacter, // if the completion is not the end of the line, this contains the next letter (otherwise null)
 		int lineSpacing,
 		int lineHeight) {
 
-	public String toDebugString() {
-		return """
-				=========================
-				lineIndex: %d
-				modelRegion: %s
-				widgetOffset: %d
-				firstLineContent: "%s"
-				content:
-				---
-				%s
-				---
-				firstLineSuffixCharacter: "%s"
-				lineSpacing: %d
-				lineHeight: %d
-				=========================
-				""".formatted(this.widgetLineIndex, this.modelRegion, this.widgetOffset, this.firstLineContent, this.content, this.firstLineSuffixCharacter, this.lineSpacing, this.lineHeight);
-	}
-
 	public void applyTo(final IDocument document) throws BadLocationException {
 		final int replaceOffset = this.modelRegion().getOffset();
 		final int replaceLength = this.modelRegion().getLength();
@@ -78,19 +60,21 @@ public static InlineCompletion create(AiCoderHistoryEntry historyEntry, IDocumen
 		} else {
 			lineSuffixLength = document.getLength() - modelOffset;
 		}
-		final String lineSuffix = document.get(modelOffset, lineSuffixLength);
-		final String firstLineSuffixCharacter = !lineSuffix.isBlank() && !isMultiline ? lineSuffix.substring(0, 1) : null;
-		String firstLineContent = content.lines().findFirst().orElse("");
-		final boolean contentContainsLineSuffix = content.startsWith(lineSuffix);
-		if (contentContainsLineSuffix) {
-			content = content.substring(lineSuffixLength);
-			firstLineContent = firstLineContent.substring(Math.min(lineSuffixLength, firstLineContent.length()));
-		}
+		final String firstLineSuffix = document.get(modelOffset, lineSuffixLength);
+		final String firstLineSuffixCharacter = !firstLineSuffix.isBlank() ? firstLineSuffix.substring(0, 1) : null;
+		final String firstLineContent = content.lines().findFirst().orElse("");
+		final boolean contentContainsLineSuffix = content.startsWith(firstLineSuffix);
 		final int lineSpacing = (int) (defaultLineSpacing + (content.lines().count() - 1) * lineHeight);
-		final Region modelRegion = new Region(modelOffset, contentContainsLineSuffix || isMultiline ? lineSuffix.length() : 0);
-		if (isMultiline && !lineSuffix.isBlank()) {
-			content += lineSuffix;
+		final Region modelRegion = new Region(modelOffset, contentContainsLineSuffix || isMultiline ? firstLineSuffix.length() : 0);
+		final String firstLineFillPrefix;
+		final String firstLineFillSuffix;
+		if (!firstLineContent.isBlank() && !firstLineSuffix.isBlank() && firstLineContent.contains(firstLineSuffix)) {
+			firstLineFillPrefix = firstLineContent.substring(0, firstLineContent.indexOf(firstLineSuffix));
+			firstLineFillSuffix = firstLineContent.substring(firstLineContent.indexOf(firstLineSuffix) + firstLineSuffix.length());
+		} else {
+			firstLineFillPrefix = firstLineContent;
+			firstLineFillSuffix = "";
 		}
-		return new InlineCompletion(historyEntry, widgetLine, modelRegion, widgetOffset, firstLineContent, content, firstLineSuffixCharacter, lineSpacing, lineHeight);
+		return new InlineCompletion(historyEntry, widgetLine, modelRegion, widgetOffset, content, content.lines().toList(), firstLineFillPrefix, firstLineFillSuffix, firstLineSuffix, firstLineSuffixCharacter, lineSpacing, lineHeight);
 	}
 }

plugin/src/de/hetzge/eclipse/aicoder/inline/InlineCompletionController.java

@@ -385,14 +385,18 @@ public void abort(String reason) {
 		}
 		if (this.suggestion != null) {
 			AiCoderActivator.log().info(String.format("Unset suggestion (reason: '%s')", reason));
-			this.suggestion.historyEntry().setStatus(HistoryStatus.REJECTED);
+			if (this.suggestion.historyEntry().getStatus() == HistoryStatus.GENERATED) {
+				this.suggestion.historyEntry().setStatus(HistoryStatus.REJECTED);
+			}
 			this.suggestion = null;
 			AiCoderHistoryView.get().ifPresent(AiCoderHistoryView::refresh);
 			this.paintListener.resetMetrics();
 		}
 		if (this.completion != null) {
 			AiCoderActivator.log().info(String.format("Unset completions (reason: '%s')", reason));
-			this.completion.historyEntry().setStatus(HistoryStatus.REJECTED);
+			if (this.completion.historyEntry().getStatus() == HistoryStatus.GENERATED) {
+				this.completion.historyEntry().setStatus(HistoryStatus.REJECTED);
+			}
 			this.completion = null;
 			AiCoderHistoryView.get().ifPresent(AiCoderHistoryView::refresh);
 			this.paintListener.resetMetrics();
@@ -537,24 +541,26 @@ public void paintControl(PaintEvent event) {
 			final InlineCompletion completion = InlineCompletionController.this.completion;
 			if (completion != null) {
 				final Point location = widget.getLocationAtOffset(completion.widgetOffset());
-				final List<String> lines = completion.content().lines().toList();
+				final List<String> lines = completion.lines();
 				event.gc.setBackground(new Color(200, 255, 200));
 				event.gc.setForeground(widget.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
 				event.gc.setFont(font);
 				for (int i = 0; i < lines.size(); i++) {
 					final String line = lines.get(i);
 					if (i == 0) {
 						// first line
-						event.gc.drawText(completion.firstLineContent(), location.x, location.y, true);
+						event.gc.drawText(completion.firstLineFillPrefix(), location.x, location.y, true);
 						if (completion.firstLineSuffixCharacter() != null) {
 							final int suffixCharacterWidth = event.gc.textExtent(completion.firstLineSuffixCharacter()).x;
-							final int contentWidth = event.gc.textExtent(completion.firstLineContent()).x;
+							final int suffixWidth = event.gc.textExtent(completion.firstLineSuffix()).x;
+							final int fillPrefixWidth = event.gc.textExtent(completion.firstLineFillPrefix()).x;
 							final StyleRange styleRange = widget.getStyleRangeAtOffset(completion.widgetOffset());
-							final int metricWidth = contentWidth + suffixCharacterWidth;
+							final int metricWidth = fillPrefixWidth + suffixCharacterWidth;
 							if (needMetricUpdate(styleRange, metricWidth)) {
 								updateMetrics(event, completion, widget, metricWidth);
 							}
-							event.gc.drawText(completion.firstLineSuffixCharacter(), location.x + contentWidth, location.y, false);
+							event.gc.drawText(completion.firstLineSuffixCharacter(), location.x + fillPrefixWidth, location.y, false);
+							event.gc.drawText(completion.firstLineFillSuffix(), location.x + fillPrefixWidth + suffixWidth, location.y, true);
 						}
 					} else {
 						event.gc.drawText(line.replace("\t", " ".repeat(InlineCompletionController.this.widget.getTabs())), -widget.getHorizontalPixel(), location.y + i * completion.lineHeight(), true);