diff --git a/docs/releasenotes/3.3.rst b/docs/releasenotes/3.3.rst index 333724ba..e50cac2a 100644 --- a/docs/releasenotes/3.3.rst +++ b/docs/releasenotes/3.3.rst @@ -33,7 +33,8 @@ English language is supported by default. Fixes ------ -* Add missing ``--skip-comments`` option (#418) +* Added missing ``--skip-comments`` option (#418) +* ``CONTINUE`` and ``BREAK`` statements in inline IFs are now intended correctly (#422) Other ----- diff --git a/robotidy/transformers/NormalizeSeparators.py b/robotidy/transformers/NormalizeSeparators.py index ed1d625c..33176a28 100644 --- a/robotidy/transformers/NormalizeSeparators.py +++ b/robotidy/transformers/NormalizeSeparators.py @@ -144,9 +144,7 @@ def visit_Comment(self, node): # noqa return self.visit_Statement(node) def is_keyword_inside_inline_if(self, node): - return self.is_inline and ( - isinstance(node, KeywordCall) or ReturnStatement and isinstance(node, ReturnStatement) - ) + return self.is_inline and not isinstance(node, InlineIfHeader) @skip_if_disabled def visit_Statement(self, statement): # noqa diff --git a/tests/atest/transformers/NormalizeSeparators/expected/inline_if_2indent_2spaces.robot b/tests/atest/transformers/NormalizeSeparators/expected/inline_if_2indent_2spaces.robot index c1fc92aa..165f5d36 100644 --- a/tests/atest/transformers/NormalizeSeparators/expected/inline_if_2indent_2spaces.robot +++ b/tests/atest/transformers/NormalizeSeparators/expected/inline_if_2indent_2spaces.robot @@ -2,6 +2,8 @@ Simple IF IF $condition1 Keyword argument IF $condition1 RETURN + IF $condition1 CONTINUE + IF $condition BREAK Nested IF FOR ${var} IN RANGE 10 diff --git a/tests/atest/transformers/NormalizeSeparators/expected/inline_if_2indent_4spaces.robot b/tests/atest/transformers/NormalizeSeparators/expected/inline_if_2indent_4spaces.robot index 780d6343..881a9800 100644 --- a/tests/atest/transformers/NormalizeSeparators/expected/inline_if_2indent_4spaces.robot +++ b/tests/atest/transformers/NormalizeSeparators/expected/inline_if_2indent_4spaces.robot @@ -2,6 +2,8 @@ Simple IF IF $condition1 Keyword argument IF $condition1 RETURN + IF $condition1 CONTINUE + IF $condition BREAK Nested IF FOR ${var} IN RANGE 10 diff --git a/tests/atest/transformers/NormalizeSeparators/expected/inline_if_4indent_2spaces.robot b/tests/atest/transformers/NormalizeSeparators/expected/inline_if_4indent_2spaces.robot index ed9e0401..e2a53c35 100644 --- a/tests/atest/transformers/NormalizeSeparators/expected/inline_if_4indent_2spaces.robot +++ b/tests/atest/transformers/NormalizeSeparators/expected/inline_if_4indent_2spaces.robot @@ -2,6 +2,8 @@ Simple IF IF $condition1 Keyword argument IF $condition1 RETURN + IF $condition1 CONTINUE + IF $condition BREAK Nested IF FOR ${var} IN RANGE 10 diff --git a/tests/atest/transformers/NormalizeSeparators/source/inline_if.robot b/tests/atest/transformers/NormalizeSeparators/source/inline_if.robot index ab72c5f3..3a92ea46 100644 --- a/tests/atest/transformers/NormalizeSeparators/source/inline_if.robot +++ b/tests/atest/transformers/NormalizeSeparators/source/inline_if.robot @@ -2,6 +2,8 @@ Simple IF IF $condition1 Keyword argument IF $condition1 RETURN + IF $condition1 CONTINUE + IF $condition BREAK Nested IF FOR ${var} IN RANGE 10