MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-85624 <Delete> doesn't work correctly for wrapped commit comment

Browse Source
This commit is contained in:
Denis.Zhdanov
2012-05-04 14:31:03 +04:00
parent e396d48dde
commit d50971ecbe
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteAction.java
+5 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -106,7 +106,10 @@ public class DeleteAction extends EditorAction {
Document document = editor.getDocument();
int offset = editor.getCaretModel().getOffset();
if (!EditorActionUtil.canEditAtOffset(editor, offset + 1)) return;
if (afterLineEnd < 0) {
if (afterLineEnd < 0
// There is a possible case that caret is located right before the soft wrap position at the last logical line
// (popular use case with the soft wraps at the commit message dialog).
|| (offset < document.getTextLength() - 1 && editor.getSoftWrapModel().getSoftWrap(offset) != null)) {
FoldRegion region = editor.getFoldingModel().getCollapsedRegionAtOffset(offset);
if (region != null && region.shouldNeverExpand()) {
document.deleteString(region.getStartOffset(), region.getEndOffset());
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceOnDocumentModificationTest.java
+16
View File
@@ -952,6 +952,22 @@ public class SoftWrapApplianceOnDocumentModificationTest extends AbstractEditorP
checkSoftWraps(start, end);
assertEquals(new VisualPosition(3, 0), myEditor.offsetToVisualPosition(text.indexOf("second")));
}
public void testDeleteWhenCaretBeforeSoftWrap() throws IOException {
final String text =
"text 1234";
init(7, text);
final int offset = text.indexOf("123");
checkSoftWraps(offset);
final CaretModel caretModel = myEditor.getCaretModel();
caretModel.moveToOffset(offset);
caretModel.moveCaretRelatively(-1, 0, false, false, false);
assertEquals(offset, caretModel.getOffset()); // Navigating from 'after soft wrap' to the 'before soft wrap' position.
delete();
assertEquals("text 234", myEditor.getDocument().getText());
}
private void init(final int visibleWidthInColumns, @NotNull String fileText) throws IOException {
int symbolWidthInPixels = 7;