Attempt to improve performance.

Author: HelioGuilherme66

src/robotide/controller/macrocontrollers.py

@@ -119,7 +119,7 @@ def _clear_cached_steps(self):
 
     @property
     def max_columns(self):
-        return max(chain((len(step.as_list()) for step in self.steps), [0]))
+        return max(chain((len(step) for step in self.steps), [0]))
 
     def has_template(self):
         return False
@@ -214,6 +214,7 @@ def _remove_step(self, step):
         self._has_steps_changed = True
 
     def add_step(self, index, step=None):
+        # print(f"\nDEBUG: _WithStepsController enter add_step step={step}")
         if step is None:
             step = _empty_step()
         if index == len(self.steps):

src/robotide/controller/stepcontrollers.py

@@ -29,8 +29,8 @@ class StepController(_BaseController):
 
     def __init__(self, parent, step):
         self._init(parent, step)
-        self._step.args = self._change_last_empty_to_empty_var(
-            self._step.args, self._step.comment)
+        # print(f"DEBUG: StepController After _init type(step):{type(self._step)} values: {self._step}")
+        self._step.args = self._change_last_empty_to_empty_var(self._step.args, self._step.comment)
 
     def _init(self, parent, step):
         self.parent = parent
@@ -42,14 +42,16 @@ def _init(self, parent, step):
             while index < len(self._step) and self._step[index] == '':
                 self.indent.append('')
         #elif isinstance(self._step, robotapi.ForLoop):
-        else:
+        elif isinstance(self._step, robotapi.Step):
             cells = self._step.as_list()
             # print(f"DEBUG: StepController _init step not list: len:{len(cells)} cells:{cells[:]}")
             for index in range(0, len(cells)):
                 if cells[index] == '':
                     self.increase_indent()
-        # else:
-        #    print(f"DEBUG: StepController _init step is not list: {type(self._step)}")
+        else:
+            # print(f"DEBUG: StepController _init step is not list nor Step: {type(self._step)}")
+            self._step.args = self._step.comment= []
+            # raise AttributeError
 
     @property
     def display_name(self):
@@ -334,11 +336,12 @@ def _is_commented(self, col):
         return False
 
     def _first_non_empty_cell(self):
-        cells = self.as_list()
-        # print(f"\nDEBUG: Stepcontrollers enter _first_non_empty_cell: cells={cells[:]}")
-        index = 0
-        while index < len(cells) and cells[index] == '':
-            index += 1
+        # cells = self.as_list()
+        index = self._step.first_non_empty_cell()
+        # index = 0
+        # while index < len(cells) and cells[index] == '':
+        #     index += 1
+        # print(f"\nDEBUG: Stepcontrollers enter _first_non_empty_cell: index1={index1} index={index}")  # cells={cells[:]}")
         return index
 
     @property
@@ -412,15 +415,15 @@ def insert_before(self, new_step):
         steps = self.parent.get_raw_steps()
         index = steps.index(self._step)
         if not new_step or not new_step.as_list():
-            new_step = robotapi.Step([''])
+            new_step = robotapi.Step([])
         # print(f"DEBUG: StepController, insert_before, enter: len(steps)={len(steps)} index: {index} \n"
         #      f"new_step: {new_step.as_list()} self._step={self._step.as_list()}")
         if index > 0:
-            upper_indent = self.first_non_empty_cell(steps[index-1].as_list())
-            current_indent = self.first_non_empty_cell(new_step.as_list())
+            upper_indent = steps[index-1].first_non_empty_cell()  # self.first_non_empty_cell(steps[index-1].as_list())
+            current_indent = new_step.first_non_empty_cell()  # self.first_non_empty_cell(new_step.as_list())
             delta_indent = upper_indent - current_indent
             # print(f"DEBUG: StepController, insert_before, logic: index: {index} new_step: {new_step.as_list()}\n"
-            #      f"upper_indent({upper_indent}) current_indent({current_indent}) "
+            #       f"upper_indent({upper_indent}) current_indent({current_indent}) "
             #      f"steps[index-1]={steps[index-1].as_list()}")
             if delta_indent > 0:
                 e_list = []
