mirror/QodeAssist
1
0
Fork 0
mirror of https://github.com/Palm1r/QodeAssist.git synced 2025-07-18 04:54:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix off by one errors in getContext{Before,After}() (#94)

Browse Source 
This also specifies what exactly getContext*() functions do. Before this
commit linesCount was sometimes interpreted as exclusive of current
line, which was confusing as linesCount + 1 lines were being returned.
This commit is contained in:
Povilas Kanapickas
2025-03-05 20:32:53 +02:00
committed by GitHub
parent f9f2a86cea
commit 3dc0d910bf
3 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
context/DocumentContextReader.cpp
View File

@ -84,11 +84,9 @@ QString DocumentContextReader::getLineText(int lineNumber, int cursorPosition) c
QString DocumentContextReader::getContextBefore(
int lineNumber, int cursorPosition, int linesCount) const
{
int effectiveStartLine;
int effectiveStartLine = qMax(0, lineNumber - linesCount + 1);
if (m_copyrightInfo.found) {
effectiveStartLine = qMax(m_copyrightInfo.endLine + 1, lineNumber - linesCount);
} else {
effectiveStartLine = qMax(0, lineNumber - linesCount);
effectiveStartLine = qMax(m_copyrightInfo.endLine + 1, effectiveStartLine);
}
return getContextBetween(effectiveStartLine, -1, lineNumber, cursorPosition);
@ -97,8 +95,8 @@ QString DocumentContextReader::getContextBefore(
QString DocumentContextReader::getContextAfter(
int lineNumber, int cursorPosition, int linesCount) const
{
int endLine = qMin(m_document->blockCount() - 1, lineNumber + linesCount);
return getContextBetween(lineNumber + 1, cursorPosition, endLine, -1);
int endLine = qMin(m_document->blockCount() - 1, lineNumber + linesCount - 1);
return getContextBetween(lineNumber, cursorPosition, endLine, -1);
}
QString DocumentContextReader::readWholeFileBefore(int lineNumber, int cursorPosition) const
@ -285,7 +283,7 @@ QString DocumentContextReader::getContextAfter(int lineNumber, int cursorPositio
int endLine = qMin(
m_document->blockCount() - 1,
lineNumber + Settings::codeCompletionSettings().readStringsAfterCursor());
return getContextBetween(lineNumber + 1, cursorPosition, endLine, -1);
return getContextBetween(lineNumber, cursorPosition, endLine, -1);
}
}