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

ClangFormat: Support remote filesystems

Browse Source 
Change-Id: Ic5c06a826154e1bee92e3c283ab508177e86c428
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-12-09 10:26:46 +01:00
parent 5787a22f69
commit eeeb5f0aad
2 changed files with 177 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@
#include "clangformatconstants.h"
#include "clangformatsettings.h"
#include "clangformatutils.h"
#include "llvmfilesystem.h"
#include <coreplugin/icore.h>
#include <projectexplorer/editorconfiguration.h>
@@ -25,6 +26,8 @@
namespace ClangFormat {
Internal::LlvmFileSystemAdapter llvmFileSystemAdapter;
namespace {
void adjustFormatStyleForLineBreak(clang::format::FormatStyle &style,
ReplacementsToKeep replacementsToKeep)
@@ -735,8 +738,8 @@ void ClangFormatBaseIndenter::autoIndent(const QTextCursor &cursor,
clang::format::FormatStyle ClangFormatBaseIndenter::styleForFile() const
{
llvm::Expected<clang::format::FormatStyle> styleFromProjectFolder
= clang::format::getStyle("file", m_fileName.path().toStdString(), "none");
llvm::Expected<clang::format::FormatStyle> styleFromProjectFolder = clang::format::getStyle(
"file", m_fileName.toFSPathString().toStdString(), "none", "", &llvmFileSystemAdapter);
const ProjectExplorer::Project *projectForFile
= ProjectExplorer::SessionManager::projectForFile(m_fileName);
@@ -748,7 +751,7 @@ clang::format::FormatStyle ClangFormatBaseIndenter::styleForFile() const
? projectForFile->editorConfiguration()->codeStyle("Cpp")->currentPreferences()
: TextEditor::TextEditorSettings::codeStyle("Cpp")->currentPreferences();
if (overrideStyleFile || !styleFromProjectFolder
if (!styleFromProjectFolder || overrideStyleFile
|| *styleFromProjectFolder == clang::format::getNoStyle()) {
Utils::FilePath filePath = filePathToCurrentSettings(preferences);