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

don't always use LTR base direction for bidirectional text layout, autodetect direction as per Unicode standard

Browse Source 
(following bug report at https://code.google.com/p/android/issues/detail?id=182739#c13)
This commit is contained in:
Dmitry Batrak
2015-09-15 19:23:34 +03:00
parent 8b930b9544
commit a47b893dca
2 changed files with 16 additions and 6 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
+1 -1
View File
@@ -150,7 +150,7 @@ class LineLayout {
private static void addRuns(List<BidiRun> runs, char[] text, int start, int end) {
if (start >= end) return;
Bidi bidi = new Bidi(text, start, null, 0, end - start, Bidi.DIRECTION_LEFT_TO_RIGHT);
Bidi bidi = new Bidi(text, start, null, 0, end - start, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
int runCount = bidi.getRunCount();
for (int i = 0; i < runCount; i++) {
addOrMergeRun(runs, new BidiRun((byte)bidi.getRunLevel(i), start + bidi.getRunStart(i), start + bidi.getRunLimit(i)));
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorRtlTest.java
+15 -5
View File
@@ -40,8 +40,12 @@ public class EditorRtlTest extends AbstractEditorTest {
@Override
protected void tearDown() throws Exception {
super.tearDown();
Registry.get("editor.new.rendering").setValue(false);
try {
Registry.get("editor.new.rendering").setValue(false);
}
finally {
super.tearDown();
}
}
public void testPositionCalculations() throws IOException {
@@ -499,12 +503,12 @@ public class EditorRtlTest extends AbstractEditorTest {
}
public void testJavadocTokensAreMergedForBidiLayoutPurposes() throws Exception {
prepare("<caret>/** R R */ class Foo {}", TestFileType.JAVA);
for (int i = 0; i < 5; i++) {
prepare("<caret>/**R R*/ class Foo {}", TestFileType.JAVA);
for (int i = 0; i < 4; i++) {
right();
}
checkResult("/** R R<caret> */ class Foo {}");
checkResult("/**R R<caret>*/ class Foo {}");
}
public void testXmlTextIsLaidOutCorrectly() throws Exception {
@@ -553,6 +557,12 @@ public class EditorRtlTest extends AbstractEditorTest {
assertVisualCaretLocation(1, 3, true);
}
public void testLineGeneralDirectionAutodetection() throws Exception {
prepareText("<caret>RLR");
right();
checkResult("RLR<caret>");
}
private void prepareText(String text) throws IOException {
prepare(text, TestFileType.TEXT);
}