Skip to content

ADFA-3481 | Fix editor indent OOM on Enter key event #1465

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

Merged
jatezzz merged 1 commit into from
Jul 1, 2026
Merged

ADFA-3481 | Fix editor indent OOM on Enter key event #1465

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
25 changes: 8 additions & 17 deletions editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import com.itsaky.androidide.editor.schemes.IDEColorScheme
import com.itsaky.androidide.editor.schemes.LanguageScheme
import com.itsaky.androidide.editor.schemes.LanguageSpecProvider.getLanguageSpec
import com.itsaky.androidide.editor.schemes.LocalCaptureSpecProvider.newLocalCaptureSpec
import com.itsaky.androidide.editor.utils.isNonBlankLine
import com.itsaky.androidide.treesitter.TSLanguage
import com.itsaky.androidide.treesitter.TreeSitter
import com.itsaky.androidide.utils.IntPair
Expand Down Expand Up @@ -145,31 +144,23 @@ abstract class TreeSitterLanguage(
return DEF_IDENT_ADV
}

var linesToReq = LongArray(1)
linesToReq[0] = IntPair.pack(line, column)

if (content.reference.isNonBlankLine(line + 1)) {
// consider the indentation of the next line only if it is non-blank
linesToReq += IntPair.pack(line + 1, 0)
}
// Request both lines so the advance is a relative delta, cancelling any mismatch between the editor's indent size and the file's actual indentation width.
val linesToReq = longArrayOf(
IntPair.pack(line, column),
IntPair.pack(line + 1, 0)
)

val indents = this.indentProvider.getIndentsForLines(
content = content.reference,
positions = linesToReq,
)

if (indents.size == 1) {
val indent = indents[0]
if (indent == TreeSitterIndentProvider.INDENTATION_ERR) {
return DEF_IDENT_ADV
}

return indent - (spaceCountOnLine + (tabCountOnLine * getTabSize()))
}

val (indentLine, indentNxtLine) = indents
// A sentinel indent (e.g. INDENT_AUTO == Int.MAX_VALUE) would overflow the advance into a huge whitespace string (OOM), so fall back to the default advance.
if (indentLine == TreeSitterIndentProvider.INDENTATION_ERR
|| indentNxtLine == TreeSitterIndentProvider.INDENTATION_ERR
|| indentLine == TreeSitterIndentProvider.INDENT_AUTO
|| indentNxtLine == TreeSitterIndentProvider.INDENT_AUTO
) {
log.debug(
"expectedIndent[{}]={}, expectedIndentNextLine[{}]={}, returning default indent advance",
Expand Down
Loading