fix namespaces!

wizza-smile · Kronuz · commit 0ae78f816098 · 2015-01-26T09:06:03.000-06:00
diff --git a/libs/codeintel2/lang_php.py b/libs/codeintel2/lang_php.py
@@ -331,7 +331,13 @@ def trg_from_pos(self, buf, pos, implicit=True, DEBUG=False, ac=None):
                             print("Triggering use-namespace completion")
                         return Trigger(lang, TRG_FORM_CPLN, "use-namespace",
                                        pos, implicit)
-                    elif prev_text[1] != "namespace":
+                    elif prev_text[1] == "namespace": #namespace completions on "namespace" keyword!
+                        if DEBUG:
+                            print("Triggering namespace completion")
+                        return Trigger(
+                            lang, TRG_FORM_CPLN, "namespace-members-nmspc-only",
+                            pos, implicit)
+                    else:
                         if DEBUG:
                             print("Triggering namespace completion")
                         return Trigger(
@@ -586,14 +592,6 @@ def preceding_trg_from_pos(self, buf, pos, curr_pos,
         accessor = buf.accessor
         prev_style = accessor.style_at_pos(curr_pos - 1)
 
-        #Allow namespaces ala "common\component" to trigger class names via "functions"-trigger
-        ignore_styles = []
-        if prev_style == self.operator_style:
-            prev_char = accessor.char_at_pos(curr_pos - 1)
-            if prev_char == "\\":
-                prev_style = self.identifier_style
-                ignore_styles = [self.operator_style]
-
         if prev_style in (self.identifier_style, self.keyword_style):
             # We don't know what to trigger here... could be one of:
             # functions:
@@ -606,7 +604,7 @@ def preceding_trg_from_pos(self, buf, pos, curr_pos,
             #   implements apache<$><|>_getenv()...
             ac = AccessorCache(accessor, curr_pos)
             pos_before_identifer, ch, prev_style = \
-                ac.getPrecedingPosCharStyle(prev_style, ignore_styles=ignore_styles)
+                ac.getPrecedingPosCharStyle(prev_style)
             if DEBUG:
                 print("\nphp preceding_trg_from_pos, first chance for identifer style")
                 print("  curr_pos: %d" % (curr_pos))
@@ -776,7 +774,7 @@ def _citdl_expr_from_pos(self, trg, buf, pos, implicit=True,
                     print("i now: %d, ch: %r" % (i, ch))
 
                 if ch in WHITESPACE:
-                    if trg.type in ("use-namespace", "namespace-members"):
+                    if trg.type in ("use-namespace", "namespace-members", "namespace-members-nmspc-only"):
                         # Namespaces cannot be split over whitespace.
                         break
                     while ch in WHITESPACE:
@@ -935,8 +933,7 @@ def citdl_expr_from_trg(self, buf, trg):
                 i = trg.extra.get("bracket_pos")   # triggered on foo['
             elif trg.type == "use":
                 i = trg.pos + 1
-            elif trg.type == "namespace-members" or \
-                    trg.type == "use-namespace":
+            elif trg.type in ["namespace-members","use-namespace","namespace-members-nmspc-only"]:
                 i = trg.pos - 1
             else:
                 i = trg.pos - 2  # skip past the trigger char
diff --git a/libs/codeintel2/tree_php.py b/libs/codeintel2/tree_php.py
@@ -273,12 +273,11 @@ def eval_cplns(self):
             else:
                 # Return global magic methods.
                 return self.php_magic_global_method_cplns
-        elif trg.type == "namespace-members" or \
-                trg.type == "use-namespace":
+        elif trg.type in ["namespace-members", "use-namespace", "namespace-members-nmspc-only"]:
             # Find the completions:
             cplns = []
             expr = self.expr
-            if trg.type == "use-namespace" and expr and not expr.startswith("\\"):
+            if trg.type  in ["use-namespace", "namespace-members-nmspc-only"] and expr and not expr.startswith("\\"):
                 # Importing a namespace, uses a FQN name - bug 88736.
                 expr = "\\" + expr
             fqn = self._fqn_for_expression(expr, start_scope)
@@ -288,6 +287,8 @@ def eval_cplns(self):
                 # self.log("hits: %r", hits)
                 cplns = list(self._members_from_hits(hits))
                 # self.log("cplns: %r", cplns)
+                if trg.type == "namespace-members-nmspc-only":
+                    cplns = [i for i in cplns if i[0] == "namespace"]
             # Return additional sub-namespaces that start with this prefix.
             if hits and hits[0][0] is not None:
                 # We hit a namespace, return additional namespaces that
