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

Beautifier: Fix clang-format file style regression

Browse Source 
Commit 3310fbc8f2 introduced regression replacing
-assume-filename=%file with -assume-filename=%filename, that caused only file
name part to be passed to clang-format, not whole path to the buffer.
Effectively when formatting the buffer with style set to "File", clang-format
was unable to determine related style file placement (eg. within the project
tree) anymore.

This reverts back to use %file, not %filename, making clang-format "File" style
work again as expected.

Change-Id: I5e7ae3d1186b1e7c33dc89a7d60aacc0f0671e51
Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Adam Strzelecki
2016-05-10 14:17:52 +02:00
committed by Orgad Shaneh
parent 1239245f57
commit d9d3d86ad2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/beautifier/clangformat/clangformat.cpp
View File

@@ -132,7 +132,7 @@ Command ClangFormat::command(int offset, int length) const
if (m_settings->usePredefinedStyle()) { if (m_settings->usePredefinedStyle()) {
command.addOption(QLatin1String("-style=") + m_settings->predefinedStyle()); command.addOption(QLatin1String("-style=") + m_settings->predefinedStyle());
command.addOption(QLatin1String("-assume-filename=%filename")); command.addOption(QLatin1String("-assume-filename=%file"));
} else { } else {
command.addOption(QLatin1String("-style=file")); command.addOption(QLatin1String("-style=file"));
const QString path = const QString path =