vrr/ProxyAI
2
0
Fork 0
mirror of https://github.com/carlrobertoh/ProxyAI.git synced 2026-05-17 21:12:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: do not trigger next edit diff when no change detected

Browse source
This commit is contained in:
Carl-Robert Linnupuu 2025-03-24 10:21:38 +00:00
parent 55bd3008ff
commit b8b78dd079
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/kotlin/ee/carlrobert/codegpt/codecompletions/edit/GrpcClientService.kt
View file

@ -89,7 +89,10 @@ class GrpcClientService(private val project: Project) : Disposable {
) : StreamObserver<NextEditResponse> {
override fun onNext(response: NextEditResponse) {
runInEdt {
if (LookupManager.getActiveLookup(editor) == null) {
val documentText = editor.document.text
if (LookupManager.getActiveLookup(editor) == null
&& documentText != response.nextRevision
&& documentText == response.oldRevision) {
CodeSuggestionDiffViewer.displayInlineDiff(editor, response, isManuallyOpened)
}
}

13
src/main/kotlin/ee/carlrobert/codegpt/predictions/CodeSuggestionDiffViewer.kt
View file

@ -50,7 +50,7 @@ import kotlin.math.max
class CodeSuggestionDiffViewer(
request: DiffRequest,
private val responseId: UUID,
val nextEditResponse: NextEditResponse,
private val mainEditor: Editor,
private val isManuallyOpened: Boolean
) : UnifiedDiffViewer(MyDiffContext(mainEditor.project), request), Disposable {
@ -125,7 +125,8 @@ class CodeSuggestionDiffViewer(
}
application.executeOnPooledThread {
project?.service<GrpcClientService>()?.acceptEdit(responseId, change.toString())
project?.service<GrpcClientService>()
?.acceptEdit(UUID.fromString(nextEditResponse.id), change.toString())
}
}
@ -315,12 +316,8 @@ class CodeSuggestionDiffViewer(
}
val diffRequest = createSimpleDiffRequest(editor, nextRevision)
val diffViewer = CodeSuggestionDiffViewer(
diffRequest,
UUID.fromString(nextEditResponse.id),
editor,
isManuallyOpened
)
val diffViewer =
CodeSuggestionDiffViewer(diffRequest, nextEditResponse, editor, isManuallyOpened)
editor.putUserData(CodeGPTKeys.EDITOR_PREDICTION_DIFF_VIEWER, diffViewer)
diffViewer.rediff(true)
}

1
src/main/proto/next-edit.proto
View file

@ -21,6 +21,7 @@ message NextEditRequest {
message NextEditResponse {
string id = 1;
string next_revision = 2;
string old_revision = 3;
}
message AcceptEditRequest {