From c5ae14c78fca99732fd2bcd99c8b7321a1a06339 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 21 Feb 2011 20:24:03 +0100 Subject: [PATCH] refactoring: enum set of regexp capabilities instead of a bunch of boolean flags --- .../regexp/PythonRegexpParserDefinition.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/python/src/com/jetbrains/python/codeInsight/regexp/PythonRegexpParserDefinition.java b/python/src/com/jetbrains/python/codeInsight/regexp/PythonRegexpParserDefinition.java index bd8ec250dc37..fd566c576025 100644 --- a/python/src/com/jetbrains/python/codeInsight/regexp/PythonRegexpParserDefinition.java +++ b/python/src/com/jetbrains/python/codeInsight/regexp/PythonRegexpParserDefinition.java @@ -6,28 +6,27 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.FileViewProvider; import com.intellij.psi.PsiFile; import com.intellij.psi.tree.IFileElementType; -import org.intellij.lang.regexp.RegExpFile; -import org.intellij.lang.regexp.RegExpLexer; -import org.intellij.lang.regexp.RegExpParser; -import org.intellij.lang.regexp.RegExpParserDefinition; +import org.intellij.lang.regexp.*; import org.jetbrains.annotations.NotNull; +import java.util.EnumSet; + /** * @author yole */ public class PythonRegexpParserDefinition extends RegExpParserDefinition { public static final IFileElementType PYTHON_REGEXP_FILE = new IFileElementType("PYTHON_REGEXP_FILE", PythonRegexpLanguage.INSTANCE); + private final EnumSet CAPABILITIES = EnumSet.of(RegExpCapability.DANGLING_METACHARACTERS, + RegExpCapability.OCTAL_NO_LEADING_ZERO); @NotNull public Lexer createLexer(Project project) { - return new RegExpLexer(false, true, false, true); + return new RegExpLexer(CAPABILITIES); } @Override public PsiParser createParser(Project project) { - RegExpParser regExpParser = new RegExpParser(); - regExpParser.setAllowDanglingMetacharacters(true); - return regExpParser; + return new RegExpParser(CAPABILITIES); } @Override