Error handling for per-file language config.

robotframework · Aug 19, 2022 · 752a709 · 752a709
1 parent 2a4f404
commit 752a709
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/atest/robot/parsing/translations.robot b/atest/robot/parsing/translations.robot
@@ -43,6 +43,10 @@ Per file configuration with multiple languages
     ${tc} =    Check Test Case    ตัวอย่าง
     Should Be Equal    ${tc.doc}    приклад
 
+Invalid per file configuration
+    Error in file    0    parsing/translations/per_file_config/many.robot    6
+    ...    Invalid language configuration: No language with name 'invalid' found.
+
 Per file configuration bleeds to other files
     [Documentation]    This is a technical limitation and will hopefully change!
     Run Tests    ${EMPTY}    parsing/translations/per_file_config/fi.robot parsing/translations/finnish/tests.robot

diff --git a/atest/testdata/parsing/translations/per_file_config/many.robot b/atest/testdata/parsing/translations/per_file_config/many.robot
@@ -3,7 +3,7 @@ LANGUAGE: Brazilian Portuguese
 
 This is not language: config
 
-language: THAI    language: ukrainian
+language: THAI    language: invalid    language: ukrainian
 
 *** Einstellungen ***
 Documentação          Exemplo

diff --git a/src/robot/conf/languages.py b/src/robot/conf/languages.py
@@ -46,10 +46,7 @@ def _add_language(self, lang):
         self.bdd_prefixes |= {p.title() for p in lang.bdd_prefixes}
 
     def add_language(self, name):
-        try:
-            lang = Language.from_name(name)
-        except ValueError:
-            raise  # FIXME: Proper error handling!!
+        lang = Language.from_name(name)
         self._add_language(lang)
 
     def _get_languages(self, languages):

diff --git a/src/robot/parsing/lexer/statementlexers.py b/src/robot/parsing/lexer/statementlexers.py
@@ -122,7 +122,15 @@ def input(self, statement):
         for token in statement:
             match = self.language.match(token.value)
             if match:
-                self.ctx.add_language(match.group(1).strip())
+                try:
+                    self.ctx.add_language(match.group(1).strip())
+                except ValueError as err:
+                    token.set_error(f'Invalid language configuration: {err}')
+
+    def lex(self):
+        for token in self.statement:
+            if not token.type:
+                token.type = self.token_type
 
 
 class SettingLexer(StatementLexer):