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-90499 Ctrl+Backspace deletes delimiters instead of whitespaces only and leads to SyntaxErrors in code

Browse Source
This commit is contained in:
Denis.Zhdanov
2012-08-23 20:28:52 +04:00
parent d87c05df2e
commit df62b246a0
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java
+27 -9
View File
@@ -44,6 +44,7 @@ import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.EditorPopupHandler;
import gnu.trove.TIntHashSet;
import java.awt.*;
import java.awt.event.MouseEvent;
@@ -64,16 +65,23 @@ public class EditorActionUtil {
* expect the caret to be located at the near future.
*/
public static final Key<Integer> EXPECTED_CARET_OFFSET = Key.create("expectedEditorOffset");
protected static final Object EDIT_COMMAND_GROUP = Key.create("EditGroup");
public static final Object DELETE_COMMAND_GROUP = Key.create("DeleteGroup");
protected static final Object EDIT_COMMAND_GROUP = Key.create("EditGroup");
public static final Object DELETE_COMMAND_GROUP = Key.create("DeleteGroup");
private static final TIntHashSet SPECIAL_NON_ID_SYMBOLS = new TIntHashSet();
static {
SPECIAL_NON_ID_SYMBOLS.add('\'');
SPECIAL_NON_ID_SYMBOLS.add('\"');
}
private EditorActionUtil() {
}
/**
* Tries to change given editor's viewport position in vertical dimension by the given number of visual lines.
*
*
* @param editor target editor which viewport position should be changed
* @param lineShift defines viewport position's vertical change length
* @param columnShift defines viewport position's horizontal change length
@@ -94,7 +102,7 @@ public class EditorActionUtil {
if (!moveCaret) {
return;
}
Rectangle viewRectangle = editor.getScrollingModel().getVisibleArea();
int lineNumber = editor.getCaretModel().getVisualPosition().line;
if (viewRectangle != null) {
@@ -220,16 +228,26 @@ public class EditorActionUtil {
final boolean firstIsIdentifierPart = Character.isJavaIdentifierPart(prev);
final boolean secondIsIdentifierPart = Character.isJavaIdentifierPart(current);
if (!firstIsIdentifierPart && secondIsIdentifierPart) {
if (!firstIsIdentifierPart && secondIsIdentifierPart && !SPECIAL_NON_ID_SYMBOLS.contains(prev)) {
return true;
}
if (isCamel && firstIsIdentifierPart && secondIsIdentifierPart && isHumpBound(text, offset, true)) {
return true;
}
return (Character.isWhitespace(prev) || firstIsIdentifierPart) &&
!Character.isWhitespace(current) && !secondIsIdentifierPart;
if (Character.isWhitespace(current)) {
return false;
}
else if (Character.isWhitespace(prev)) {
return true;
}
else if (SPECIAL_NON_ID_SYMBOLS.contains(current)) {
return false;
}
else {
return firstIsIdentifierPart && !secondIsIdentifierPart;
}
}
private static boolean isLowerCaseOrDigit(char c) {