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

raw string literal: paste string with leading/trailing tic

Browse Source
This commit is contained in:
Anna.Kozlova
2018-04-16 14:22:55 +02:00
parent 11baa8cd4b
commit e34a939d36
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/RawStringLiteralPasteProcessor.java
+23 -5
View File
@@ -13,6 +13,8 @@ import com.intellij.openapi.editor.EditorModificationUtil;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.ide.CopyPasteManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -40,11 +42,27 @@ public class RawStringLiteralPasteProcessor implements PasteProvider {
PsiElement stringLiteral = findRawStringLiteralAtCaret(file, offset);
if (stringLiteral == null) return;
int leadingTicsSequence = PsiRawStringLiteralUtil.getLeadingTicsSequence(text);
int tailingTicsSequence = PsiRawStringLiteralUtil.getTailingTicsSequence(text);
String prefix = "";
TextRange textRange = stringLiteral.getTextRange();
if (offset == textRange.getStartOffset() + 1 && leadingTicsSequence > 0) {
prefix = "\"" + StringUtil.repeat("`", leadingTicsSequence) + "\" + ";
text = text.substring(leadingTicsSequence);
}
String suffix = "";
if (offset == textRange.getEndOffset() - 1 && tailingTicsSequence > 0) {
suffix = "+ \"" + StringUtil.repeat("`", tailingTicsSequence) + "\"";
text = text.substring(0, text.length() - tailingTicsSequence);
}
String literalText = stringLiteral.getText();
int ticsLength = PsiRawStringLiteralUtil.getLeadingTicsSequence(literalText);
String quotes = literalText.substring(0, ticsLength);
String additionalQuotes = PsiRawStringLiteralUtil.getAdditionalTics(text, quotes);
insertAtCaret(text, additionalQuotes, stringLiteral, editor);
insertAtCaret(text, additionalQuotes, stringLiteral, editor, prefix, suffix);
}
@Override
@@ -82,7 +100,7 @@ public class RawStringLiteralPasteProcessor implements PasteProvider {
private static void insertAtCaret(final String text,
final String additionalQuotes,
final PsiElement element,
final Editor editor) {
final Editor editor, String prefix, String suffix) {
final Project project = editor.getProject();
if (project == null) return;
@@ -98,9 +116,9 @@ public class RawStringLiteralPasteProcessor implements PasteProvider {
EditorModificationUtil.insertStringAtCaret(editor, text);
if (!additionalQuotes.isEmpty()) {
document.insertString(range.getStartOffset(), additionalQuotes);
document.insertString(range.getEndOffset(), additionalQuotes);
if (!additionalQuotes.isEmpty() || !prefix.isEmpty() || !suffix.isEmpty()) {
document.insertString(range.getStartOffset(), prefix + additionalQuotes);
document.insertString(range.getEndOffset(), additionalQuotes + suffix);
}
});
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightAdvRawStringLiteralsTest.java
+8
View File
@@ -57,6 +57,14 @@ public class LightAdvRawStringLiteralsTest extends LightCodeInsightFixtureTestCa
doTestPaste("class A {{String s = `q<caret>`;}}", "a\nb`\nc", "class A {{String s = ``qa\nb`\nc``;}}");
}
public void testPasteInRawStringStaringWithTics() {
doTestPaste("class A {{String s = `<caret>q`;}}", "``a\n``b", "class A {{String s = \"``\" + `a\n" + "``bq`;}}");
}
public void testPasteInRawStringEndingWithTics() {
doTestPaste("class A {{String s = `q<caret>`;}}", "``a\n``b``", "class A {{String s = \"``\" + `a\n" + "``bq`;}}");
}
public void testPasteInRawStringLiteralOneAndTwo() {
doTestPaste("class A {{String s = `q<caret>`;}}", "a\n``b`\nc", "class A {{String s = ```qa\n``b`\nc```;}}");
}