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

TextEditor: highlighter.cpp code cosmetics

Browse Source 
static, namespaces.

Change-Id: Id824f6979ce6c6ec6bbe4847c808c7ae47d26695
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-06-29 18:00:43 +02:00
parent bce19b73c5
commit d97c10a42e
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,25 +44,26 @@
#include <Repository> #include <Repository>
#include <SyntaxHighlighter> #include <SyntaxHighlighter>
#include <QDir>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QMetaEnum> #include <QMetaEnum>
using namespace TextEditor; using namespace Utils;
namespace TextEditor {
static Q_LOGGING_CATEGORY(highlighterLog, "qtc.editor.highlighter", QtWarningMsg) static Q_LOGGING_CATEGORY(highlighterLog, "qtc.editor.highlighter", QtWarningMsg)
static const char kDefinitionForMimeType[] = "definitionForMimeType"; const char kDefinitionForMimeType[] = "definitionForMimeType";
static const char kDefinitionForExtension[] = "definitionForExtension"; const char kDefinitionForExtension[] = "definitionForExtension";
static const char kDefinitionForFilePath[] = "definitionForFilePath"; const char kDefinitionForFilePath[] = "definitionForFilePath";
KSyntaxHighlighting::Repository *highlightRepository() static KSyntaxHighlighting::Repository *highlightRepository()
{ {
static KSyntaxHighlighting::Repository *repository = nullptr; static KSyntaxHighlighting::Repository *repository = nullptr;
if (!repository) { if (!repository) {
repository = new KSyntaxHighlighting::Repository(); repository = new KSyntaxHighlighting::Repository();
repository->addCustomSearchPath(TextEditorSettings::highlighterSettings().definitionFilesPath()); repository->addCustomSearchPath(TextEditorSettings::highlighterSettings().definitionFilesPath());
const Utils::FilePath dir = Core::ICore::resourcePath("generic-highlighter/syntax"); const FilePath dir = Core::ICore::resourcePath("generic-highlighter/syntax");
if (dir.exists()) if (dir.exists())
repository->addCustomSearchPath(dir.parentDir().path()); repository->addCustomSearchPath(dir.parentDir().path());
} }
@@ -128,20 +129,18 @@ Highlighter::Definitions Highlighter::definitionsForDocument(const TextDocument
// If we check the MIME type first and then skip the pattern, the definition for "*.rb.xml" is // If we check the MIME type first and then skip the pattern, the definition for "*.rb.xml" is
// never considered. // never considered.
// The KSyntaxHighlighting CLI also completely ignores MIME types. // The KSyntaxHighlighting CLI also completely ignores MIME types.
const Utils::FilePath &filePath = document->filePath(); const FilePath &filePath = document->filePath();
Definitions definitions = definitionsForFileName(filePath); Definitions definitions = definitionsForFileName(filePath);
if (definitions.isEmpty()) { if (definitions.isEmpty()) {
// check for *.in filename since those are usually used for // check for *.in filename since those are usually used for
// cmake configure_file input filenames without the .in extension // cmake configure_file input filenames without the .in extension
if (filePath.endsWith(".in")) { if (filePath.endsWith(".in"))
definitions = definitionsForFileName( definitions = definitionsForFileName(FilePath::fromString(filePath.completeBaseName()));
Utils::FilePath::fromString(filePath.completeBaseName()));
}
if (filePath.fileName() == "qtquickcontrols2.conf") if (filePath.fileName() == "qtquickcontrols2.conf")
definitions = definitionsForFileName(filePath.stringAppended(".ini")); definitions = definitionsForFileName(filePath.stringAppended(".ini"));
} }
if (definitions.isEmpty()) { if (definitions.isEmpty()) {
const Utils::MimeType &mimeType = Utils::mimeTypeForName(document->mimeType()); const MimeType &mimeType = Utils::mimeTypeForName(document->mimeType());
if (mimeType.isValid()) if (mimeType.isValid())
definitions = definitionsForMimeType(mimeType.name()); definitions = definitionsForMimeType(mimeType.name());
} }
@@ -171,7 +170,7 @@ Highlighter::Definitions Highlighter::definitionsForMimeType(const QString &mime
return definitions; return definitions;
} }
Highlighter::Definitions Highlighter::definitionsForFileName(const Utils::FilePath &fileName) Highlighter::Definitions Highlighter::definitionsForFileName(const FilePath &fileName)
{ {
Definitions definitions Definitions definitions
= highlightRepository()->definitionsForFileName(fileName.fileName()).toList(); = highlightRepository()->definitionsForFileName(fileName.fileName()).toList();
@@ -197,7 +196,7 @@ 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 Utils::FilePath &path = document->filePath(); const FilePath &path = document->filePath();
const QString &fileExtension = path.completeSuffix(); 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);
@@ -233,7 +232,7 @@ void Highlighter::clearDefinitionForDocumentCache()
settings->endGroup(); settings->endGroup();
} }
void Highlighter::addCustomHighlighterPath(const Utils::FilePath &path) void Highlighter::addCustomHighlighterPath(const FilePath &path)
{ {
highlightRepository()->addCustomSearchPath(path.toString()); highlightRepository()->addCustomSearchPath(path.toString());
} }
@@ -332,18 +331,18 @@ void Highlighter::applyFormat(int offset, int length, const KSyntaxHighlighting:
const QColor textColor = format.textColor(defaultTheme); const QColor textColor = format.textColor(defaultTheme);
if (format.hasBackgroundColor(defaultTheme)) { if (format.hasBackgroundColor(defaultTheme)) {
const QColor backgroundColor = format.hasBackgroundColor(defaultTheme); const QColor backgroundColor = format.hasBackgroundColor(defaultTheme);
if (Utils::StyleHelper::isReadableOn(backgroundColor, textColor)) { if (StyleHelper::isReadableOn(backgroundColor, textColor)) {
qformat.setForeground(textColor); qformat.setForeground(textColor);
qformat.setBackground(backgroundColor); qformat.setBackground(backgroundColor);
} else if (Utils::StyleHelper::isReadableOn(qformat.background().color(), textColor)) { } else if (StyleHelper::isReadableOn(qformat.background().color(), textColor)) {
qformat.setForeground(textColor); qformat.setForeground(textColor);
} }
} else if (Utils::StyleHelper::isReadableOn(qformat.background().color(), textColor)) { } else if (StyleHelper::isReadableOn(qformat.background().color(), textColor)) {
qformat.setForeground(textColor); qformat.setForeground(textColor);
} }
} else if (format.hasBackgroundColor(defaultTheme)) { } else if (format.hasBackgroundColor(defaultTheme)) {
const QColor backgroundColor = format.hasBackgroundColor(defaultTheme); const QColor backgroundColor = format.hasBackgroundColor(defaultTheme);
if (Utils::StyleHelper::isReadableOn(backgroundColor, qformat.foreground().color())) if (StyleHelper::isReadableOn(backgroundColor, qformat.foreground().color()))
qformat.setBackground(backgroundColor); qformat.setBackground(backgroundColor);
} }
@@ -396,3 +395,5 @@ void Highlighter::applyFolding(int offset,
data->setFoldingIndent(TextDocumentLayout::braceDepth(block)); data->setFoldingIndent(TextDocumentLayout::braceDepth(block));
} }
} }
} // TextEditor