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

regexp: add test for named character completion

Browse Source
This commit is contained in:
Bas Leijdekkers
2016-08-30 17:56:00 +02:00
parent 1e2ecd672c
commit 81ca03ffd8
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java
+6
View File
@@ -97,6 +97,12 @@ public final class RegExpCompletionContributor extends CompletionContributor {
final ElementPattern<PsiElement> propertyNamePattern
= psiElement().afterLeaf(psiElement().withText("{").afterLeaf(propertyPattern));
extend(CompletionType.BASIC, propertyNamePattern, new PropertyNameCompletionProvider());
final PsiElementPattern.Capture<PsiElement> namedCharacterPattern = psiElement().withText("N");
extend(CompletionType.BASIC, psiElement().afterLeaf(namedCharacterPattern),
new NamedCharacterCompletionProvider(true));
extend(CompletionType.BASIC, psiElement().afterLeaf(psiElement(RegExpTT.LBRACE).afterLeaf(namedCharacterPattern)),
new NamedCharacterCompletionProvider(false));
}
}
RegExpSupport/src/org/intellij/lang/regexp/UnicodeCharacterNames.java
+6 -4
View File
@@ -33,14 +33,16 @@ public class UnicodeCharacterNames {
try {
final Class<?> aClass = Class.forName("java.lang.CharacterName");
final Method initNamePool = ReflectionUtil.getDeclaredMethod(aClass, "initNamePool");
final int[][] lookup2d = ReflectionUtil.getField(aClass, null, int[][].class, "lookup");
if (initNamePool != null && lookup2d != null) { // jdk 8
byte[] namePool = (byte[])initNamePool.invoke(null);
if (initNamePool != null) { // jdk 8
byte[] namePool = (byte[])initNamePool.invoke(null); // initializes "lookup" field
final int[][] lookup2d = ReflectionUtil.getStaticFieldValue(aClass, int[][].class, "lookup");
if (lookup2d == null) {
return;
}
for (int[] indexes : lookup2d) {
if (indexes != null) {
for (int index : indexes) {
if (index != 0) {
;
final String name = new String(namePool, index >>> 8, index & 0xff, AsciiUtil.ASCII_CHARSET);
consumer.accept(name);
}
RegExpSupport/test/org/intellij/lang/regexp/RegExpCompletionTest.java
+13
View File
@@ -15,9 +15,11 @@
*/
package org.intellij.lang.regexp;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.openapi.application.PathManager;
import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import java.io.File;
import java.util.ArrayList;
@@ -57,6 +59,17 @@ public class RegExpCompletionTest extends CodeInsightFixtureTestCase {
myFixture.checkResult("[[:^alpha:]<caret>");
}
public void testNamedCharacter() {
myFixture.configureByText(RegExpFileType.INSTANCE, "\\\\N{SMILE<caret>}");
final LookupElement[] elements = myFixture.completeBasic();
final List<String> strings = ContainerUtil.map(elements, LookupElement::getLookupString);
assertEquals(Arrays.asList("SMILE", "SMILING FACE WITH SMILING EYES", "SMILING FACE WITH HEART-SHAPED EYES",
"SMILING CAT FACE WITH HEART-SHAPED EYES", "SMILING FACE WITH OPEN MOUTH AND SMILING EYES",
"SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES", "CAT FACE WITH WRY SMILE",
"GRINNING CAT FACE WITH SMILING EYES", "GRINNING FACE WITH SMILING EYES",
"KISSING FACE WITH SMILING EYES"), strings);
}
public void testBackSlashVariants() throws Throwable {
List<String> nameList =
new ArrayList<>(Arrays.asList("d", "D", "s", "S", "w", "W", "b", "B", "A", "G", "Z", "z", "Q", "E",