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

Utils: make select at column 0-based

Browse Source 
Change-Id: I514611cbd887eec6e46c80e5a2964c04ad05fdf2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2023-07-06 09:33:53 +02:00
parent 78630dac07
commit 2a61736264
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/textutils.cpp
View File

@@ -139,10 +139,10 @@ QTextCursor selectAt(QTextCursor textCursor, int line, int column, uint length)
if (line < 1) if (line < 1)
line = 1; line = 1;
if (column < 1) if (column < 0)
column = 1; column = 0;
const int anchorPosition = positionInText(textCursor.document(), line, column); const int anchorPosition = positionInText(textCursor.document(), line, column + 1);
textCursor.setPosition(anchorPosition); textCursor.setPosition(anchorPosition);
textCursor.setPosition(anchorPosition + int(length), QTextCursor::KeepAnchor); textCursor.setPosition(anchorPosition + int(length), QTextCursor::KeepAnchor);

1
src/libs/utils/textutils.h
View File

@@ -59,6 +59,7 @@ QTCREATOR_UTILS_EXPORT int positionInText(const QTextDocument *textDocument, int
QTCREATOR_UTILS_EXPORT QString textAt(QTextCursor tc, int pos, int length); QTCREATOR_UTILS_EXPORT QString textAt(QTextCursor tc, int pos, int length);
// line is 1-based, column is 0-based
QTCREATOR_UTILS_EXPORT QTextCursor selectAt(QTextCursor textCursor, int line, int column, uint length); QTCREATOR_UTILS_EXPORT QTextCursor selectAt(QTextCursor textCursor, int line, int column, uint length);
QTCREATOR_UTILS_EXPORT QTextCursor flippedCursor(const QTextCursor &cursor); QTCREATOR_UTILS_EXPORT QTextCursor flippedCursor(const QTextCursor &cursor);

2
src/plugins/cppeditor/cppeditorwidget.cpp
View File

@@ -816,7 +816,7 @@ QList<QTextEdit::ExtraSelection> sourceLocationsToExtraSelections(
selection.cursor = selectAt(cppEditorWidget->textCursor(), selection.cursor = selectAt(cppEditorWidget->textCursor(),
sourceLocation.targetLine, sourceLocation.targetLine,
sourceLocation.targetColumn + 1, sourceLocation.targetColumn,
selectionLength); selectionLength);
selection.format = textCharFormat; selection.format = textCharFormat;