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

IDEADEV-409: Camel words selection and navigation enhancement. GUIDGenerator breaks into 2 words: [GUID][Generator].

Browse Source
This commit is contained in:
Maxim Shafirov
2005-03-05 21:11:00 +03:00
parent 248fdb9837
commit 67c9589409
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/codeInsight/editorActions/SelectWordUtil.java
+4 -2
View File
@@ -271,7 +271,8 @@ public class SelectWordUtil {
final char prevChar = editorText.charAt(start - 1);
final char curChar = editorText.charAt(start);
if (Character.isLowerCase(prevChar) && Character.isUpperCase(curChar) || prevChar == '_' && curChar != '_') {
if (Character.isLowerCase(prevChar) && Character.isUpperCase(curChar) || prevChar == '_' && curChar != '_' ||
Character.isUpperCase(prevChar) && Character.isUpperCase(curChar) && Character.isLowerCase(editorText.charAt(start + 1))) {
break;
}
start--;
@@ -280,7 +281,8 @@ public class SelectWordUtil {
while (end < editorText.length() && Character.isJavaIdentifierPart(editorText.charAt(end))) {
final char prevChar = editorText.charAt(end - 1);
final char curChar = editorText.charAt(end);
if (Character.isLowerCase(prevChar) && Character.isUpperCase(curChar) || prevChar != '_' && curChar == '_') {
if (Character.isLowerCase(prevChar) && Character.isUpperCase(curChar) || prevChar != '_' && curChar == '_' ||
Character.isUpperCase(prevChar) && Character.isUpperCase(curChar) && Character.isLowerCase(editorText.charAt(end + 1))) {
break;
}
end++;
source/com/intellij/openapi/editor/actions/DeleteToWordEndAction.java
+2 -2
View File
@@ -51,8 +51,8 @@ public class DeleteToWordEndAction extends EditorAction {
}
boolean camel = editor.getSettings().isCamelWords();
for (; newOffset < maxOffset; newOffset++) {
if (EditorActionUtil.isWordEnd(text.charAt(newOffset - 1), text.charAt(newOffset), camel) ||
EditorActionUtil.isWordStart(text.charAt(newOffset - 1), text.charAt(newOffset), camel)) {
if (EditorActionUtil.isWordEnd(text, newOffset, camel) ||
EditorActionUtil.isWordStart(text, newOffset, camel)) {
break;
}
}
source/com/intellij/openapi/editor/actions/EditorActionUtil.java
+15 -7
View File
@@ -121,16 +121,20 @@ public class EditorActionUtil {
editor.getCaretModel().moveToOffset(newCaretOffset);
}
public static boolean isWordStart(char first, char second, boolean isCamel) {
public static boolean isWordStart(CharSequence text, int offset, boolean isCamel) {
char first = text.charAt(offset - 1);
char second = text.charAt(offset);
final boolean firstIsIdentifierPart = Character.isJavaIdentifierPart(first);
final boolean secondIsIdentifierPart = Character.isJavaIdentifierPart(second);
if (!firstIsIdentifierPart && secondIsIdentifierPart) {
return true;
}
if (isCamel) {
if (firstIsIdentifierPart && secondIsIdentifierPart &&
(Character.isLowerCase(first) && Character.isUpperCase(second) || first == '_' && second != '_')) {
(Character.isLowerCase(first) && Character.isUpperCase(second) ||
first == '_' && second != '_' ||
offset + 1 < text.length() && Character.isUpperCase(first) && Character.isUpperCase(second)) && Character.isLowerCase(text.charAt(offset + 1))) {
return true;
}
}
@@ -139,7 +143,9 @@ public class EditorActionUtil {
!Character.isWhitespace(second) && !secondIsIdentifierPart;
}
public static boolean isWordEnd(char first, char second, boolean isCamel) {
public static boolean isWordEnd(CharSequence text, int offset, boolean isCamel) {
char first = text.charAt(offset - 1);
char second = text.charAt(offset);
final boolean firstIsIdentifiePart = Character.isJavaIdentifierPart(first);
final boolean secondIsIdentifierPart = Character.isJavaIdentifierPart(second);
if (firstIsIdentifiePart && !secondIsIdentifierPart) {
@@ -148,7 +154,9 @@ public class EditorActionUtil {
if (isCamel) {
if (firstIsIdentifiePart && secondIsIdentifierPart &&
(Character.isLowerCase(first) && Character.isUpperCase(second) || first != '_' && second == '_')) {
(Character.isLowerCase(first) && Character.isUpperCase(second) || first != '_' && second == '_' ||
offset + 1 < text.length() && Character.isUpperCase(first) &&
Character.isUpperCase(second)) && Character.isLowerCase(text.charAt(offset + 1))) {
return true;
}
}
@@ -328,7 +336,7 @@ public class EditorActionUtil {
}
boolean camel = editor.getSettings().isCamelWords();
for (; newOffset < maxOffset; newOffset++) {
if (isWordStart(text.charAt(newOffset - 1), text.charAt(newOffset), camel)) {
if (isWordStart(text, newOffset, camel)) {
break;
}
}
@@ -372,7 +380,7 @@ public class EditorActionUtil {
int minOffset = lineNumber > 0 ? document.getLineEndOffset(lineNumber - 1) : 0;
boolean camel = editor.getSettings().isCamelWords();
for (; newOffset > minOffset; newOffset--) {
if (isWordStart(text.charAt(newOffset - 1), text.charAt(newOffset), camel)) break;
if (isWordStart(text, newOffset, camel)) break;
}
editor.getCaretModel().moveToOffset(newOffset);
editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
source/com/intellij/openapi/editor/impl/SelectionModelImpl.java
+2 -2
View File
@@ -451,7 +451,7 @@ public class SelectionModelImpl implements SelectionModel, DocumentListener {
int minOffset = lineNumber > 0 ? document.getLineEndOffset(lineNumber - 1) : 0;
boolean camel = myEditor.getSettings().isCamelWords();
for (; newOffset > minOffset; newOffset--) {
if (EditorActionUtil.isWordStart(text.charAt(newOffset - 1), text.charAt(newOffset), camel)) break;
if (EditorActionUtil.isWordStart(text, newOffset, camel)) break;
}
return newOffset;
@@ -474,7 +474,7 @@ public class SelectionModelImpl implements SelectionModel, DocumentListener {
}
boolean camel = myEditor.getSettings().isCamelWords();
for (; newOffset < maxOffset; newOffset++) {
if (EditorActionUtil.isWordEnd(text.charAt(newOffset - 1), text.charAt(newOffset), camel)) break;
if (EditorActionUtil.isWordEnd(text, newOffset, camel)) break;
}
return newOffset;