MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 06:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

SSR: Auto-insert pair $ fixes (IDEA-216174)

Browse Source 
GitOrigin-RevId: a7ecbd48b2cf895a3f062ce33abfe33bc959f8b3
This commit is contained in:
Bas Leijdekkers
2019-07-02 06:52:16 +03:00
committed by intellij-monorepo-bot
parent 0fb2b5ea46
commit cb63283035
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchTypedHandler.java
+17 -12
View File
@@ -84,23 +84,28 @@ public class StructuralSearchTypedHandler extends TypedHandlerDelegate {
final Caret caret = caretModel.getCurrentCaret();
final LogicalPosition position = caret.getLogicalPosition();
final int lineStart = document.getLineStartOffset(position.line);
final int lineEnd = document.getLineEndOffset(position.line);
final CharSequence text = document.getCharsSequence();
final int index = lineStart + position.column;
if (index < text.length() && text.charAt(index) == '$') {
caret.setSelection(index, index + 1);
final int offset = lineStart + position.column;
final boolean nextIsDollar = offset < text.length() && text.charAt(offset) == '$';
if (hasOddDollar(text, lineStart, offset) && nextIsDollar) {
caret.setSelection(offset, offset + 1);
}
final CharSequence line = text.subSequence(lineStart, lineStart + position.column);
boolean $ = false;
for (int i = 0, max = line.length(); i < max; i++) {
if (line.charAt(i) == '$') {
$ = !$;
}
}
if (!$) {
document.insertString(lineStart + position.column, "$");
else if (!hasOddDollar(text, lineStart, lineEnd)) {
document.insertString(offset, "$");
}
}
}
return Result.CONTINUE;
}
static boolean hasOddDollar(CharSequence text, int start, int end) {
boolean $ = false;
for (int i = start; i < end; i++) {
if (text.charAt(i) == '$') {
$ = !$;
}
}
return $;
}
}
platform/structuralsearch/testSource/com/intellij/structuralsearch/plugin/ui/StructuralSearchTypedHandlerTest.java
+12
View File
@@ -33,6 +33,18 @@ public class StructuralSearchTypedHandlerTest extends BasePlatformTestCase {
"$x$<caret> y$<caret>$z $<selection>abc<caret></selection>$");
}
public void testOneDollar() {
doTest("asdf<caret>$asdf", "asdf$<caret>$asdf");
}
public void testOddDollar1() {
doTest("<caret>ba$", "$<caret>ba$");
}
public void testOddDollar2() {
doTest("$ietske<caret>", "$ietske$<caret>");
}
private void doTest(@NotNull String before, @NotNull String after) {
myFixture.configureByText(FileTypes.PLAIN_TEXT, before);
final Editor editor = myFixture.getEditor();