MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: fix text block extend selection behaviour (IDEA-227005, IDEA-226986)

Browse Source 
GitOrigin-RevId: 9d9f4201db2e0b2dfedc8485701ea6f050e0df41
This commit is contained in:
Bas Leijdekkers
2023-10-30 15:50:38 +01:00
committed by intellij-monorepo-bot
parent 775979aed7
commit fb26d47cda
18 changed files with 78 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/wordSelection/LiteralSelectioner.java
View File

@@ -7,7 +7,6 @@ import com.intellij.lexer.StringLiteralLexer;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.BasicLiteralUtil;
import com.intellij.psi.JavaTokenType;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.BasicJavaAstTreeUtil;
@@ -43,20 +42,12 @@ public class LiteralSelectioner extends AbstractBasicBackBasicSelectioner {
if (textBlock) {
int contentStart = StringUtil.indexOf(editorText, '\n', range.getStartOffset());
if (contentStart == -1) return result;
contentStart += 1;
String[] lines = BasicLiteralUtil.getTextBlockLines(node.getText());
if (lines == null) return result;
int indent = BasicLiteralUtil.getTextBlockIndent(lines);
if (indent == -1) return result;
for (int i = 0; i < indent; i++) {
if (editorText.charAt(contentStart + i) == '\n') return result;
}
int start = contentStart + indent;
int end = range.getEndOffset() - 4;
int start = contentStart + 1;
int end = range.getEndOffset();
end -= StringUtil.endsWith(editorText, start, end, "\"\"\"") ? 4 : 1;
for (; end >= start; end--) {
char c = editorText.charAt(end);
if (c == '\n') break;
if (!Character.isWhitespace(c)) {
if (c == '\n' || !Character.isWhitespace(c)) {
end += 1;
break;
}
@@ -64,7 +55,10 @@ public class LiteralSelectioner extends AbstractBasicBackBasicSelectioner {
if (start < end) result.add(new TextRange(start, end));
}
else {
result.add(new TextRange(range.getStartOffset() + 1, range.getEndOffset() - 1));
int endOffset = editorText.charAt(range.getEndOffset() - 1) == '"'
? range.getEndOffset() - 1
: range.getEndOffset();
result.add(new TextRange(range.getStartOffset() + 1, endOffset));
}
return result;