Improve auto complete in Gid Editor. WIP

Author: HelioGuilherme66

src/robotide/editor/contentassist.py

@@ -12,6 +12,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+from operator import index
 
 import wx
 from wx import Colour
@@ -274,10 +275,26 @@ def on_focus_lost(self, event, set_value=True):
         self.hide()
 
     def fill_suggestion(self):
+        initial_value = self.GetValue()
+        popup_value = self._popup.get_value()
+        # print(f"DEBUG: contentassist.py ContentAssistTextCtrlBase fill_suggestion initial_value={initial_value} \n"
+        #       f"popup_value={popup_value}")
+        if popup_value.lower() in initial_value.lower():
+            initial_value = initial_value.replace(initial_value, '')
+        parts = initial_value.split()
+        for p in parts:
+            if popup_value.lower().startswith(p.strip('}])').lower()):
+                idx = initial_value.index(p)
+                initial_value = initial_value[:idx]
+                # print(f"DEBUG: contentassist.py ContentAssistTextCtrlBase fill_suggestion FOUND p={p} "
+                #       f"new initial_value={initial_value}")
+                break
         if self.gherkin_prefix:
-            value = self.gherkin_prefix + self._popup.get_value() or self.GetValue()
+            initial_value = initial_value.replace(self.gherkin_prefix,'')  # Should be left replace
+            value = self.gherkin_prefix + initial_value + popup_value  # or self.GetValue()
         else:
-            value = self._popup.get_value() or self.GetValue()
+            value = initial_value + popup_value  # or self.GetValue()
+        print(f"DEBUG: contentassist.py ContentAssistTextCtrlBase fill_suggestion writting value={value}")
         if value:
             wrapper_view = self.GetParent().GetParent()
             if hasattr(wrapper_view, 'open_cell_editor'):

src/robotide/namespace/suggesters.py

@@ -33,6 +33,9 @@ def get_suggestions(self, value, row=None):
         # If we have a space separated value, try first the value and then the last word
         key = start.split(' ')[-1]
         keys = [start, key] if start != key else [start]
+        for var in ['$', '${', '@{', '&{']:
+            if not key.startswith(var):
+                keys.append(f"{var}{key}")
         sugs = set()
         for initial in keys:
             if self._controller:

utest/editor/test_z_kweditor_plugin.py

@@ -206,7 +206,7 @@ def OnInit(self):  # Overrides wx method
         return True
 
     def _datafile_controller(self):
-        return data_controller(new_test_case_file(datafilereader.TESTCASEFILE_WITH_EVERYTHING), self.project)
+        return data_controller(new_test_case_file(datafilereader.SIMPLE_PROJECT), self.project)
 
     def OnExit(self):  # Overrides wx method
         if hasattr(self, 'file_settings'):
@@ -228,7 +228,7 @@ def setUp(self):
                                               ShortcutRegistry(self.frame))
         self.frame.tree = Tree(self.frame, self.frame.actions, self.settings)
         self.app.project = Project(self.app.namespace, self.app.settings)
-        self.app.project.load_datafile(datafilereader.TESTCASEFILE_WITH_EVERYTHING, MessageRecordingLoadObserver())
+        self.app.project.load_datafile(datafilereader.SIMPLE_PROJECT, MessageRecordingLoadObserver())
         self.app.model = self.app.project.data
         self.panel = self.app.panel
         self.namespace = self.app.project.namespace
@@ -283,7 +283,7 @@ def _no_item_selected_plugin(self):
         return FakePlugin(self._registered_editors, None)
 
     def _datafile_controller(self):
-        return data_controller(new_test_case_file(datafilereader.TESTCASEFILE_WITH_EVERYTHING), self.app.project)
+        return data_controller(new_test_case_file(datafilereader.SIMPLE_PROJECT), self.app.project)
 
     def tearDown(self):
         self.shared_mem.shm.close()