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

LanguageClient: Re-highlight also on empty deltas

Browse Source 
This is needed for e.g. ClangdClient, which may need to update even if
the highlighting delta from the server is empty.

Task-number: QTCREATORBUG-26183
Change-Id: I38398c9563fa7a6a1906c5cb57fd1cbcd444cbd9
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-09-06 17:02:36 +02:00
parent c8bc0eb512
commit 847a03786c
5 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/clangcodemodel/test/clangdtests.cpp
View File

@@ -1432,7 +1432,6 @@ ClangdTestCompletion::ClangdTestCompletion()
void ClangdTestCompletion::initTestCase() void ClangdTestCompletion::initTestCase()
{ {
ClangdTest::initTestCase(); ClangdTest::initTestCase();
client()->forceHighlightingOnEmptyDelta();
startCollectingHighlightingInfo(); startCollectingHighlightingInfo();
} }

7
src/plugins/languageclient/client.cpp
View File

@@ -1016,13 +1016,6 @@ void Client::setSemanticTokensHandler(const SemanticTokensHandler &handler)
m_tokenSupport.setTokensHandler(handler); m_tokenSupport.setTokensHandler(handler);
} }
#ifdef WITH_TESTS
void Client::forceHighlightingOnEmptyDelta()
{
m_tokenSupport.forceHighlightingOnEmptyDelta();
}
#endif
void Client::setSymbolStringifier(const LanguageServerProtocol::SymbolStringifier &stringifier) void Client::setSymbolStringifier(const LanguageServerProtocol::SymbolStringifier &stringifier)
{ {
m_symbolStringifier = stringifier; m_symbolStringifier = stringifier;

4
src/plugins/languageclient/client.h
View File

@@ -195,10 +195,6 @@ public:
void log(const LanguageServerProtocol::ResponseError<Error> &responseError) const void log(const LanguageServerProtocol::ResponseError<Error> &responseError) const
{ log(responseError.toString()); } { log(responseError.toString()); }
#ifdef WITH_TESTS
void forceHighlightingOnEmptyDelta();
#endif
signals: signals:
void initialized(const LanguageServerProtocol::ServerCapabilities &capabilities); void initialized(const LanguageServerProtocol::ServerCapabilities &capabilities);
void capabilitiesChanged(const DynamicCapabilities &capabilities); void capabilitiesChanged(const DynamicCapabilities &capabilities);

1
src/plugins/languageclient/semantichighlightsupport.cpp
View File

@@ -387,7 +387,6 @@ void SemanticTokenSupport::handleSemanticTokensDelta(
} else if (auto tokensDelta = Utils::get_if<SemanticTokensDelta>(&result)) { } else if (auto tokensDelta = Utils::get_if<SemanticTokensDelta>(&result)) {
QList<SemanticTokensEdit> edits = tokensDelta->edits(); QList<SemanticTokensEdit> edits = tokensDelta->edits();
if (edits.isEmpty()) { if (edits.isEmpty()) {
if (m_highlightOnEmptyDelta)
highlight(filePath); highlight(filePath);
return; return;
} }

2
src/plugins/languageclient/semantichighlightsupport.h
View File

@@ -81,7 +81,6 @@ public:
// void setAdditionalTokenModifierStyles(const QHash<int, TextEditor::TextStyle> &modifierStyles); // void setAdditionalTokenModifierStyles(const QHash<int, TextEditor::TextStyle> &modifierStyles);
void setTokensHandler(const SemanticTokensHandler &handler) { m_tokensHandler = handler; } void setTokensHandler(const SemanticTokensHandler &handler) { m_tokensHandler = handler; }
void forceHighlightingOnEmptyDelta() { m_highlightOnEmptyDelta = true; }
private: private:
LanguageServerProtocol::SemanticRequestTypes supportedSemanticRequests( LanguageServerProtocol::SemanticRequestTypes supportedSemanticRequests(
@@ -107,7 +106,6 @@ private:
SemanticTokensHandler m_tokensHandler; SemanticTokensHandler m_tokensHandler;
QStringList m_tokenTypeStrings; QStringList m_tokenTypeStrings;
QStringList m_tokenModifierStrings; QStringList m_tokenModifierStrings;
bool m_highlightOnEmptyDelta = false;
}; };
} // namespace LanguageClient } // namespace LanguageClient