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

IDEA-152048 better handing of escapes in RTL string literals

Browse Source
This commit is contained in:
Dmitry Batrak
2016-02-26 13:43:34 +03:00
parent c1f7a90dc6
commit 7b74a7477e
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/LineLayout.java
+3
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.editor.highlighter.HighlighterIterator;
import com.intellij.openapi.editor.impl.ComplementaryFontsRegistry;
import com.intellij.openapi.editor.impl.EditorImpl;
import com.intellij.openapi.editor.impl.FontInfo;
import com.intellij.psi.StringEscapesTokenTypes;
import com.intellij.psi.tree.IElementType;
import com.intellij.util.text.CharArrayUtil;
import org.intellij.lang.annotations.JdkConstants;
@@ -149,6 +150,8 @@ abstract class LineLayout {
private static boolean distinctTokens(@Nullable IElementType token1, @Nullable IElementType token2) {
if (token1 == token2) return false;
if (token1 == null || token2 == null) return true;
if (StringEscapesTokenTypes.STRING_LITERAL_ESCAPES.contains(token1) ||
StringEscapesTokenTypes.STRING_LITERAL_ESCAPES.contains(token2)) return false;
if (!token1.getLanguage().is(token2.getLanguage())) return true;
BidiRegionsSeparator separator = LanguageBidiRegionsSeparator.INSTANCE.forLanguage(token1.getLanguage());
return separator.createBorderBetweenTokens(token1, token2);
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorRtlTest.java
+7
View File
@@ -566,6 +566,13 @@ public class EditorRtlTest extends AbstractEditorTest {
checkResult("R\tRR<caret>");
}
public void testEscapedBackslashInStringLiteral() throws Exception {
prepare("class C {\n String s = \"R\\<caret>\\R\";\n}", TestFileType.JAVA);
right();
right();
checkResult("class C {\n String s = \"<caret>R\\\\R\";\n}");
}
private void prepareText(String text) throws IOException {
prepare(text, TestFileType.TEXT);
}