ADFA-4613: Surround with try/catch code action#1524
Open
itsaky-adfa wants to merge 15 commits into
Open
Conversation
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
There was a problem hiding this comment.
Claude Code Review
This repository is configured for manual code reviews. Comment @claude review for a one-time review, or @claude review always to subscribe this PR to a review on every future push.
Tip: disable this comment in your organization's Code Review settings.
Contributor
📝 Walkthrough
WalkthroughAdds a Kotlin code action that wraps selected editor lines in a ChangesSurround with try/catch and Kotlin action metadata
Estimated code review effort: 3 (Moderate) | ~20 minutes Sequence Diagram(s)sequenceDiagram
participant KotlinCodeActionsMenu
participant SurroundWithTryCatchAction
participant computeSurroundWithTryCatchEdit
participant languageClient
KotlinCodeActionsMenu->>SurroundWithTryCatchAction: expose action
SurroundWithTryCatchAction->>computeSurroundWithTryCatchEdit: pass selected lines and editor text
computeSurroundWithTryCatchEdit-->>SurroundWithTryCatchAction: return TextEdit
SurroundWithTryCatchAction->>languageClient: performCodeAction with DocumentChange
Possibly related PRs
Suggested reviewers: Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (1)
lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/utils/SurroundWithTryCatch.kt (1)
28-38: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low valueDerive the block indentation token from the surrounding code.
The implementation hardcodes
\tfor the added block depth. If the user's codebase uses spaces (e.g.,baseIndentconsists of spaces), this creates a mix of spaces and tabs (e.g.,\te.printStackTrace()). While the follow-up formatter might clean this up, inferring the indent token ensures the raw text edit remains consistent in case the formatter is unavailable or fails.♻️ Proposed refactor to dynamically infer indentation
val baseIndent = selected.first(String::isNotBlank).takeWhile { it == ' ' || it == '\t' } - val body = selected.joinToString("\n") { if (it.isBlank()) it else "\t$it" } + val indentToken = if (baseIndent.startsWith(" ")) " " else "\t" + val body = selected.joinToString("\n") { if (it.isBlank()) it else "$indentToken$it" } val newText = buildString { append(baseIndent).append("try {\n") append(body).append('\n') append(baseIndent).append("} catch (e: Exception) {\n") - append(baseIndent).append("\te.printStackTrace()\n") + append(baseIndent).append(indentToken).append("e.printStackTrace()\n") append(baseIndent).append("}") }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/utils/SurroundWithTryCatch.kt` around lines 28 - 38, Update the indentation logic in the newText builder to derive the block indentation token from the surrounding code instead of hardcoding tab characters. Use the indentation style represented by baseIndent when indenting body lines and the catch statement, while preserving the existing try/catch structure and relative nesting.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In
`@lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/utils/SurroundWithTryCatch.kt`:
- Around line 28-38: Update the indentation logic in the newText builder to
derive the block indentation token from the surrounding code instead of
hardcoding tab characters. Use the indentation style represented by baseIndent
when indenting body lines and the catch statement, while preserving the existing
try/catch structure and relative nesting.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 499f9ecd-3320-4fb2-845e-d5c61d16d8fa
📒 Files selected for processing (6)
idetooltips/src/main/java/com/itsaky/androidide/idetooltips/TooltipTag.ktlsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/KotlinCodeActionsMenu.ktlsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/actions/SurroundWithTryCatchAction.ktlsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/utils/SurroundWithTryCatch.ktlsp/kotlin/src/test/java/com/itsaky/androidide/lsp/kotlin/utils/SurroundWithTryCatchTest.ktresources/src/main/res/values/strings.xml
hal-eisen-adfa
approved these changes
Jul 15, 2026
jatezzz
approved these changes
Jul 16, 2026
Signed-off-by: Akash Yadav <[email protected]>
Signed-off-by: Akash Yadav <[email protected]>
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/actions/ImplementMembersAction.kt`:
- Around line 33-34: Update ImplementMembersAction’s titleTextRes and tooltipTag
to the implement-members metadata that matches computeImplementMembersEdit and
its implementMembers action ID. Keep the action’s existing implementation
behavior unchanged rather than advertising override-superclass methods.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro Plus
Run ID: 16597bf3-5c70-4581-9982-3581eaa64f37
📒 Files selected for processing (6)
idetooltips/src/main/java/com/itsaky/androidide/idetooltips/TooltipTag.ktlsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/actions/ImplementMembersAction.ktlsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/actions/NullSafetyAction.ktlsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/actions/OrganizeImportsAction.ktlsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/actions/SurroundWithTryCatchAction.ktresources/src/main/res/values/strings.xml
💤 Files with no reviewable changes (1)
- resources/src/main/res/values/strings.xml
🚧 Files skipped from review as they are similar to previous changes (1)
- lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/actions/SurroundWithTryCatchAction.kt
Comment on lines
+33
to
+34
| override var titleTextRes: Int = R.string.action_override_superclass_methods | ||
| override var tooltipTag: String = TooltipTag.EDITOR_CODE_ACTIONS_KT_OVERRIDE_SUPER |
Contributor
There was a problem hiding this comment.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Keep the metadata aligned with the implemented action.
ImplementMembersAction still calls computeImplementMembersEdit and uses the implementMembers ID, but these lines now advertise “Override superclass methods.” Restore implement-members metadata, or rename/rework the action consistently if override-superclass behavior is intended.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In
`@lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/actions/ImplementMembersAction.kt`
around lines 33 - 34, Update ImplementMembersAction’s titleTextRes and
tooltipTag to the implement-members metadata that matches
computeImplementMembersEdit and its implementMembers action ID. Keep the
action’s existing implementation behavior unchanged rather than advertising
override-superclass methods.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds a Surround with try/catch code action to the Kotlin K2 LSP. On a selection in the editor's "Code actions" menu, it wraps the selected lines in:
Jira: ADFA-4613 (subtask of ADFA-3317, Integrate K2 compiler with LSP)
Approach
AddThrowsAction). The action operates on the current selection; with no selection it wraps the current line.computeSurroundWithTryCatchEdit(text, startLine, endLine)computes a single whole-line replaceTextEdit(columns ignored, matchingCommentLineAction). It computes indentation itself, so the result is correct even if the follow-up formatter is unavailable.SurroundWithTryCatchAction : BaseKotlinCodeActionreads the editor selection, calls the helper, and routes the edit throughlanguageClient.performCodeAction(...)withCommand.CMD_FORMAT_CODE, mirroringAddImportAction. Registered inKotlinCodeActionsMenu.Fixed
catch (e: Exception)with ane.printStackTrace()body. Out of scope (deliberately):@Throws/exception-type inference, a diagnostic-triggered variant, PSI statement-snapping, and surround-with for other constructs.Changes
lsp/kotlin/.../utils/SurroundWithTryCatch.kt- pure edit helper (new)lsp/kotlin/.../actions/SurroundWithTryCatchAction.kt- the code action (new)lsp/kotlin/.../KotlinCodeActionsMenu.kt- register the actionidetooltips/.../TooltipTag.kt- tooltip tag constantresources/.../values/strings.xml-action_surround_with_try_catchstringTesting
SurroundWithTryCatchTest, 5 cases: single line, indented multi-line block, blank-line preservation, whitespace-only no-op, out-of-range guards), asserting exactnewTextandRangeincluding computed indices.:lsp:kotlin:testV7DebugUnitTest-> 5/5 pass, no regressions..ktfile, run "Surround with try/catch" from the Code actions menu, confirm the block is wrapped and reindented.