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

ProjectExplorer: filepathify actualTabSettings

Browse Source 
Change-Id: I4b08b96d56bfeed0348d82bb96ff70d5f8ad583b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2022-02-03 15:14:24 +01:00
parent a992a3440b
commit 3a6dff6743
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cpprefactoringchanges.cpp
View File

@@ -246,8 +246,7 @@ void CppRefactoringChangesData::indentSelection(const QTextCursor &selection,
if (textDocument) { // use the indenter from the textDocument if there is one, can be ClangFormat
textDocument->indenter()->indent(selection, QChar::Null, textDocument->tabSettings());
} else {
const auto &tabSettings = ProjectExplorer::actualTabSettings(filePath.toString(),
textDocument);
const auto &tabSettings = ProjectExplorer::actualTabSettings(filePath, textDocument);
auto indenter = createIndenter(filePath, selection.document());
indenter->indent(selection, QChar::Null, tabSettings);
}
@@ -260,8 +259,7 @@ void CppRefactoringChangesData::reindentSelection(const QTextCursor &selection,
if (textDocument) { // use the indenter from the textDocument if there is one, can be ClangFormat
textDocument->indenter()->reindent(selection, textDocument->tabSettings());
} else {
const auto &tabSettings = ProjectExplorer::actualTabSettings(filePath.toString(),
textDocument);
const auto &tabSettings = ProjectExplorer::actualTabSettings(filePath, textDocument);
auto indenter = createIndenter(filePath, selection.document());
indenter->reindent(selection, tabSettings);
}

4
src/plugins/projectexplorer/editorconfiguration.cpp
View File

@@ -407,12 +407,12 @@ void EditorConfiguration::slotAboutToRemoveProject(Project *project)
deconfigureEditor(editor);
}
TabSettings actualTabSettings(const QString &fileName,
TabSettings actualTabSettings(const Utils::FilePath &file,
const TextDocument *baseTextdocument)
{
if (baseTextdocument)
return baseTextdocument->tabSettings();
if (Project *project = SessionManager::projectForFile(Utils::FilePath::fromString(fileName)))
if (Project *project = SessionManager::projectForFile(file))
return project->editorConfiguration()->codeStyle()->tabSettings();
return TextEditorSettings::codeStyle()->tabSettings();
}

6
src/plugins/projectexplorer/editorconfiguration.h
View File

@@ -49,7 +49,9 @@ class StorageSettings;
class BehaviorSettings;
class ExtraEncodingSettings;
class MarginSettings;
}
} // namespace TextEditor
namespace Utils { class FilePath; }
namespace ProjectExplorer {
@@ -118,6 +120,6 @@ private:
// the file belongs to and return the project settings. If the file doesn't belong to any
// project return the global settings.
PROJECTEXPLORER_EXPORT TextEditor::TabSettings actualTabSettings(
const QString &fileName, const TextEditor::TextDocument *baseTextDocument);
const Utils::FilePath &file, const TextEditor::TextDocument *baseTextDocument);
} // namespace ProjectExplorer

4
src/plugins/qmljstools/qmljsrefactoringchanges.cpp
View File

@@ -57,7 +57,7 @@ public:
const QTextBlock end = doc->findBlock(selection.selectionEnd()).next();
const TextEditor::TabSettings &tabSettings =
ProjectExplorer::actualTabSettings(filePath.toString(), textDocument);
ProjectExplorer::actualTabSettings(filePath, textDocument);
CreatorCodeFormatter codeFormatter(tabSettings);
codeFormatter.updateStateUntil(block);
do {
@@ -82,7 +82,7 @@ public:
const TextEditor::TextDocument *textDocument) const override
{
const TextEditor::TabSettings &tabSettings =
ProjectExplorer::actualTabSettings(filePath.toString(), textDocument);
ProjectExplorer::actualTabSettings(filePath, textDocument);
QmlJSEditor::Internal::Indenter indenter(selection.document());
indenter.reindent(selection, tabSettings);