Commit d9d3d86a authored by Adam Strzelecki's avatar Adam Strzelecki Committed by Orgad Shaneh
Browse files

Beautifier: Fix clang-format file style regression

Commit 3310fbc8

 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: default avatarLorenz Haas <lorenz.haas@histomatics.de>
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 1239245f
......@@ -132,7 +132,7 @@ Command ClangFormat::command(int offset, int length) const
if (m_settings->usePredefinedStyle()) {
command.addOption(QLatin1String("-style=") + m_settings->predefinedStyle());
command.addOption(QLatin1String("-assume-filename=%filename"));
command.addOption(QLatin1String("-assume-filename=%file"));
} else {
command.addOption(QLatin1String("-style=file"));
const QString path =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment