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

C++: Fix add definitions on empty files

Browse Source 
Task-number: QTCREATORBUG-7838

Change-Id: I8e9d452cf4c8ab5dd9f2a7f39d3802baf84609e1
Reviewed-by: David Schulz <david.schulz@nokia.com>
This commit is contained in:
Leandro Melo
2012-09-12 12:21:44 +02:00
parent 7f98c517e1
commit 8a917b3011
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/cpptools/insertionpointlocator.cpp
View File

@@ -593,21 +593,31 @@ QList<InsertionLocation> InsertionPointLocator::methodDefinition(
FindMethodDefinitionInsertPoint finder(doc->translationUnit());
finder(declaration, &line, &column);
// Make sure we have a line before and after the new definition.
const QLatin1String prefix("\n\n");
// Force empty lines before and after the new definition.
QString prefix;
QString suffix;
int firstNonSpace = targetFile->position(line, column);
QChar c = targetFile->charAt(firstNonSpace);
while (c == QLatin1Char(' ') || c == QLatin1Char('\t')) {
++firstNonSpace;
c = targetFile->charAt(firstNonSpace);
}
if (targetFile->charAt(firstNonSpace) != QChar::ParagraphSeparator) {
suffix.append(QLatin1String("\n\n"));
if (!line) {
// Totally empty file.
line = 1;
column = 1;
prefix = suffix = QLatin1Char('\n');
} else {
++firstNonSpace;
if (targetFile->charAt(firstNonSpace) != QChar::ParagraphSeparator)
suffix.append(QLatin1Char('\n'));
QTC_ASSERT(column, return result);
prefix = QLatin1String("\n\n");
int firstNonSpace = targetFile->position(line, column);
QChar c = targetFile->charAt(firstNonSpace);
while (c == QLatin1Char(' ') || c == QLatin1Char('\t')) {
++firstNonSpace;
c = targetFile->charAt(firstNonSpace);
}
if (targetFile->charAt(firstNonSpace) != QChar::ParagraphSeparator) {
suffix.append(QLatin1String("\n\n"));
} else {
++firstNonSpace;
if (targetFile->charAt(firstNonSpace) != QChar::ParagraphSeparator)
suffix.append(QLatin1Char('\n'));
}
}
result += InsertionLocation(target, prefix, suffix, line, column);