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

Editor: remove FilePath::toFileInfo in syntax highlighter

Browse Source 
Change-Id: I205c16d227368f13baef8c8db3e1c9f4de2a4d69
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-06-09 08:35:53 +02:00
parent 43b6ada0db
commit 38bbd6eb8c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/highlighter.cpp
View File

@@ -176,7 +176,7 @@ Highlighter::Definitions Highlighter::definitionsForFileName(const Utils::FilePa
const Definition &rememberedDefinition const Definition &rememberedDefinition
= fileExtension.isEmpty() = fileExtension.isEmpty()
? definitionForSetting(kDefinitionForFilePath, ? definitionForSetting(kDefinitionForFilePath,
fileName.toFileInfo().canonicalFilePath()) fileName.absoluteFilePath().toString())
: definitionForSetting(kDefinitionForExtension, fileExtension); : definitionForSetting(kDefinitionForExtension, fileExtension);
if (rememberedDefinition.isValid() && definitions.contains(rememberedDefinition)) if (rememberedDefinition.isValid() && definitions.contains(rememberedDefinition))
definitions = {rememberedDefinition}; definitions = {rememberedDefinition};
@@ -192,11 +192,11 @@ void Highlighter::rememberDefinitionForDocument(const Highlighter::Definition &d
if (!definition.isValid()) if (!definition.isValid())
return; return;
const QString &mimeType = document->mimeType(); const QString &mimeType = document->mimeType();
const QString &fileExtension = document->filePath().completeSuffix(); const Utils::FilePath &path = document->filePath();
const QString &path = document->filePath().toFileInfo().canonicalFilePath(); const QString &fileExtension = path.completeSuffix();
QSettings *settings = Core::ICore::settings(); QSettings *settings = Core::ICore::settings();
settings->beginGroup(Constants::HIGHLIGHTER_SETTINGS_CATEGORY); settings->beginGroup(Constants::HIGHLIGHTER_SETTINGS_CATEGORY);
const Definitions &fileNameDefinitions = definitionsForFileName(document->filePath()); const Definitions &fileNameDefinitions = definitionsForFileName(path);
if (fileNameDefinitions.contains(definition)) { if (fileNameDefinitions.contains(definition)) {
if (!fileExtension.isEmpty()) { if (!fileExtension.isEmpty()) {
const QString id(kDefinitionForExtension); const QString id(kDefinitionForExtension);
@@ -206,7 +206,7 @@ void Highlighter::rememberDefinitionForDocument(const Highlighter::Definition &d
} else if (!path.isEmpty()) { } else if (!path.isEmpty()) {
const QString id(kDefinitionForFilePath); const QString id(kDefinitionForFilePath);
QMap<QString, QVariant> map = settings->value(id).toMap(); QMap<QString, QVariant> map = settings->value(id).toMap();
map.insert(document->filePath().toFileInfo().absoluteFilePath(), definition.name()); map.insert(path.absoluteFilePath().toString(), definition.name());
settings->setValue(id, map); settings->setValue(id, map);
} }
} else if (!mimeType.isEmpty()) { } else if (!mimeType.isEmpty()) {