Version bump v10.2.2-beta.9

+ Python showing exceptions for 'raise' keyword.

Author: Kronuz

codeintel/__init__.py

@@ -1 +1 @@
-__version__ = '10.2.2-beta.8'
+__version__ = '10.2.2-beta.9'

codeintel/ci2.py

@@ -38,6 +38,7 @@
 #   Trent Mick ([email protected])
 
 r"""ci2 -- playing with some new CodeIntel ideas"""
+from __future__ import absolute_import
 
 __revision__ = "$Id$"
 __version_info__ = (1, 0, 0)

codeintel/codeintel2/lang_python.py

@@ -743,9 +743,9 @@ def trg_from_pos(self, pos, implicit=True):
 
         # Quick out if the preceding char isn't a trigger char.
         # Note: Cannot use this now that we have a 2-char locals trigger.
-        #if last_char not in " .(@_":
+        #if last_char not in " .(@_,":
         #    if DEBUG:
-        #        print "trg_from_pos: no: %r is not in ' .(@'_" % last_char
+        #        print "trg_from_pos: no: %r is not in ' .(@'_," % last_char
         #    return None
 
         style = accessor.style_at_pos(last_pos)
@@ -804,7 +804,7 @@ def trg_from_pos(self, pos, implicit=True):
 
             # Typing a space is very common so lets have a quick out before
             # doing the more correct processing:
-            if last_pos-1 < 0 or accessor.char_at_pos(last_pos-1) not in "tm,":
+            if last_pos-1 < 0 or accessor.char_at_pos(last_pos-1) not in "tme,":
                 return None
 
             working_text = accessor.text_range(max(0,last_pos-200),
@@ -833,6 +833,10 @@ def trg_from_pos(self, pos, implicit=True):
                 return Trigger(self.lang, TRG_FORM_CPLN,
                                "available-exceptions", pos, implicit)
 
+            if line == "raise" or line.endswith(" raise"):
+                return Trigger(self.lang, TRG_FORM_CPLN,
+                               "available-exceptions", pos, implicit)
+
             if ch == ',':
                 # is it "from FOO import BAR, <|>" ?
                 if line.startswith('from ') and ' import ' in line:
@@ -1021,6 +1025,17 @@ def trg_from_pos(self, pos, implicit=True):
                 if DEBUG: print("trg_from_pos: no: no chars preceding '('")
             return None
 
+        elif last_char == ',':
+            working_text = accessor.text_range(max(0, last_pos - 200), last_pos)
+            line = self._last_logical_line(working_text).rstrip()
+            if line:
+                last_bracket = line.rfind("(")
+                pos = (pos - (len(line) - last_bracket))
+                return Trigger(self.lang, TRG_FORM_CALLTIP,
+                               "call-signature", pos, implicit)
+            else:
+                return None
+
         elif pos >= 2 and style in (self.identifier_style, self.keyword_style):
             # 2 character trigger for local symbols
             if DEBUG:
@@ -1047,7 +1062,7 @@ def trg_from_pos(self, pos, implicit=True):
             preceeding_text = accessor.text_range(start, last_pos-2).strip()
             if preceeding_text:
                 first_word = preceeding_text.split(" ")[0]
-                if first_word in ("class", "def", "import", "from", "except"):
+                if first_word in ("class", "def", "import", "from", "except", "raise"):
                     if DEBUG:
                         print("  no trigger, as starts with %r" % (first_word, ))
                     # Don't trigger over the top of another trigger, i.e.

codeintel/process.py

@@ -64,6 +64,13 @@
     if sys.platform != "win32" and sys.version_info[0] != 3:
         log.warn("Could not import subprocess32 module, falling back to subprocess module")
 
+try:
+    from xpcom import components
+except ImportError as e:
+    class components:
+        @staticmethod
+        def ProxyToMainThread(fn):
+            return fn
 
 CREATE_NEW_CONSOLE = 0x10 # same as win32process.CREATE_NEW_CONSOLE
 CREATE_NEW_PROCESS_GROUP = 0x200 # same as win32process.CREATE_NEW_PROCESS_GROUP
@@ -227,6 +234,8 @@ def terminate(self):
     Popen = WindowsKillablePopen
 
 class ProcessOpen(Popen):
+
+    @components.ProxyToMainThread
     def __init__(self, cmd, cwd=None, env=None, flags=None,
                  stdin=PIPE, stdout=PIPE, stderr=PIPE,
                  universal_newlines=True):

codeintel/test2/test_python.py

@@ -620,6 +620,15 @@ def test_complete_available_exceptions(self):
         #self.assertTriggerMatches("\texcept Ex<|>",
         #                          name=name, implicit=False)
 
+        self.assertTriggerMatches("raise <|>",
+                                  name=name)
+        self.assertTriggerMatches("  raise <|>",
+                                  name=name)
+        self.assertTriggerMatches("\traise <|>",
+                                  name=name)
+        #self.assertTriggerMatches("\traise Ex<|>",
+        #                          name=name, implicit=False)
+
     def test_complete_magic_symbols(self):
         name = "%s-complete-magic-symbols" % self.lang.lower()
         self.assertTriggerMatches("__<|>", name=name, symbolstype="global")