diff --git a/grammar/src/notation.grm b/grammar/src/notation.grm index 76f846dc513..964b7658740 100644 --- a/grammar/src/notation.grm +++ b/grammar/src/notation.grm @@ -15,7 +15,7 @@ h2. EBNF expressions Operator {color:blue}*|*{color} denotes _alternative_ Operator {color:blue}*\**{color} denotes _iteration_ (zero or more) -Operator {color:blue}*+*{color} denotes _iteration_ (one or one) +Operator {color:blue}*+*{color} denotes _iteration_ (one or more) Operator {color:blue}*?*{color} denotes _option_ (zero or one) alpha{color:blue}*{*{color}beta{color:blue}*}*{color} denotes a nonempty _beta_-separated list of _alpha_'s diff --git a/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java b/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java index b700368bd3f..9de16d5a5fc 100644 --- a/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java +++ b/idea/tests/org/jetbrains/jet/parsing/JetParsingTest.java @@ -17,7 +17,6 @@ import org.jetbrains.jet.JetTestCaseBase; import org.jetbrains.jet.lang.parsing.JetParserDefinition; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetVisitor; -import org.jetbrains.jet.plugin.JetLanguage; import java.io.File; import java.io.IOException; @@ -80,7 +79,7 @@ public class JetParsingTest extends ParsingTestCase { for (Annotation annotation : method.getDeclaredAnnotations()) { if (annotation instanceof JetElement.IfNotParsed) { assertNotNull( - "Imcomplete operation in parsed OK test, method " + method.getName() + + "Incomplete operation in parsed OK test, method " + method.getName() + " in " + declaringClass.getSimpleName() + " returns null. Element text: \n" + elem.getText(), PsiTreeUtil.findChildOfType(elem, PsiErrorElement.class)); }