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

LanguageClient: remove semantic highlighting proposal

Browse Source 
The semantichighlighting proposal from
https://github.com/microsoft/vscode-languageserver-node/pull/367
was replaced with semantic tokens in the final protocol version 3.16.

This reverts 307f1d8e6e

Task-number: QTCREATORBUG-26624
Change-Id: I635f0b4763a197edabf9edf8d9041143dcf531e3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2021-11-29 09:44:46 +01:00
parent 022bf4396c
commit 6aa2c58842
11 changed files with 11 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/libs/languageserverprotocol/languagefeatures.cpp
View File

@@ -48,7 +48,6 @@ constexpr const char DocumentRangeFormattingRequest::methodName[];
constexpr const char DocumentOnTypeFormattingRequest::methodName[];
constexpr const char RenameRequest::methodName[];
constexpr const char SignatureHelpRequest::methodName[];
constexpr const char SemanticHighlightNotification::methodName[];
constexpr const char PrepareRenameRequest::methodName[];
HoverContent LanguageServerProtocol::Hover::content() const
@@ -369,63 +368,6 @@ CodeActionResult::CodeActionResult(const QJsonValue &val)
emplace<std::nullptr_t>(nullptr);
}
Utils::optional<QList<SemanticHighlightToken>> SemanticHighlightingInformation::tokens() const
{
QList<SemanticHighlightToken> resultTokens;
const QByteArray tokensByteArray = QByteArray::fromBase64(
typedValue<QString>(tokensKey).toLocal8Bit());
constexpr int tokensByteSize = 8;
int index = 0;
while (index + tokensByteSize <= tokensByteArray.size()) {
resultTokens << SemanticHighlightToken(tokensByteArray.mid(index, tokensByteSize));
index += tokensByteSize;
}
return Utils::make_optional(resultTokens);
}
void SemanticHighlightingInformation::setTokens(const QList<SemanticHighlightToken> &tokens)
{
QByteArray byteArray;
byteArray.reserve(8 * tokens.size());
for (const SemanticHighlightToken &token : tokens)
token.appendToByteArray(byteArray);
insert(tokensKey, QString::fromLocal8Bit(byteArray.toBase64()));
}
SemanticHighlightToken::SemanticHighlightToken(const QByteArray &token)
{
QTC_ASSERT(token.size() == 8, return );
character = ( quint32(token.at(0)) << 24
| quint32(token.at(1)) << 16
| quint32(token.at(2)) << 8
| quint32(token.at(3)));
length = quint16(token.at(4) << 8 | token.at(5));
scope = quint16(token.at(6) << 8 | token.at(7));
}
void SemanticHighlightToken::appendToByteArray(QByteArray &byteArray) const
{
byteArray.append(char((character & 0xff000000) >> 24));
byteArray.append(char((character & 0x00ff0000) >> 16));
byteArray.append(char((character & 0x0000ff00) >> 8));
byteArray.append(char((character & 0x000000ff)));
byteArray.append(char((length & 0xff00) >> 8));
byteArray.append(char((length & 0x00ff)));
byteArray.append(char((scope & 0xff00) >> 8));
byteArray.append(char((scope & 0x00ff)));
}
Utils::variant<VersionedTextDocumentIdentifier, TextDocumentIdentifier>
SemanticHighlightingParams::textDocument() const
{
VersionedTextDocumentIdentifier textDocument = fromJsonValue<VersionedTextDocumentIdentifier>(
value(textDocumentKey));
return textDocument.isValid() ? textDocument : TextDocumentIdentifier(textDocument);
}
PrepareRenameResult::PrepareRenameResult()
: Utils::variant<PlaceHolderResult, Range, std::nullptr_t>(nullptr)
{}
@@ -457,10 +399,6 @@ PrepareRenameResult::PrepareRenameResult(const QJsonValue &val)
}
}
SemanticHighlightNotification::SemanticHighlightNotification(const SemanticHighlightingParams &params)
: Notification(methodName, params)
{}
Utils::optional<QJsonValue> CodeLens::data() const
{
return contains(dataKey) ? Utils::make_optional(value(dataKey)) : Utils::nullopt;