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

CppEditor: Use more FilePath in BuiltinEditorDocumentParser

Browse Source 
Change-Id: I839d6b5fb158dc75f12b200135a09b74050a94da
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-11-25 10:49:40 +01:00
parent 570fa165b9
commit 4cf0918b5c
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cppeditor/builtineditordocumentparser.cpp
View File

@@ -60,8 +60,8 @@ void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &futur
CppModelManager *modelManager = CppModelManager::instance();
QByteArray configFile = modelManager->codeModelConfiguration();
ProjectExplorer::HeaderPaths headerPaths;
QStringList includedFiles;
QStringList precompiledHeaders;
FilePaths includedFiles;
FilePaths precompiledHeaders;
QString projectConfigFile;
LanguageFeatures features = LanguageFeatures::defaultFeatures();
@@ -86,9 +86,9 @@ void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &futur
configFile += ProjectPart::readProjectConfigFile(part->projectConfigFile);
headerPaths = part->headerPaths;
projectConfigFile = part->projectConfigFile;
includedFiles = part->includedFiles;
includedFiles = Utils::transform(part->includedFiles, &FilePath::fromString);
if (baseConfig.usePrecompiledHeaders)
precompiledHeaders = part->precompiledHeaders;
precompiledHeaders = Utils::transform(part->precompiledHeaders, &FilePath::fromString);
features = part->languageFeatures;
}
@@ -190,16 +190,16 @@ void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &futur
sourceProcessor.setLanguageFeatures(features);
sourceProcessor.run(configurationFileName);
if (baseConfig.usePrecompiledHeaders) {
for (const QString &precompiledHeader : std::as_const(state.precompiledHeaders))
sourceProcessor.run(FilePath::fromString(precompiledHeader));
for (const FilePath &precompiledHeader : std::as_const(state.precompiledHeaders))
sourceProcessor.run(precompiledHeader);
}
if (!baseState.editorDefines.isEmpty())
sourceProcessor.run(CppModelManager::editorConfigurationFileName());
QStringList includedFiles = state.includedFiles;
FilePaths includedFiles = state.includedFiles;
if (baseConfig.usePrecompiledHeaders)
includedFiles << state.precompiledHeaders;
includedFiles.removeDuplicates();
sourceProcessor.run(filePath(), transform(includedFiles, &FilePath::fromString));
FilePath::removeDuplicates(includedFiles);
sourceProcessor.run(filePath(), includedFiles);
state.snapshot = sourceProcessor.snapshot();
Snapshot newSnapshot = state.snapshot.simplified(state.snapshot.document(filePath()));
for (Snapshot::const_iterator i = state.snapshot.begin(), ei = state.snapshot.end();

8
src/plugins/cppeditor/builtineditordocumentparser.h
View File

@@ -8,8 +8,6 @@
#include <cplusplus/CppDocument.h>
#include <QString>
namespace CppEditor {
class CPPEDITOR_EXPORT BuiltinEditorDocumentParser : public BaseEditorDocumentParser
@@ -47,8 +45,8 @@ private:
ProjectExplorer::HeaderPaths headerPaths;
QString projectConfigFile;
QStringList includedFiles;
QStringList precompiledHeaders;
Utils::FilePaths includedFiles;
Utils::FilePaths precompiledHeaders;
CPlusPlus::Snapshot snapshot;
bool forceSnapshotInvalidation = false;
@@ -62,4 +60,4 @@ private:
const int m_fileSizeLimitInMb = -1;
};
} // namespace CppEditor
} // CppEditor