MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

RegExp: regularize error messages

Browse Source
This commit is contained in:
Bas Leijdekkers
2017-02-24 13:04:37 +01:00
parent e1d30d77d1
commit 3934a0fd2b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java
+8 -8
View File
@@ -128,7 +128,7 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
@Override
public void visitRegExpBoundary(RegExpBoundary boundary) {
if (!myLanguageHosts.supportsBoundary(boundary)) {
myHolder.createErrorAnnotation(boundary, "Unsupported boundary");
myHolder.createErrorAnnotation(boundary, "This boundary is not supported in this regex dialect");
}
}
@@ -209,7 +209,7 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
}
if (text.charAt(text.length() - 1) == '}') {
if (!myLanguageHosts.supportsExtendedHexCharacter(ch)) {
myHolder.createErrorAnnotation(ch, "This hex character syntax is not supported");
myHolder.createErrorAnnotation(ch, "This hex character syntax is not supported in this regex dialect");
}
}
}
@@ -230,7 +230,7 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
@Override
public void visitRegExpNamedCharacter(RegExpNamedCharacter namedCharacter) {
if (!myLanguageHosts.supportsNamedCharacters(namedCharacter)) {
myHolder.createErrorAnnotation(namedCharacter, "Named Unicode characters are not allowed in this regular expression dialect");
myHolder.createErrorAnnotation(namedCharacter, "Named Unicode characters are not allowed in this regex dialect");
}
else if (!myLanguageHosts.isValidNamedCharacter(namedCharacter)) {
final ASTNode node = namedCharacter.getNameNode();
@@ -277,7 +277,7 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
}
if (group.isAnyNamedGroup()) {
if (!myLanguageHosts.supportsNamedGroupSyntax(group)) {
myHolder.createErrorAnnotation(group, "This named group syntax is not supported");
myHolder.createErrorAnnotation(group, "This named group syntax is not supported in this regex dialect");
}
}
if (group.getType() == RegExpGroup.Type.ATOMIC && !myLanguageHosts.supportsPossessiveQuantifiers(group)) {
@@ -292,7 +292,7 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
if (groupType == RegExpGroup.Type.POSITIVE_LOOKBEHIND || groupType == RegExpGroup.Type.NEGATIVE_LOOKBEHIND) {
final RegExpLanguageHost.Lookbehind support = myLanguageHosts.supportsLookbehind(group);
if (support == RegExpLanguageHost.Lookbehind.NOT_SUPPORTED) {
myHolder.createErrorAnnotation(group, "Look-behind groups not supported in this regex dialect");
myHolder.createErrorAnnotation(group, "Look-behind groups are not supported in this regex dialect");
}
else {
group.accept(new LookbehindVisitor(support, myHolder));
@@ -303,7 +303,7 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
@Override
public void visitRegExpNamedGroupRef(RegExpNamedGroupRef groupRef) {
if (!myLanguageHosts.supportsNamedGroupRefSyntax(groupRef)) {
myHolder.createErrorAnnotation(groupRef, "This named group reference syntax is not supported");
myHolder.createErrorAnnotation(groupRef, "This named group reference syntax is not supported in this regex dialect");
return;
}
if (groupRef.getGroupName() == null) {
@@ -326,7 +326,7 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
public void visitComment(PsiComment comment) {
if (comment.getText().startsWith("(?#")) {
if (!myLanguageHosts.supportsPerl5EmbeddedComments(comment)) {
myHolder.createErrorAnnotation(comment, "Embedded comments are not supported");
myHolder.createErrorAnnotation(comment, "Embedded comments are not supported in this regex dialect");
}
}
}
@@ -334,7 +334,7 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
@Override
public void visitRegExpPyCondRef(RegExpPyCondRef condRef) {
if (!myLanguageHosts.supportsPythonConditionalRefs(condRef)) {
myHolder.createErrorAnnotation(condRef, "Conditional references are not supported");
myHolder.createErrorAnnotation(condRef, "Conditional references are not supported in this regex dialect");
}
}
java/java-tests/testSrc/com/intellij/codeInsight/RegExpHighlightingTest.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class RegExpHighlightingTest extends LightCodeInsightFixtureTestCase {
}
public void testBoundaries() {
doTest("\\b <error descr=\"Unsupported boundary\">\\b{g}</error> \\B \\A \\z \\Z \\G");
doTest("\\b <error descr=\"This boundary is not supported in this regex dialect\">\\b{g}</error> \\B \\A \\z \\Z \\G");
IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_9, myFixture.getModule(), getTestRootDisposable());
doTest("\\b \\b{g} \\B \\A \\z \\Z \\G");
}