Skip to content

fix: incorrect multiline autoindent #1002

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
joeljohansson99 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −8
Open

fix: incorrect multiline autoindent #1002

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
29 changes: 21 additions & 8 deletions ...rg/eclipse/tm4e/languageconfiguration/internal/LanguageConfigurationAutoEditStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,17 +163,30 @@ && isFollowedBy(doc, command.offset, charPair.close))) {

final var newIndent = registry.getGoodIndentForLine(doc, lineIndex, contentType, IIndentConverter.of(cursorCfg));
if (newIndent != null) {
final var normalizedIndent = cursorCfg.normalizeIndentation(newIndent);
final var lineStartOffset = doc.getLineOffset(lineIndex);

// check if the content was pasted into a line while the cursor was not at the beginning of the line
// but inside or at the end of an existing line indentation
final var offsetInLine = command.offset - lineStartOffset;
if (offsetInLine > 0 && doc.get(lineStartOffset, offsetInLine).isBlank()) {
command.offset = lineStartOffset;
command.length += offsetInLine;
final int firstNewline = command.text.indexOf('\n');

if (firstNewline >= 0) {
final var firstLine = command.text.substring(0, firstNewline + 1);
final var reindentedRest = TextUtils.replaceIndent(
command.text.substring(firstNewline + 1), cursorCfg.indentSize, normalizedIndent, false);

if (offsetInLine > 0 && !doc.get(lineStartOffset, offsetInLine).isBlank()) {
command.text = firstLine + reindentedRest;
} else {
if (offsetInLine > 0) {
command.offset = lineStartOffset;
command.length += offsetInLine;
}
command.text = normalizedIndent + firstLine.stripLeading() + reindentedRest;
}
} else {
command.text = TextUtils
.replaceIndent(command.text, cursorCfg.indentSize, normalizedIndent, false)
.toString();
}
command.text = TextUtils.replaceIndent(command.text, cursorCfg.indentSize,
cursorCfg.normalizeIndentation(newIndent), false).toString();
command.shiftsCaret = true;
}
}
Expand Down
Loading