MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

RegExp: simplify parse error message

Browse Source 
GitOrigin-RevId: d9a3763a488de4912c850693ea23bf4b714988e4
This commit is contained in:
Bas Leijdekkers
2020-10-29 16:52:55 +01:00
committed by intellij-monorepo-bot
parent 185111ad4b
commit 044afc1613
11 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RegExpSupport/resources/messages/RegExpBundle.properties
View File

@@ -123,10 +123,9 @@ parse.error.posix.character.class.name.expected=POSIX character class name expec
parse.error.property.name.expected=Property name expected parse.error.property.name.expected=Property name expected
parse.error.property.value.expected=Property value expected parse.error.property.value.expected=Property value expected
parse.error.unclosed.character.class=Unclosed character class parse.error.unclosed.character.class=Unclosed character class
parse.error.unclosed.conditional=Unclosed conditional
parse.error.unclosed.group.name=Unclosed group name parse.error.unclosed.group.name=Unclosed group name
parse.error.unclosed.group.reference=Unclosed group reference parse.error.unclosed.group.reference=Unclosed group reference
parse.error.unclosed.group=Unclosed group parse.error.unclosed.group=')' expected
parse.error.unclosed.mysql.character.equivalence.class=Unclosed MySQL character equivalence class parse.error.unclosed.mysql.character.equivalence.class=Unclosed MySQL character equivalence class
parse.error.unclosed.mysql.character.expression=Unclosed MySQL character expression parse.error.unclosed.mysql.character.expression=Unclosed MySQL character expression
parse.error.unclosed.options.group=Unclosed options group parse.error.unclosed.options.group=Unclosed options group

2
RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java
View File

@@ -425,7 +425,7 @@ public class RegExpParser implements PsiParser, LightPsiParser {
builder.advanceLexer(); builder.advanceLexer();
parseBranch(builder); parseBranch(builder);
} }
checkMatches(builder, RegExpTT.GROUP_END, RegExpBundle.message("parse.error.unclosed.conditional")); checkMatches(builder, RegExpTT.GROUP_END, RegExpBundle.message("parse.error.unclosed.group"));
marker.done(RegExpElementTypes.CONDITIONAL); marker.done(RegExpElementTypes.CONDITIONAL);
} }
else if (type == RegExpTT.PROPERTY) { else if (type == RegExpTT.PROPERTY) {

2
RegExpSupport/testData/psi/Groups16.txt
View File

@@ -52,5 +52,5 @@ REGEXP_FILE
PsiElement(GROUP_END)(')') PsiElement(GROUP_END)(')')
PsiElement(GROUP_END)(')') PsiElement(GROUP_END)(')')
PsiElement(GROUP_END)(')') PsiElement(GROUP_END)(')')
PsiErrorElement:Unclosed group PsiErrorElement:')' expected
<empty list> <empty list>

2
RegExpSupport/testData/psi/Groups30.txt
View File

@@ -10,5 +10,5 @@ REGEXP_FILE
PsiElement(CARET)('^') PsiElement(CARET)('^')
RegExpQuantifierImpl: <*> RegExpQuantifierImpl: <*>
PsiElement(STAR)('*') PsiElement(STAR)('*')
PsiErrorElement:Unclosed group PsiErrorElement:')' expected
<empty list> <empty list>

2
RegExpSupport/testData/psi/Groups31.txt
View File

@@ -12,5 +12,5 @@ REGEXP_FILE
RegExpPatternImpl: <> RegExpPatternImpl: <>
RegExpBranchImpl: <> RegExpBranchImpl: <>
<empty list> <empty list>
PsiErrorElement:Unclosed group PsiErrorElement:')' expected
<empty list> <empty list>

2
RegExpSupport/testData/psi/Groups36.txt
View File

@@ -10,5 +10,5 @@ REGEXP_FILE
PsiErrorElement:Dangling metacharacter PsiErrorElement:Dangling metacharacter
<empty list> <empty list>
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
PsiErrorElement:Unclosed group PsiErrorElement:')' expected
<empty list> <empty list>

2
RegExpSupport/testData/psi/Groups40.txt
View File

@@ -33,5 +33,5 @@ REGEXP_FILE
PsiErrorElement:Dangling metacharacter PsiErrorElement:Dangling metacharacter
<empty list> <empty list>
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
PsiErrorElement:Unclosed conditional PsiErrorElement:')' expected
<empty list> <empty list>

2
RegExpSupport/testData/psi/Groups43.txt
View File

@@ -50,7 +50,7 @@ REGEXP_FILE
PsiElement(CHARACTER)('r') PsiElement(CHARACTER)('r')
RegExpCharImpl: <n> RegExpCharImpl: <n>
PsiElement(CHARACTER)('n') PsiElement(CHARACTER)('n')
PsiErrorElement:Unclosed conditional PsiErrorElement:')' expected
<empty list> <empty list>
PsiElement(UNION)('|') PsiElement(UNION)('|')
RegExpBranchImpl: <maybe-pattern> RegExpBranchImpl: <maybe-pattern>

2
RegExpSupport/testData/psi/Regressions1.txt
View File

@@ -6,5 +6,5 @@ REGEXP_FILE
RegExpPatternImpl: <> RegExpPatternImpl: <>
RegExpBranchImpl: <> RegExpBranchImpl: <>
<empty list> <empty list>
PsiErrorElement:Unclosed group PsiErrorElement:')' expected
<empty list> <empty list>

2
RegExpSupport/testData/psi/Tests2.txt
View File

@@ -11,5 +11,5 @@ REGEXP_FILE
PsiElement(CHARACTER)('b') PsiElement(CHARACTER)('b')
RegExpCharImpl: <c> RegExpCharImpl: <c>
PsiElement(CHARACTER)('c') PsiElement(CHARACTER)('c')
PsiErrorElement:Unclosed group PsiErrorElement:')' expected
<empty list> <empty list>

2
java/java-tests/testSrc/com/intellij/java/codeInsight/RegExpHighlightingTest.java
View File

@@ -191,7 +191,7 @@ public class RegExpHighlightingTest extends LightJavaCodeInsightFixtureTestCase
} }
public void testNoNPE() { public void testNoNPE() {
doTest("(<error descr=\"Unclosed group\">\"</error>);}}//"); doTest("(<error descr=\"')' expected\">\"</error>);}}//");
} }
public void testBadInlineOption() { public void testBadInlineOption() {