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

Fixed autoindent when using tabs instead of spaces

Browse Source 
Several special cases that are handled by the CPPEditor did not take
into account code that was using tab characters.

Task-number: QTCREATORBUG-292
Reviewed-by: Roberto Raggi
This commit is contained in:
Thorbjørn Lindeijer
2009-12-07 18:26:47 +01:00
parent e408159bfe
commit 9839dea6bc
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/cplusplus/BackwardsScanner.cpp
View File

@@ -70,13 +70,14 @@ const SimpleToken &BackwardsScanner::fetchToken(int i)
} else {
++_blocksTokenized;
const QString blockText = _block.text();
QString blockText = _block.text();
_text.prepend(QLatin1Char('\n'));
_text.prepend(blockText);
QList<SimpleToken> adaptedTokens;
for (int i = 0; i < _tokens.size(); ++i) {
SimpleToken t = _tokens.at(i);
t.setPosition(t.position() + blockText.length());
t.setPosition(t.position() + blockText.length() + 1);
t.setText(_text.midRef(t.position(), t.length()));
adaptedTokens.append(t);
}
@@ -247,8 +248,9 @@ int BackwardsScanner::startOfBlock(int index) const
return start;
}
int BackwardsScanner::indentation(int index) const
QString BackwardsScanner::indentationString(int index) const
{
SimpleToken newline = operator[](startOfLine(index + 1));
return newline.position();
const SimpleToken tokenAfterNewline = operator[](startOfLine(index + 1));
const int newlinePos = qMax(0, _text.lastIndexOf(QLatin1Char('\n'), tokenAfterNewline.position()));
return _text.mid(newlinePos, tokenAfterNewline.position() - newlinePos);
}