##// END OF EJS Templates
Merge pull request #10244 from Carreau/protect-jedi...
Thomas Kluyver -
r23324:036091f9 merge
parent child Browse files
Show More
@@ -1554,11 +1554,17 class IPCompleter(Completer):
1554 iter_jm = iter(jedi_matches)
1554 iter_jm = iter(jedi_matches)
1555 if _timeout:
1555 if _timeout:
1556 for jm in iter_jm:
1556 for jm in iter_jm:
1557 try:
1558 type_ = jm.type
1559 except Exception:
1560 if self.debug:
1561 print("Error in Jedi getting type of ", jm)
1562 type_ = None
1557 delta = len(jm.name_with_symbols) - len(jm.complete)
1563 delta = len(jm.name_with_symbols) - len(jm.complete)
1558 yield Completion(start=offset - delta,
1564 yield Completion(start=offset - delta,
1559 end=offset,
1565 end=offset,
1560 text=jm.name_with_symbols,
1566 text=jm.name_with_symbols,
1561 type=jm.type,
1567 type=type_,
1562 _origin='jedi')
1568 _origin='jedi')
1563
1569
1564 if time.monotonic() > deadline:
1570 if time.monotonic() > deadline:
General Comments 0
You need to be logged in to leave comments. Login now