@@ -562,6 +565,9 @@ def steps(self):
         return [IntendedStepController(self, sub_step)
                 for sub_step in self.get_raw_steps()]
 
+    def __len__(self):
+        return len(self._step)
+
 """
 class PartialForLoop(robotapi.ForLoop):
 

src/robotide/lib/robot/parsing/model.py

@@ -824,6 +824,12 @@ def decrease_indent(self):
 class Step(object):
 
     inner_kw_pos = None
+    name = None
+    indent = []
+    assign = []
+    args = []
+    comment = []
+    normal_assign = None
 
     def __init__(self, content, comment=None):
         index = self.first_non_empty_cell(content)
@@ -939,6 +945,7 @@ def as_list(self, indent=False, include_comment=True):
         #    self.indent.insert(0, '')  # Always send first indent
         if indent:
             self.indent.insert(0, '')
+        #### return self.indent + self.assign + kw + self.args + comments  # DEBUG: This code is more efficient
         commented_assign = False
         if len(kw) > 0:
             is_scope_set = re_set_var.match(kw[0])
@@ -968,17 +975,25 @@ def as_list(self, indent=False, include_comment=True):
         #       f" data={data}")
         return data
 
-    def first_non_empty_cell(self, content):
+    def first_non_empty_cell(self, content=None):
         # print(f"DEBUG: model enter _first_non_empty_cell")
-        cells = content
+        if isinstance(content, Step):
+            size = len(content)
+            cells = content.as_list()
+        elif content:
+            size = len(content)
+            cells = content
+        else:
+            size = len(self)
+            cells = self.as_list()
         # if cells:
         #    print(f"DEBUG: model _first_non_empty_cell: {cells[:]}")
         index = 0
-        while index < len(cells) and cells[index] == '':
+        while index < size and cells[index] == '':
             index += 1
         if not self.inner_kw_pos:
-            self.inner_kw_pos = index
-        return index if index < len(cells) else index - 1
+            self.inner_kw_pos = index if 0 <= index < size else index - 1 if index - 1 > 0 else 0
+        return index if 0 <= index < size else index - 1 if index - 1 > 0 else 0
 
     def first_empty_cell(self):
         index = self.inner_kw_pos
@@ -998,6 +1013,10 @@ def add_step(self, content, comment=None):
         self.__init__(content, comment)
         return self
 
+    def __len__(self):
+        kw = [self.name] if self.name is not None else []
+        return len(self.indent) + len(self.assign) + len(kw) + len(self.args) + len(self.comment)
+
 
 class OldStyleSettingAndVariableTableHeaderMatcher(object):
 

test_all.sh

@@ -7,7 +7,7 @@ export PYTHONROOT=/usr/bin
 
 if [ $# -ge 1 ]
 then
-      PY=3.9
+      PY=3
       DIR="$1"
 else
     PY=3

utest/controller/base_command_test.py

@@ -104,7 +104,7 @@ def _verify_row_does_not_exist(self, line):
                 raise AssertionError('Row "%s" exists' % line)
 
     def _verify_step_is_empty(self, index):
-        assert self._steps[index].as_list() == ['']
+        assert self._steps[index].as_list() == []
 
     def _verify_step(self, index, exp_name, exp_args=[], exp_comment=None, kw=True):
         if exp_name == '':

utest/controller/test_commands.py

@@ -241,12 +241,12 @@ def test_adding_row_last(self):
     def test_adding_row_first(self):
         self._exec(AddRow(0))
         assert len(self._steps) == self._orig_number_of_steps+1
-        assert self._steps[0].as_list() == ['']
+        assert self._steps[0].as_list() == []
 
     def test_adding_row_middle(self):
         self._exec(AddRow(1))
         assert len(self._steps) == self._orig_number_of_steps+1
-        assert self._steps[1].as_list() == ['']
+        assert self._steps[1].as_list() == []
 
     def test_adding_row_in_for_loop_body(self):
         row_in_for_loop = self._data_row(FOR_LOOP_STEP2)