feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Python: Workaround pylsp rename bug

Browse Source 
upstream bug report:
https://github.com/python-lsp/python-lsp-server/issues/413

Fixes: QTCREATORBUG-29389
Change-Id: I5b122b5e5c245cb5c43c32da1296b2132a07a9aa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2023-08-09 13:29:53 +02:00
parent 5122d8addc
commit 2ff5293c4a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/languageclient/languageclientutils.cpp
View File

@@ -44,9 +44,17 @@ QTextCursor rangeToTextCursor(const Range &range, QTextDocument *doc)
ChangeSet::Range convertRange(const QTextDocument *doc, const Range &range) ChangeSet::Range convertRange(const QTextDocument *doc, const Range &range)
{ {
return ChangeSet::Range( int start = range.start().toPositionInDocument(doc);
Text::positionInText(doc, range.start().line() + 1, range.start().character() + 1), int end = range.end().toPositionInDocument(doc);
Text::positionInText(doc, range.end().line() + 1, range.end().character()) + 1); // This addesses an issue from the python language server where the reported end line
// was behind the actual end of the document. As a workaround treat every position after
// the end of the document as the end of the document.
if (end < 0 && range.end().line() >= doc->blockCount()) {
QTextCursor tc(doc->firstBlock());
tc.movePosition(QTextCursor::End);
end = tc.position();
}
return ChangeSet::Range(start, end);
} }
ChangeSet editsToChangeSet(const QList<TextEdit> &edits, const QTextDocument *doc) ChangeSet editsToChangeSet(const QList<TextEdit> &edits, const QTextDocument *doc)