Fix ReplaceRunKeywordIfs not working if prefixed with BuiltIn (#55)

Author: bhirsz

robotidy/transformers/ReplaceRunKeywordIf.py

@@ -8,7 +8,7 @@
     ElseIfHeader,
     KeywordCall
 )
-from robotidy.utils import normalize_name
+from robotidy.utils import normalize_name, after_last_dot
 from robotidy.decorators import check_start_end_line
 
 
@@ -71,7 +71,7 @@ class ReplaceRunKeywordIf(ModelTransformer):
     def visit_KeywordCall(self, node):  # noqa
         if not node.keyword:
             return node
-        if normalize_name(node.keyword) == 'runkeywordif':
+        if after_last_dot(normalize_name(node.keyword)) == 'runkeywordif':
             return self.create_branched(node)
         return node
 

robotidy/utils.py

@@ -53,6 +53,10 @@ def normalize_name(name):
     return name.lower().replace('_', '').replace(' ', '')
 
 
+def after_last_dot(name):
+    return name.split('.')[-1]
+
+
 def node_within_lines(node_start, node_end, start_line, end_line):
     if start_line:
         if node_start < start_line:

tests/atest/transformers/ReplaceRunKeywordIf/expected/tests.robot

@@ -122,3 +122,10 @@ Test Content Merged Into One Keyword
 
 Empty
     Run Keyword If
+
+With BuiltIn
+    IF    ${condition}
+        ${var}    Keyword
+    ELSE
+        ${var}    Set Variable    ${1}
+    END

tests/atest/transformers/ReplaceRunKeywordIf/expected/tests_selected.robot

@@ -80,3 +80,6 @@ Test Content Merged Into One Keyword
 
 Empty
     Run Keyword If
+
+With BuiltIn
+    ${var}    BuiltIn.Run Keyword If    ${condition}    Keyword    ELSE    Set Variable  ${1}

tests/atest/transformers/ReplaceRunKeywordIf/source/tests.robot

@@ -76,3 +76,6 @@ Test Content Merged Into One Keyword
 
 Empty
     Run Keyword If
+
+With BuiltIn
+    ${var}    BuiltIn.Run Keyword If    ${condition}    Keyword    ELSE    Set Variable  ${1}