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

Clang: Rename HighlightingMark to TokenInfo

Browse Source 
Before adding additional members into that class it
makes sense to rename it to better represent its content.

Other classes serving the same purpose are also renamed
to keep the names consistent.

Change-Id: I3c8517e42aae29779d71ec9c85b713cff581a473
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-12-05 09:42:35 +01:00
parent b1bb6d9641
commit affc652b7b
36 changed files with 1505 additions and 1505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/clangbackendreceiver.cpp
View File

@@ -181,7 +181,7 @@ void BackendReceiver::documentAnnotationsChanged(const DocumentAnnotationsChange
{
qCDebug(log) << "<<< DocumentAnnotationsChangedMessage with"
<< message.diagnostics().size() << "diagnostics"
<< message.highlightingMarks().size() << "highlighting marks"
<< message.tokenInfos().size() << "highlighting marks"
<< message.skippedPreprocessorRanges().size() << "skipped preprocessor ranges";
auto processor = ClangEditorDocumentProcessor::get(message.fileContainer().filePath());
@@ -195,7 +195,7 @@ void BackendReceiver::documentAnnotationsChanged(const DocumentAnnotationsChange
processor->updateCodeWarnings(message.diagnostics(),
message.firstHeaderErrorDiagnostic(),
documentRevision);
processor->updateHighlighting(message.highlightingMarks(),
processor->updateHighlighting(message.tokenInfos(),
message.skippedPreprocessorRanges(),
documentRevision);
}

6
src/plugins/clangcodemodel/clangcodemodel.pro
View File

@@ -30,7 +30,7 @@ SOURCES += \
clangfixitoperationsextractor.cpp \
clangfollowsymbol.cpp \
clangfunctionhintmodel.cpp \
clanghighlightingmarksreporter.cpp \
clangtokeninfosreporter.cpp \
clangmodelmanagersupport.cpp \
clangpreprocessorassistproposalitem.cpp \
clangprojectsettings.cpp \
@@ -66,7 +66,6 @@ HEADERS += \
clangfixitoperationsextractor.h \
clangfollowsymbol.h \
clangfunctionhintmodel.h \
clanghighlightingmarksreporter.h \
clangisdiagnosticrelatedtolocation.h \
clangmodelmanagersupport.h \
clangpreprocessorassistproposalitem.h \
@@ -75,7 +74,8 @@ HEADERS += \
clangrefactoringengine.h \
clangtextmark.h \
clanguiheaderondiskmanager.h \
clangutils.h
clangutils.h \
clangtokeninfosreporter.h
FORMS += clangprojectsettingswidget.ui

4
src/plugins/clangcodemodel/clangcodemodel.qbs
View File

@@ -80,8 +80,8 @@ QtcPlugin {
"clangfollowsymbol.h",
"clangfunctionhintmodel.cpp",
"clangfunctionhintmodel.h",
"clanghighlightingmarksreporter.cpp",
"clanghighlightingmarksreporter.h",
"clangtokeninfosreporter.cpp",
"clangtokeninfosreporter.h",
"clangisdiagnosticrelatedtolocation.h",
"clangmodelmanagersupport.cpp",
"clangmodelmanagersupport.h",

4
src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri
View File

@@ -7,7 +7,7 @@ SOURCES += \
$$PWD/clangcompletioncontextanalyzer.cpp \
$$PWD/clangdiagnosticfilter.cpp \
$$PWD/clangfixitoperation.cpp \
$$PWD/clanghighlightingmarksreporter.cpp
$$PWD/clangtokeninfosreporter.cpp
HEADERS += \
$$PWD/clangactivationsequencecontextprocessor.h \
@@ -16,5 +16,5 @@ HEADERS += \
$$PWD/clangcompletioncontextanalyzer.h \
$$PWD/clangdiagnosticfilter.h \
$$PWD/clangfixitoperation.h \
$$PWD/clanghighlightingmarksreporter.h \
$$PWD/clangtokeninfosreporter.h \
$$PWD/clangisdiagnosticrelatedtolocation.h

16
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -29,7 +29,7 @@
#include "clangdiagnostictooltipwidget.h"
#include "clangfixitoperation.h"
#include "clangfixitoperationsextractor.h"
#include "clanghighlightingmarksreporter.h"
#include "clangtokeninfosreporter.h"
#include "clangprojectsettings.h"
#include "clangutils.h"
@@ -225,14 +225,14 @@ toTextEditorBlocks(QTextDocument *textDocument,
}
}
const QVector<ClangBackEnd::HighlightingMarkContainer>
&ClangEditorDocumentProcessor::highlightingMarks() const
const QVector<ClangBackEnd::TokenInfoContainer>
&ClangEditorDocumentProcessor::tokenInfos() const
{
return m_highlightingMarks;
return m_tokenInfos;
}
void ClangEditorDocumentProcessor::updateHighlighting(
const QVector<ClangBackEnd::HighlightingMarkContainer> &highlightingMarks,
const QVector<ClangBackEnd::TokenInfoContainer> &tokenInfos,
const QVector<ClangBackEnd::SourceRangeContainer> &skippedPreprocessorRanges,
uint documentRevision)
{
@@ -240,10 +240,10 @@ void ClangEditorDocumentProcessor::updateHighlighting(
const auto skippedPreprocessorBlocks = toTextEditorBlocks(textDocument(), skippedPreprocessorRanges);
emit ifdefedOutBlocksUpdated(documentRevision, skippedPreprocessorBlocks);
m_highlightingMarks = highlightingMarks;
m_tokenInfos = tokenInfos;
m_semanticHighlighter.setHighlightingRunner(
[highlightingMarks]() {
auto *reporter = new HighlightingMarksReporter(highlightingMarks);
[tokenInfos]() {
auto *reporter = new TokenInfosReporter(tokenInfos);
return reporter->start();
});
m_semanticHighlighter.run();

8
src/plugins/clangcodemodel/clangeditordocumentprocessor.h
View File

@@ -36,7 +36,7 @@
namespace ClangBackEnd {
class DiagnosticContainer;
class HighlightingMarkContainer;
class TokenInfoContainer;
class FileContainer;
}
@@ -70,7 +70,7 @@ public:
void updateCodeWarnings(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics,
const ClangBackEnd::DiagnosticContainer &firstHeaderErrorDiagnostic,
uint documentRevision);
void updateHighlighting(const QVector<ClangBackEnd::HighlightingMarkContainer> &highlightingMarks,
void updateHighlighting(const QVector<ClangBackEnd::TokenInfoContainer> &tokenInfos,
const QVector<ClangBackEnd::SourceRangeContainer> &skippedPreprocessorRanges,
uint documentRevision);
@@ -93,7 +93,7 @@ public:
void clearDiagnosticsWithFixIts();
const QVector<ClangBackEnd::HighlightingMarkContainer> &highlightingMarks() const;
const QVector<ClangBackEnd::TokenInfoContainer> &tokenInfos() const;
public:
static ClangEditorDocumentProcessor *get(const QString &filePath);
@@ -123,7 +123,7 @@ private:
QTimer m_updateTranslationUnitTimer;
unsigned m_parserRevision;
QVector<ClangBackEnd::HighlightingMarkContainer> m_highlightingMarks;
QVector<ClangBackEnd::TokenInfoContainer> m_tokenInfos;
CppTools::SemanticHighlighter m_semanticHighlighter;
CppTools::BuiltinEditorDocumentProcessor m_builtinProcessor;
};

16
src/plugins/clangcodemodel/clangfollowsymbol.cpp
View File

@@ -28,7 +28,7 @@
#include <texteditor/texteditor.h>
#include <clangsupport/highlightingmarkcontainer.h>
#include <clangsupport/tokeninfocontainer.h>
#include <utils/textutils.h>
#include <utils/algorithm.h>
@@ -37,13 +37,13 @@ namespace ClangCodeModel {
namespace Internal {
// Returns invalid Mark if it is not found at (line, column)
static bool findMark(const QVector<ClangBackEnd::HighlightingMarkContainer> &marks,
static bool findMark(const QVector<ClangBackEnd::TokenInfoContainer> &marks,
uint line,
uint column,
ClangBackEnd::HighlightingMarkContainer &mark)
ClangBackEnd::TokenInfoContainer &mark)
{
mark = Utils::findOrDefault(marks,
[line, column](const ClangBackEnd::HighlightingMarkContainer &curMark) {
[line, column](const ClangBackEnd::TokenInfoContainer &curMark) {
if (curMark.line() != line)
return false;
if (curMark.column() == column)
@@ -57,7 +57,7 @@ static bool findMark(const QVector<ClangBackEnd::HighlightingMarkContainer> &mar
return true;
}
static int getMarkPos(QTextCursor cursor, const ClangBackEnd::HighlightingMarkContainer &mark)
static int getMarkPos(QTextCursor cursor, const ClangBackEnd::TokenInfoContainer &mark)
{
cursor.setPosition(0);
cursor.movePosition(QTextCursor::NextBlock, QTextCursor::MoveAnchor, mark.line() - 1);
@@ -70,9 +70,9 @@ static Utils::Link linkAtCursor(QTextCursor cursor, const QString &filePath, uin
{
using Link = Utils::Link;
const QVector<ClangBackEnd::HighlightingMarkContainer> &marks
= processor->highlightingMarks();
ClangBackEnd::HighlightingMarkContainer mark;
const QVector<ClangBackEnd::TokenInfoContainer> &marks
= processor->tokenInfos();
ClangBackEnd::TokenInfoContainer mark;
if (!findMark(marks, line, column, mark))
return Link();

36
src/plugins/clangcodemodel/clanghighlightingmarksreporter.cpp → src/plugins/clangcodemodel/clangtokeninfosreporter.cpp
View File

@@ -23,7 +23,7 @@
**
****************************************************************************/
#include "clanghighlightingmarksreporter.h"
#include "clangtokeninfosreporter.h"
#include <texteditor/textstyles.h>
#include <utils/qtcassert.h>
@@ -97,13 +97,13 @@ TextEditor::TextStyles toTextStyles(ClangBackEnd::HighlightingTypes types)
}
TextEditor::HighlightingResult toHighlightingResult(
const ClangBackEnd::HighlightingMarkContainer &highlightingMark)
const ClangBackEnd::TokenInfoContainer &tokenInfo)
{
const auto textStyles = toTextStyles(highlightingMark.types());
const auto textStyles = toTextStyles(tokenInfo.types());
return TextEditor::HighlightingResult(highlightingMark.line(),
highlightingMark.column(),
highlightingMark.length(),
return TextEditor::HighlightingResult(tokenInfo.line(),
tokenInfo.column(),
tokenInfo.length(),
textStyles);
}
@@ -111,14 +111,14 @@ TextEditor::HighlightingResult toHighlightingResult(
namespace ClangCodeModel {
HighlightingMarksReporter::HighlightingMarksReporter(
const QVector<ClangBackEnd::HighlightingMarkContainer> &highlightingMarks)
: m_highlightingMarks(highlightingMarks)
TokenInfosReporter::TokenInfosReporter(
const QVector<ClangBackEnd::TokenInfoContainer> &tokenInfos)
: m_tokenInfos(tokenInfos)
{
m_chunksToReport.reserve(m_chunkSize + 1);
}
void HighlightingMarksReporter::reportChunkWise(
void TokenInfosReporter::reportChunkWise(
const TextEditor::HighlightingResult &highlightingResult)
{
if (m_chunksToReport.size() >= m_chunkSize) {
@@ -133,7 +133,7 @@ void HighlightingMarksReporter::reportChunkWise(
m_chunksToReport.append(highlightingResult);
}
void HighlightingMarksReporter::reportAndClearCurrentChunks()
void TokenInfosReporter::reportAndClearCurrentChunks()
{
m_flushRequested = false;
m_flushLine = 0;
@@ -144,30 +144,30 @@ void HighlightingMarksReporter::reportAndClearCurrentChunks()
}
}
void HighlightingMarksReporter::setChunkSize(int chunkSize)
void TokenInfosReporter::setChunkSize(int chunkSize)
{
m_chunkSize = chunkSize;
}
void HighlightingMarksReporter::run()
void TokenInfosReporter::run()
{
run_internal();
reportFinished();
}
void HighlightingMarksReporter::run_internal()
void TokenInfosReporter::run_internal()
{
if (isCanceled())
return;
using ClangBackEnd::HighlightingType;
for (const auto &highlightingMark : m_highlightingMarks) {
const HighlightingType mainType = highlightingMark.types().mainHighlightingType;
for (const auto &tokenInfo : m_tokenInfos) {
const HighlightingType mainType = tokenInfo.types().mainHighlightingType;
if (mainType == HighlightingType::StringLiteral)
continue;
reportChunkWise(toHighlightingResult(highlightingMark));
reportChunkWise(toHighlightingResult(tokenInfo));
}
if (isCanceled())
@@ -176,7 +176,7 @@ void HighlightingMarksReporter::run_internal()
reportAndClearCurrentChunks();
}
QFuture<TextEditor::HighlightingResult> HighlightingMarksReporter::start()
QFuture<TextEditor::HighlightingResult> TokenInfosReporter::start()
{
this->setRunnable(this);
this->reportStarted();

8
src/plugins/clangcodemodel/clanghighlightingmarksreporter.h → src/plugins/clangcodemodel/clangtokeninfosreporter.h
View File

@@ -32,11 +32,11 @@
#include <texteditor/semantichighlighter.h>
#include <clangsupport/highlightingmarkcontainer.h>
#include <clangsupport/tokeninfocontainer.h>
namespace ClangCodeModel {
class HighlightingMarksReporter:
class TokenInfosReporter:
public QObject,
public QRunnable,
public QFutureInterface<TextEditor::HighlightingResult>
@@ -44,7 +44,7 @@ class HighlightingMarksReporter:
Q_OBJECT
public:
HighlightingMarksReporter(const QVector<ClangBackEnd::HighlightingMarkContainer> &highlightingMarks);
TokenInfosReporter(const QVector<ClangBackEnd::TokenInfoContainer> &tokenInfos);
void setChunkSize(int chunkSize);
@@ -58,7 +58,7 @@ private:
void reportAndClearCurrentChunks();
private:
QVector<ClangBackEnd::HighlightingMarkContainer> m_highlightingMarks;
QVector<ClangBackEnd::TokenInfoContainer> m_tokenInfos;
QVector<TextEditor::HighlightingResult> m_chunksToReport;
int m_chunkSize = 100;