MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

text blocks: don't escape paste outside content of text block (IDEA-217353)

Browse Source 
GitOrigin-RevId: 7ee24196154f11a34b50d2d95c62f374abe13f14
This commit is contained in:
Bas Leijdekkers
2019-07-31 15:56:10 +02:00
committed by intellij-monorepo-bot
parent 3a73782bb6
commit dca820c744
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java
View File

@@ -178,11 +178,14 @@ public class StringLiteralCopyPasteProcessor implements CopyPastePreProcessor {
if (elementAtSelectionStart == null) {
return null;
}
if (!isStringLiteral(elementAtSelectionStart) && !isCharLiteral(elementAtSelectionStart) && !isTextBlock(elementAtSelectionStart)) {
final boolean isTextBlock = isTextBlock(elementAtSelectionStart);
if (!isStringLiteral(elementAtSelectionStart) && !isCharLiteral(elementAtSelectionStart) && !isTextBlock) {
return null;
}
if (elementAtSelectionStart.getTextRange().getEndOffset() < selectionEnd) {
final TextRange range = elementAtSelectionStart.getTextRange();
final TextRange textRange = isTextBlock ? new TextRange(range.getStartOffset() + 3, range.getEndOffset() - 2) : range;
if (textRange.getEndOffset() < selectionEnd) {
final PsiElement elementAtSelectionEnd = file.findElementAt(selectionEnd);
if (elementAtSelectionEnd == null) {
return null;
@@ -193,7 +196,6 @@ public class StringLiteralCopyPasteProcessor implements CopyPastePreProcessor {
}
}
final TextRange textRange = elementAtSelectionStart.getTextRange();
if (selectionStart <= textRange.getStartOffset() || selectionEnd >= textRange.getEndOffset()) {
return null;
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/textBlocks/NoEscapeWhenNotInTextBlockContent.after.java Normal file
View File

@@ -0,0 +1,4 @@
class C {
String empty = """
"\"";
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/textBlocks/NoEscapeWhenNotInTextBlockContent.java Normal file
View File

@@ -0,0 +1,4 @@
class C {
String empty = """
"<caret>"";
}

4
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavaTextBlocksHighlightingTest.kt
View File

@@ -26,6 +26,10 @@ class JavaTextBlocksHighlightingTest : LightJavaCodeInsightFixtureTestCase() {
doTestPaste("\"\"\"\ntarget\"\"\"".trimIndent())
}
fun testNoEscapeWhenNotInTextBlockContent() {
doTestPaste("\\");
}
private fun doTestPaste(textToPaste: String) {
myFixture.configureByText("plain.txt", "<selection>$textToPaste</selection>")
myFixture.performEditorAction(IdeActions.ACTION_EDITOR_COPY)