Skip to content

fix: add null safety to FileDiff getBefore/getAfter #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yangyu0227 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add null safety to FileDiff getBefore/getAfter #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/kotlin/ai/opencode/ide/jetbrains/api/SseEventListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class SseEventListener(

private val gson = GsonBuilder()
.registerTypeAdapter(OpenCodeEvent::class.java, OpenCodeEventDeserializer())
.registerTypeAdapter(FileDiff::class.java, FileDiffDeserializer())
.create()

private var call: Call? = null
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/ai/opencode/ide/jetbrains/session/SessionManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ open class SessionManager(private val project: Project) : Disposable {
*/
fun resolveBeforeContent(relativePath: String, diff: FileDiff, snapshot: TurnSnapshot): String {
val absPath = PathUtil.resolveProjectPath(project, relativePath)
val serverBefore = diff.before
val serverBefore = diff.before ?: ""

// 1. VFS Creation Safety: If we detected a physical creation event, force before to empty.
// This takes precedence because we KNOW it's a new file from our perspective.
Expand Down