Jetbrains - Multidiff #2294
Jetbrains - Multidiff #2294
Conversation
🦋 Changeset detectedLatest commit: 5ada302 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
There was a problem hiding this comment.
Pull Request Overview
This PR implements multi-file diff functionality for the JetBrains plugin, enabling support for displaying multiple file changes in a single view similar to VSCode's "vscode.changes" command. Additionally, it updates various file paths and references from "roo-cline" to "kilocode" branding.
- Adds multi-file diff command support with new
MultiDiffCommandsclass - Updates branding from "roo-cline" to "kilocode" across multiple files
- Removes unused utility files and example code
Reviewed Changes
Copilot reviewed 11 out of 16 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| jetbrains/plugin/src/main/kotlin/ai/kilocode/jetbrains/editor/MultiDiffCommands.kt | New file implementing multi-file diff functionality with vscode.changes command support |
| jetbrains/plugin/src/main/kotlin/ai/kilocode/jetbrains/editor/EditorCommands.kt | Updated to register the new multi-diff commands |
| jetbrains/plugin/src/main/kotlin/ai/kilocode/jetbrains/util/FutureUtils.kt | Removed unused utility file for coroutine-to-CompletableFuture conversion |
| jetbrains/plugin/src/main/kotlin/ai/kilocode/jetbrains/ipc/proxy/uri/UriTransformerExample.kt | Removed example file for URI transformer usage |
| Multiple files | Updated file paths and references from "roo-cline" to "kilocode" branding |
jetbrains/plugin/src/main/kotlin/ai/kilocode/jetbrains/editor/MultiDiffCommands.kt
Show resolved
Hide resolved
jetbrains/plugin/src/main/kotlin/ai/kilocode/jetbrains/editor/MultiDiffCommands.kt
Show resolved
Hide resolved
jetbrains/plugin/src/main/kotlin/ai/kilocode/jetbrains/editor/MultiDiffCommands.kt
Show resolved
Hide resolved
|
Is there a specific reason we removed the shell integration scripts? Don't we need them to enable Jetbrains terminal use? I just tested my zsh and Powershell in the JB Plugin and the LLM can manipulate JB shells (in the 3 I tested right quick - Rider, IntelliJ & WebStorm) "execute |
| contentFactory.create(project, file) | ||
| } | ||
|
|
||
| "cline-diff" -> { |
There was a problem hiding this comment.
lol @ cline still hanging around in this code
There was a problem hiding this comment.
That come from the extension... https://github.com/Kilo-Org/kilocode/blob/main/src/integrations/editor/DiffViewProvider.ts#L19
There was a problem hiding this comment.
Yeah sorry, I was just commenting in general that "cline" is still in the repo- nothing to do with your code!
| private fun isTestEnvironment(): Boolean { | ||
| return try { | ||
| // Check if we're running under test | ||
| ApplicationManager.getApplication()?.isUnitTestMode == true || | ||
| System.getProperty("idea.test.mode") == "true" || | ||
| Thread.currentThread().stackTrace.any { | ||
| it.className.contains("test", ignoreCase = true) || | ||
| it.className.contains("Test", ignoreCase = false) | ||
| } | ||
| } catch (e: Exception) { | ||
| false | ||
| } | ||
| } |
There was a problem hiding this comment.
Is this a standard for Jetbrains stuff or vibed? Seems a little sloppy tbh
There was a problem hiding this comment.
Looks really sloppy, that was added for testing, i will remove it.
|
@adamhill, I was a little confused at first too, but then noticed the terminal stuff was just moved due to the rename: |
3 participants
Context
This PR implements multi-file diff functionality for the JetBrains plugin, enabling support for displaying multiple file changes in a single view similar to VSCode's "vscode.changes" command. Additionally, it updates various file paths and references from "roo-cline" to "kilocode" branding.
Implementation
Screenshot