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

Clang: Remove duplicated functions

Browse Source 
Change-Id: I0758fc06843363d58faa835238a587095c9eb6de
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-07-24 15:35:20 +02:00
parent 91429aa752
commit b86600a587
4 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/clangcodemodel/activationsequencecontextprocessor.cpp
View File

@@ -97,7 +97,7 @@ void ActivationSequenceContextProcessor::process()
void ActivationSequenceContextProcessor::processActivationSequence()
{
const int nonSpacePosition = findStartOfNonSpaceChar(m_startOfNamePosition);
const int nonSpacePosition = skipPrecedingWhitespace(m_assistInterface, m_startOfNamePosition);
const auto activationSequence = m_assistInterface->textAt(nonSpacePosition - 3, 3);
ActivationSequenceProcessor activationSequenceProcessor(activationSequence,
nonSpacePosition,
@@ -228,28 +228,40 @@ void ActivationSequenceContextProcessor::resetPositionsForEOFCompletionKind()
m_operatorStartPosition = m_positionInDocument;
}
int ActivationSequenceContextProcessor::findStartOfNonSpaceChar(int startPosition)
int ActivationSequenceContextProcessor::skipPrecedingWhitespace(
const TextEditor::AssistInterface *assistInterface,
int startPosition)
{
int position = startPosition;
while (m_assistInterface->characterAt(position - 1).isSpace())
while (assistInterface->characterAt(position - 1).isSpace())
--position;
return position;
}
int ActivationSequenceContextProcessor::findStartOfName(int startPosition)
static bool isValidIdentifierChar(const QChar &character)
{
return character.isLetterOrNumber()
|| character == QLatin1Char('_')
|| character.isHighSurrogate()
|| character.isLowSurrogate();
}
int ActivationSequenceContextProcessor::findStartOfName(
const TextEditor::AssistInterface *assistInterface,
int startPosition)
{
int position = startPosition;
QChar character;
do {
character = m_assistInterface->characterAt(--position);
} while (character.isLetterOrNumber() || character == QLatin1Char('_'));
character = assistInterface->characterAt(--position);
} while (isValidIdentifierChar(character));
return position + 1;
}
void ActivationSequenceContextProcessor::goBackToStartOfName()
{
m_startOfNamePosition = findStartOfName(m_positionInDocument);
m_startOfNamePosition = findStartOfName(m_assistInterface, m_positionInDocument);
if (m_startOfNamePosition != m_positionInDocument)
m_textCursor.setPosition(m_startOfNamePosition);