lexer: Lex tests withtout name

yanne · yanne · commit 9aa4c40ed32f · 2019-05-30T19:01:25.000+03:00
diff --git a/atest/robot/core/empty_tc_and_uk.robot b/atest/robot/core/empty_tc_and_uk.robot
@@ -7,9 +7,6 @@ Resource        atest_resource.robot
 Test Case Without Name
     Check Test Case  ${EMPTY}
 
-User Keyword Without Name
-    Check Test Case  ${TESTNAME}
-
 Empty Test Case
     Check Test Case  ${TESTNAME}
 
diff --git a/atest/testdata/core/empty_testcase_and_uk.robot b/atest/testdata/core/empty_testcase_and_uk.robot
@@ -5,11 +5,6 @@ Documentation  NO RIDE because it removes empty [Return]
     [Documentation]  FAIL  Test case name cannot be empty.
     Fail  Should not be executed
 
-User Keyword Without Name
-    [Documentation]  FAIL  Keyword name cannot be empty.
-    \  argh
-    Fail  Should not be executed
-
 Empty Test Case
     [Documentation]  FAIL Test case contains no keywords.
 
diff --git a/src/robot/parsing/lexer/lexers.py b/src/robot/parsing/lexer/lexers.py
@@ -214,25 +214,20 @@ class TestCaseSectionLexer(SectionLexer):
     markers = ('Test Case', 'Test Cases', 'Task', 'Tasks')
 
     def lexer_classes(self):
-        return (TestCaseSectionHeaderLexer, TestCaseLexer,
-                InvalidTestOrKeywordLexer)
+        return (TestCaseSectionHeaderLexer, TestCaseLexer)
 
 
 class KeywordSectionLexer(SettingSectionLexer):
     markers = ('Keyword', 'Keywords')
 
     def lexer_classes(self):
-        return (KeywordSectionHeaderLexer, KeywordLexer,
-                InvalidTestOrKeywordLexer)
+        return (KeywordSectionHeaderLexer, KeywordLexer)
 
 
 class TestOrKeywordLexer(BlockLexer):
     _in_for_loop = False
     _old_style_for = None
-
-    @classmethod
-    def handles(cls, statement):
-        return bool(statement[0].value)
+    _name_set = False
 
     def accepts_more(self, statement):
         return not statement[0].value
@@ -247,8 +242,9 @@ def input(self, statement):
 
     def _handle_name_or_indentation(self, statement):
         # TODO: Use dedicated lexers?
-        if statement[0].value:
+        if not self._name_set:
             statement.pop(0).type = Token.NAME
+            self._name_set = True
         while statement and not statement[0].value:
             statement.pop(0).type = Token.IGNORE
 
@@ -288,15 +284,6 @@ def lex(self, ctx):
         TestOrKeywordLexer.lex(self, ctx)
 
 
-class InvalidTestOrKeywordLexer(BlockLexer):
-
-    def accepts_more(self, statement):
-        return not statement[0].value
-
-    def lexer_classes(self):
-        return (ErrorLexer,)
-
-
 class TestOrKeywordSettingLexer(SettingLexer):
 
     @classmethod
