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

es6 regex named groups: lex names according to spec

Browse Source 
WEB-27638, IDEA-CR-29571
This commit is contained in:
Maxim Kropotov
2018-02-22 12:53:50 +03:00
parent 03db9eb31a
commit ac2ddfe92a
5 changed files with 442 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
+434 -334
View File
File diff suppressed because it is too large Load Diff
RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHost.java
+1 -1
View File
@@ -41,7 +41,7 @@ public interface RegExpLanguageHost {
}
boolean supportsExtendedHexCharacter(RegExpChar regExpChar);
default boolean isValidGroupName(String name, @NotNull PsiElement context) {
default boolean isValidGroupName(String name, @NotNull RegExpGroup group) {
for (int i = 0, length = name.length(); i < length; i++) {
final char c = name.charAt(i);
if (!AsciiUtil.isLetterOrDigit(c) && c != '_') {
RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
+3 -3
View File
@@ -117,9 +117,9 @@ public final class RegExpLanguageHosts extends ClassExtension<RegExpLanguageHost
return host.getSupportedNamedGroupTypes(context);
}
public boolean isValidGroupName(String name, @Nullable final PsiElement context) {
final RegExpLanguageHost host = findRegExpHost(context);
return host != null && host.isValidGroupName(name, context);
public boolean isValidGroupName(String name, @Nullable final RegExpGroup group) {
final RegExpLanguageHost host = findRegExpHost(group);
return host != null && host.isValidGroupName(name, group);
}
public boolean supportsPerl5EmbeddedComments(@Nullable final PsiComment comment) {
RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
+3 -1
View File
@@ -129,7 +129,9 @@ RBRACKET="]"
ESCAPE="\\"
NAME=[:letter:]([:letter:]|_|-|" "|"("|")"|[:digit:])*
GROUP_NAME=[:letter:]([:letter:]|_|-|" "|[:digit:])*
GROUP_NAME_START=[:letter:]|_|\$|\\
GROUP_NAME_PART={GROUP_NAME_START}|-|" "|[:digit:]
GROUP_NAME={GROUP_NAME_START}({GROUP_NAME_PART})*
MYSQL_CHAR_NAME=[:letter:](-|[:letter:])*[:digit:]?
ANY=[^]
java/java-impl/src/com/intellij/psi/impl/JavaRegExpHost.java
+1 -1
View File
@@ -183,7 +183,7 @@ public class JavaRegExpHost implements RegExpLanguageHost {
}
@Override
public boolean isValidGroupName(String name, @NotNull PsiElement context) {
public boolean isValidGroupName(String name, @NotNull RegExpGroup group) {
for (int i = 0, length = name.length(); i < length; i++) {
final char c = name.charAt(i);
if (!AsciiUtil.isLetterOrDigit(c)) {