From 5156991f080519bbccda38591a9deebe176099bc Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Sat, 31 Dec 2016 16:50:47 +0100 Subject: [PATCH] regexp: better name --- .../src/org/intellij/lang/regexp/RegExpElementTypes.java | 2 +- RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java | 2 +- .../src/org/intellij/lang/regexp/RegExpParserDefinition.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java index f38663aaea10..2497de0ccc6f 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java @@ -33,7 +33,7 @@ public interface RegExpElementTypes { IElementType CHAR = new RegExpElementType("CHAR"); IElementType GROUP = new RegExpElementType("GROUP"); IElementType PROPERTY = new RegExpElementType("PROPERTY"); - IElementType NAMED_CHARACTER_ELEMENT = new RegExpElementType("NAMED_CHARACTER_ELEMENT"); + IElementType NAMED_CHARACTER = new RegExpElementType("NAMED_CHARACTER"); IElementType OPTIONS = new RegExpElementType("OPTIONS"); IElementType SET_OPTIONS = new RegExpElementType("SET_OPTIONS"); IElementType BACKREF = new RegExpElementType("BACKREF"); diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java index b9c73e5e2dfb..13de168ba4d4 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java @@ -495,7 +495,7 @@ public class RegExpParser implements PsiParser { checkMatches(builder, RegExpTT.LBRACE, "'{' expected"); checkMatches(builder, RegExpTT.NAME, "Unicode character name expected"); checkMatches(builder, RegExpTT.RBRACE, "'}' expected"); - marker.done(RegExpElementTypes.NAMED_CHARACTER_ELEMENT); + marker.done(RegExpElementTypes.NAMED_CHARACTER); } private static void patternExpected(PsiBuilder builder) { diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java index 33e16ca66a76..692f9d9276ff 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java @@ -95,7 +95,7 @@ public class RegExpParserDefinition implements ParserDefinition { return new RegExpGroupImpl(node); } else if (type == RegExpElementTypes.PROPERTY) { return new RegExpPropertyImpl(node); - } else if (type == RegExpElementTypes.NAMED_CHARACTER_ELEMENT) { + } else if (type == RegExpElementTypes.NAMED_CHARACTER) { return new RegExpNamedCharacterImpl(node); } else if (type == RegExpElementTypes.SET_OPTIONS) { return new RegExpSetOptionsImpl(node);