Completes adding 'But' keyword for syntax recognition.

Author: HelioGuilherme66

src/robotide/controller/macrocontrollers.py

@@ -232,7 +232,7 @@ def create_keyword(self, name, argstr):
 
     def _remove_bdd_prefix(self, name):
         matcher = name.lower()
-        for match in ['given ', 'when ', 'then ', 'and ']:
+        for match in ['given ', 'when ', 'then ', 'and ', 'but ']:
             if matcher.startswith(match):
                 return name[len(match):]
         return name

src/robotide/controller/stepcontrollers.py

@@ -24,7 +24,8 @@
 
 class StepController(_BaseController):
 
-    _GIVEN_WHEN_THEN_MATCHER = re.compile(r'^(given|when|then|and)\s*', re.I)
+    _GIVEN_WHEN_THEN_MATCHER = re.compile(r'^(given|when|then|and|but)\s*',
+                                          re.I)
 
     def __init__(self, parent, step):
         self._init(parent, step)

src/robotide/editor/robotframeworklexer.py

@@ -275,7 +275,7 @@ def _tokenize(self, value, index):
 
 
 class GherkinTokenizer(object):
-    _gherkin_prefix = re.compile('^(Given|When|Then|And) ', re.IGNORECASE)
+    _gherkin_prefix = re.compile('^(Given|When|Then|And|But) ', re.IGNORECASE)
 
     def tokenize(self, value, token):
         match = self._gherkin_prefix.match(value)
@@ -321,7 +321,7 @@ def tokenize(self, value, index):
 
     def _continues(self, value, index):
         return value == '...' and all(self._is_empty(t)
-            for t in self._prev_values_on_row)
+                                      for t in self._prev_values_on_row)
 
     def _is_empty(self, value):
         return value in ('', '\\')
@@ -367,8 +367,8 @@ class TestCaseTable(_Table):
 
     @property
     def _tokenizer_class(self):
-        if self._test_template or (self._default_template and
-                                           self._test_template is not False):
+        if self._test_template or (self._default_template
+                                   and self._test_template is not False):
             return TemplatedKeywordCall
         return KeywordCall
 
@@ -470,7 +470,7 @@ def _split(self, string):
                 self._state(char, index)
             except StopIteration:
                 return
-            if index  == max_index and not self._scanning_list_variable_index():
+            if index == max_index and not self._scanning_list_variable_index():
                 return
 
     def _scanning_list_variable_index(self):

src/robotide/namespace/namespace.py

@@ -521,7 +521,7 @@ def _add_resource(self, res, ctx, items):
 
 class _Keywords(object):
 
-    regexp = re.compile("\s*(given|when|then|and)\s*(.*)", re.IGNORECASE)
+    regexp = re.compile("\s*(given|when|then|and|but)\s*(.*)", re.IGNORECASE)
 
     def __init__(self, keywords):
         self.keywords = robotapi.NormalizedDict(ignore=['_'])