vrr/ProxyAI
2
0
Fork 0
mirror of https://github.com/carlrobertoh/ProxyAI.git synced 2026-05-20 09:24:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: segment parsing

Browse source
This commit is contained in:
Carl-Robert Linnupuu 2025-06-01 18:11:47 +01:00
parent 07ea6340d6
commit 8d6c3067c3
2 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/ee/carlrobert/codegpt/toolwindow/chat/editor/factory/EditorFactory.kt
View file

@ -37,8 +37,8 @@ object EditorFactory {
fun createEditor(project: Project, segment: Segment): EditorEx {
val content = segment.content
val languageMapping = FileUtil.findLanguageExtensionMapping(segment.language)
val virtualFile = segment.filePath?.let { getVirtualFile(it)}
val isDiffType = isDiffType(segment, content)
return invokeAndWaitIfNeeded {
val editor = if (isDiffType) {
createDiffEditor(project, segment)
@ -49,7 +49,7 @@ object EditorFactory {
segment.filePath?.let { filePath ->
CodeGPTKeys.TOOLWINDOW_EDITOR_FILE_DETAILS.set(
editor,
ToolWindowEditorFileDetails(filePath, getVirtualFile(filePath))
ToolWindowEditorFileDetails(filePath, virtualFile)
)
DiffSyncManager.registerEditor(filePath, editor)

33
src/main/kotlin/ee/carlrobert/codegpt/toolwindow/chat/parser/SseMessageParser.kt
View file

@ -23,13 +23,19 @@ class SseMessageParser : MessageParser {
}
override fun parse(input: String): List<Segment> {
buffer.append(input)
val segments = mutableListOf<Segment>()
var position = 0
while (processNextSegment(segments)) {
// Continue processing until no more complete segments can be extracted
while (position < input.length) {
val endPosition = minOf(position + 16, input.length)
val chunk = input.substring(position, endPosition)
buffer.append(chunk)
while (processNextSegment(segments)) {
}
position = endPosition
}
segments.addAll(getPendingSegments())
return segments
@ -181,6 +187,7 @@ class SseMessageParser : MessageParser {
parserState = ParserState.InCode(state.header)
true
}
line.trim() == CODE_FENCE -> {
// Invalid search/replace block - missing REPLACE marker
// Mark done
@ -188,6 +195,7 @@ class SseMessageParser : MessageParser {
parserState = ParserState.Outside
true
}
else -> {
val newReplace =
if (state.replaceContent.isEmpty()) line else state.replaceContent + NEWLINE + line
@ -241,9 +249,20 @@ class SseMessageParser : MessageParser {
}
is ParserState.InCode -> {
if (state.content.isNotBlank()) {
listOf(Code(state.content, state.header.language, state.header.filePath))
} else emptyList()
val segments = mutableListOf<Segment>()
if (buffer.toString().trim() == CODE_FENCE) {
if (state.content.isNotBlank()) {
segments.add(
Code(state.content, state.header.language, state.header.filePath)
)
}
segments.add(CodeEnd(""))
} else if (state.content.isNotBlank()) {
segments.add(Code(state.content, state.header.language, state.header.filePath))
}
segments
}
is ParserState.InSearch -> {