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-128385 kill to word end deletes past end of line

Browse Source
This commit is contained in:
Dmitry Batrak
2015-10-05 19:12:02 +03:00
parent 3971bf30fa
commit eafa46ce54
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/actions/KillToWordEndAction.java
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -22,6 +22,7 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler;
import com.intellij.openapi.ide.KillRingTransferable;
import com.intellij.util.text.CharArrayUtil;
/**
* Stands for emacs <a href="http://www.gnu.org/software/emacs/manual/html_node/emacs/Words.html#Words">kill-word</a> command.
@@ -61,7 +62,7 @@ public class KillToWordEndAction extends TextComponentEditorAction {
}
int end = lineEndOffset;
if (caretLine < document.getLineCount() - 1) {
if (caretLine < document.getLineCount() - 1 && CharArrayUtil.isEmptyOrSpaces(document.getImmutableCharSequence(), caretOffset, end)) {
// No word end found between the current position and line end, hence, remove line feed sign if possible.
end++;
}
platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java
+26 -22
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -16,13 +16,9 @@
package com.intellij.openapi.editor.actions;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.impl.CaretModelImpl;
import com.intellij.openapi.editor.impl.EditorImpl;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.ide.CopyPasteManager;
import com.intellij.openapi.ide.KillRingTransferable;
import com.intellij.openapi.util.Disposer;
import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
import org.jetbrains.annotations.NotNull;
@@ -131,6 +127,20 @@ public class KillToWordEndActionTest extends LightPlatformCodeInsightTestCase {
assertEquals("first second", string);
}
public void testBeforeLastWordAtLine() throws Exception {
configureFromFileText(getTestName(false) + ".txt", "abc <caret>def\nghi");
killToWordEnd();
checkResultByText("abc <caret>\nghi");
assertEquals("def", getContents());
}
public void testBeforeLastWordAtLineWithTrailingSpace() throws Exception {
configureFromFileText(getTestName(false) + ".txt", "abc <caret>def \nghi");
killToWordEnd();
checkResultByText("abc <caret> \nghi");
assertEquals("def", getContents());
}
public void testSubsequentKillsInterruptedBySave() throws Exception {
String text = "public class ParentCopy {\n" +
" public Insets getBorderInsets(<caret>Component c) {\n" +
@@ -157,28 +167,22 @@ public class KillToWordEndActionTest extends LightPlatformCodeInsightTestCase {
" }";
configureFromFileText(getTestName(false) + ".java", text);
final FoldingModel model = myEditor.getFoldingModel();
model.runBatchFoldingOperation(new Runnable() {
@Override
public void run() {
final FoldRegion foldRegion = model.addFoldRegion(70, 90, "");
assertNotNull(foldRegion);
foldRegion.setExpanded(false);
assertFalse(foldRegion.isExpanded());
}
model.runBatchFoldingOperation(() -> {
final FoldRegion foldRegion = model.addFoldRegion(70, 90, "");
assertNotNull(foldRegion);
foldRegion.setExpanded(false);
assertFalse(foldRegion.isExpanded());
});
cutToLineEnd();
cutToLineEnd();
model.runBatchFoldingOperationDoNotCollapseCaret(new Runnable() {
@Override
public void run() {
final FoldRegion[] regions = model.getAllFoldRegions();
for (FoldRegion region : regions) {
assertNotNull(region);
region.setExpanded(true);
}
model.runBatchFoldingOperationDoNotCollapseCaret(() -> {
final FoldRegion[] regions = model.getAllFoldRegions();
for (FoldRegion region : regions) {
assertNotNull(region);
region.setExpanded(true);
}
});
cutToLineEnd();
cutToLineEnd();