CppEditor: Fix trailing whitespace after extracting a function

... from a block of code.
We must not insert an empty line into the newly created function,
because it gets indented in the first indent operation, resulting in
trailing characters after the actual code has been inserted later.

Fixes: QTCREATORBUG-12118
Change-Id: If438d4de379cae90baa846c112866f2777b44fce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 8c65166aa1..e259810182 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -3885,7 +3885,7 @@ public:
             funcDef.append(QLatin1String(" const"));
             funcDecl.append(QLatin1String(" const"));
         }
-        funcDef.append(QLatin1String("\n{\n"));
+        funcDef.append(QLatin1String("\n{"));
         if (matchingClass)
             funcDecl.append(QLatin1String(";\n"));
         if (m_funcReturn) {
@@ -3925,7 +3925,7 @@ public:
         QTC_ASSERT(tc.hasSelection(), return);
         position = tc.selectionEnd() + 1;
         change.clear();
-        change.insert(position, extract);
+        change.insert(position, extract + '\n');
         currentFile->setChangeSet(change);
         currentFile->appendReindentRange(ChangeSet::Range(position, position + 1));
         currentFile->apply();