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

CppEditor: Enable formatting for "apply signature changes" action

Browse Source 
So that the changes done by our internal rewriter get properly formatted
afterwards by ClangFormat (if enabled).

Fixes: QTCREATORBUG-31104
Change-Id: I4066ef56a765a8f2c2542b4f9220f1857d013624
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2024-10-28 16:34:28 +01:00
parent 768494b611
commit 05ae8f2fa8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cppeditor/cppfunctiondecldeflink.cpp
View File

@@ -271,7 +271,12 @@ void FunctionDeclDefLink::apply(CppEditorWidget *editor, bool jumpToMatch)
const int jumpTarget = newTargetFile->position(targetFunction->line(), targetFunction->column()); const int jumpTarget = newTargetFile->position(targetFunction->line(), targetFunction->column());
newTargetFile->setOpenEditor(true, jumpTarget); newTargetFile->setOpenEditor(true, jumpTarget);
} }
newTargetFile->apply(changes(snapshot, targetStart)); ChangeSet changeSet = changes(snapshot, targetStart);
for (ChangeSet::EditOp &op : changeSet.operationList()) {
if (op.type() == ChangeSet::EditOp::Replace)
op.setFormat1(true);
}
newTargetFile->apply(changeSet);
} else { } else {
ToolTip::show(editor->toolTipPosition(linkSelection), ToolTip::show(editor->toolTipPosition(linkSelection),
Tr::tr("Target file was changed, could not apply changes")); Tr::tr("Target file was changed, could not apply changes"));

1
src/plugins/texteditor/refactoringchanges.cpp
View File

@@ -357,6 +357,7 @@ void RefactoringFile::doFormatting()
indenterOwner.reset(factory ? factory->createIndenter(document) indenterOwner.reset(factory ? factory->createIndenter(document)
: new PlainTextIndenter(document)); : new PlainTextIndenter(document));
indenter = indenterOwner.get(); indenter = indenterOwner.get();
indenter->setFileName(filePath());
tabSettings = TabSettings::settingsForFile(filePath()); tabSettings = TabSettings::settingsForFile(filePath());
} }
QTC_ASSERT(document, return); QTC_ASSERT(document, return);