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

ClangFormat: Refactor for remote file system support

Browse Source 
Change-Id: If44af32e2b3534fb350de9c657b99edd6bb6923a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Artem Sokolovskii
2022-12-08 16:28:51 +01:00
parent 26f07c62a0
commit c0f3ef9a82
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/clangformat/clangformatbaseindenter.cpp
View File

@@ -495,11 +495,8 @@ Utils::Text::Replacements ClangFormatBaseIndenter::replacements(QByteArray buffe
std::vector<clang::tooling::Range> ranges{{static_cast<unsigned int>(rangeStart), rangeLength}}; std::vector<clang::tooling::Range> ranges{{static_cast<unsigned int>(rangeStart), rangeLength}};
clang::format::FormattingAttemptStatus status; clang::format::FormattingAttemptStatus status;
clang::tooling::Replacements clangReplacements = reformat(style, clang::tooling::Replacements clangReplacements = clang::format::reformat(
buffer.data(), style, buffer.data(), ranges, m_fileName.toFSPathString().toStdString(), &status);
ranges,
m_fileName.toString().toStdString(),
&status);
clang::tooling::Replacements filtered; clang::tooling::Replacements filtered;
if (status.FormatComplete) { if (status.FormatComplete) {
@@ -546,7 +543,7 @@ Utils::Text::Replacements ClangFormatBaseIndenter::format(
} }
clang::format::FormatStyle style = styleForFile(); clang::format::FormatStyle style = styleForFile();
const std::string assumedFileName = m_fileName.toString().toStdString(); const std::string assumedFileName = m_fileName.toFSPathString().toStdString();
clang::tooling::Replacements clangReplacements = clang::format::sortIncludes(style, clang::tooling::Replacements clangReplacements = clang::format::sortIncludes(style,
buffer.data(), buffer.data(),
ranges, ranges,
@@ -559,7 +556,7 @@ Utils::Text::Replacements ClangFormatBaseIndenter::format(
ranges = clang::tooling::calculateRangesAfterReplacements(clangReplacements, ranges); ranges = clang::tooling::calculateRangesAfterReplacements(clangReplacements, ranges);
clang::format::FormattingAttemptStatus status; clang::format::FormattingAttemptStatus status;
const clang::tooling::Replacements formatReplacements = reformat(style, const clang::tooling::Replacements formatReplacements = clang::format::reformat(style,
*changedCode, *changedCode,
ranges, ranges,
assumedFileName, assumedFileName,