Adjust code completion according to namebinding changes

Author: ptersilie

lib/eco/astanalyser.py

@@ -260,7 +260,15 @@ def merge_lbox_data(self, node, path):
 
     def convert_uri(self, newkind, prev, path):
         uri = prev
-        if len(prev.path) >= 1:
+        # There is currently no easy way to find out if a namebinding rule
+        # belongs to the top-level grammar rule. However, the top-level
+        # namebinding rule typically doesn't have a name as there is no need for
+        # it to have one. So we can use this to determine which rule is the
+        # top-level and then remove it when merging a sublanguage's rules into
+        # the outer language. However, if a user decides to give the top-level
+        # namebinding rule a name, cross-language namebinding won't work, and
+        # we currently can't guard against that.
+        if len(prev.path) > 0 and prev.path[0].name is None:
             # Replace language box's top level with current location
             uri.path.pop(0)
             for p in reversed(path):
@@ -372,8 +380,6 @@ def get_completion(self, scope):
         lbox = root.get_magicterminal()
         analyser = self.get_lboxanalyser(root)
         lboxresults = []
-        if analyser and analyser is not self:
-            lboxresults = analyser.get_completion(scope)
         if analyser is self:
             lbox = None
         astnode = self.get_correct_astnode(scope, analyser, lbox)
@@ -404,9 +410,6 @@ def get_correct_astnode(self, scope, analyser=None, lbox=None):
                 # astnode must have a corresponding entry in self.data
                 if nbrule:
                     deftype = nbrule.get_deftype()
-                    if lbox and lbox.symbol.name == "<Python + PHP>":
-                        if deftype == "variable": # convert to find it in data
-                            deftype = "function"
                     if self.data.has_key(deftype):
                         for e in self.data[deftype]:
                             if e.astnode is astnode:

lib/eco/nodeeditor.py

@@ -1083,6 +1083,7 @@ def action():
     def createCCFunc(self, text):
         def action():
             self.tm.pasteCompletion(text)
+            self.update()
         return action
 
     def selectSubgrammar(self, item):