Skip to content

Miscellaneous bugfixes #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nilsholle merged 4 commits into from
Aug 4, 2019
Merged

Miscellaneous bugfixes #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10597aa
Bump to 2.12.1a1
smathot Jul 25, 2019
62ebd81
Catch Exceptions from jedi
smathot Jul 25, 2019
0f096f3
PyAutoIndentMode: don't assume space-based indentation
smathot Jul 25, 2019
9455977
PyIndenterMode: treat unindent as single undo action
smathot Jul 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyqode/python/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

"""

__version__ = '2.12.0'
__version__ = '2.12.1a1'
11 changes: 9 additions & 2 deletions pyqode/python/backend/workers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,14 @@ def calltips(request_data):
# encoding = request_data['encoding']
encoding = 'utf-8'
# use jedi to get call signatures
script = jedi.Script(code, line, column, path, encoding)
try:
script = jedi.Script(code, line, column, path, encoding)
except ValueError:
# Is triggered when an the position is invalid, for example if the
# column is larger or equal to the line length. This may be due to a
# bug elsewhere in PyQode, but this at least suppresses the error
# message, and does not seem to hve any adverse side effects.
return []
signatures = script.call_signatures()
for sig in signatures:
results = (str(sig.module_name), str(sig.name),
Expand Down Expand Up @@ -315,7 +322,7 @@ def complete(code, line, column, path, encoding, prefix):
script = jedi.Script(code, line + 1, column, path, encoding)
completions = script.completions()
print('completions: %r' % completions)
except jedi.NotFoundError:
except RuntimeError:
completions = []
for completion in completions:
ret_val.append({
Expand Down
34 changes: 17 additions & 17 deletions pyqode/python/modes/autoindent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def _get_indent(self, cursor):
elif line.endswith("\\"):
# if user typed \ and press enter -> indent is always
# one level higher
post += self.editor.tab_length * " "
post += self._single_indent
elif (fullline.endswith((')', '}', ']')) and
lastword.endswith((')', '}', ']'))):
post = self._handle_indent_after_paren(cursor, post)
Expand Down Expand Up @@ -260,24 +260,24 @@ def _handle_indent_between_paren(self, column, line, parent_impl, tc):
open_line_txt = self._helper.line_text(open_line)
open_line_indent = len(open_line_txt) - len(open_line_txt.lstrip())
if prev_open:
post = (open_line_indent + self.editor.tab_length) * ' '
post = open_line_indent * self._indent_char + self._single_indent
elif next_close and prev_char != ',':
post = open_line_indent * ' '
post = open_line_indent * self._indent_char
elif tc.block().blockNumber() == open_line:
post = open_symbol_col * ' '
post = open_symbol_col * self._indent_char

# adapt indent if cursor on closing line and next line have same
# indent -> PEP8 compliance
if close_line and close_col:
txt = self._helper.line_text(close_line)
bn = tc.block().blockNumber()
flg = bn == close_line
next_indent = self._helper.line_indent(bn + 1) * ' '
next_indent = self._helper.line_indent(bn + 1) * self._indent_char
if flg and txt.strip().endswith(':') and next_indent == post:
# | look at how the previous line ( ``':'):`` ) was
# over-indented, this is actually what we are trying to
# achieve here
post += self.editor.tab_length * ' '
post += self._single_indent

# breaking string
if next_char in ['"', "'"]:
Expand Down Expand Up @@ -319,19 +319,19 @@ def _handle_indent_inside_string(self, char, cursor, fullline, post):
# break string with a '\' at the end of the original line, always
# breaking strings enclosed by parens is done in the
# _handle_between_paren method
n = self.editor.tab_length
pre = '%s \\' % char
post += n * ' '
post += self._single_indent
if fullline.endswith(':'):
post += n * " "
post += self._single_indent
post += char
return post, pre

def _handle_new_scope_indentation(self, cursor, fullline):
try:
indent = (self._get_indent_of_opening_paren(cursor) +
self.editor.tab_length)
post = indent * " "
post = (
self._get_indent_of_opening_paren(cursor) * self._indent_char +
self._single_indent
)
except TypeError:
# e.g indent is None (meaning the line does not ends with ):, ]:
# or }:
Expand All @@ -349,15 +349,15 @@ def check_kw_in_line(kwds, lparam):
while not check_kw_in_line(kw, l) and ln:
ln -= 1
l = self._helper.line_text(ln)
indent = (len(l) - len(l.lstrip())) * " "
indent += self.editor.tab_length * " "
indent = (len(l) - len(l.lstrip())) * self._indent_char
indent += self._single_indent
post = indent
return post

def _handle_indent_after_paren(self, cursor, post):
indent = self._get_indent_of_opening_paren(cursor)
if indent is not None:
post = indent * " "
post = indent * self._indent_char
return post

def _handle_indent_in_statement(self, fullline, lastword, post, pre):
Expand All @@ -366,7 +366,7 @@ def _handle_indent_in_statement(self, fullline, lastword, post, pre):
pre += " \\"
else:
pre += '\\'
post += self.editor.tab_length * " "
post += self._single_indent
if fullline.endswith(':'):
post += self.editor.tab_length * " "
post += self._single_indent
return post, pre
13 changes: 4 additions & 9 deletions pyqode/python/modes/indenter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,20 @@ def indent(self):
if cursor.hasSelection():
self.indent_selection(cursor)
else:
# simply insert indentation at the cursor position
tab_len = self.editor.tab_length
cursor.beginEditBlock()
if self.editor.use_spaces_instead_of_tabs:
cursor.insertText(tab_len * " ")
else:
cursor.insertText('\t')
cursor.endEditBlock()
self.editor.setTextCursor(cursor)
cursor.insertText(self._single_indent)

def unindent(self):
"""
Performs an un-indentation
"""
if self.tab_always_indent:
cursor = self.editor.textCursor()
cursor.beginEditBlock()
if not cursor.hasSelection():
cursor.select(cursor.LineUnderCursor)
self.unindent_selection(cursor)
cursor.endEditBlock()
self.editor.setTextCursor(cursor)
else:
super(PyIndenterMode, self).unindent()

Expand Down