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

LanguageClient: sort outline items

Browse Source 
The order we get from the server might not be in the order of appearance
in the document.

Fixes: QTCREATORBUG-4346
Change-Id: I0badba7fd40619b2aa20a81b6a86b43dc9e6a1b1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2022-06-27 09:34:44 +02:00
parent e5942932f4
commit b20ffaa109
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/languageclient/languageclientoutline.cpp
View File

@@ -48,6 +48,23 @@ using namespace LanguageServerProtocol;
namespace LanguageClient {
const QList<SymbolInformation> sortedSymbols(const QList<SymbolInformation> &symbols)
{
auto result = symbols;
Utils::sort(result, [](const SymbolInformation &a, const SymbolInformation &b){
return a.location().range().start() < b.location().range().start();
});
return result;
}
const QList<DocumentSymbol> sortedSymbols(const QList<DocumentSymbol> &symbols)
{
auto result = symbols;
Utils::sort(result, [](const DocumentSymbol &a, const DocumentSymbol &b){
return a.range().start() < b.range().start();
});
return result;
}
class LanguageClientOutlineItem : public Utils::TypedTreeItem<LanguageClientOutlineItem>
{
public:
@@ -65,7 +82,9 @@ public:
, m_symbolStringifier(stringifier)
, m_type(info.kind())
{
for (const DocumentSymbol &child : info.children().value_or(QList<DocumentSymbol>()))
const QList<LanguageServerProtocol::DocumentSymbol> children = sortedSymbols(
info.children().value_or(QList<DocumentSymbol>()));
for (const DocumentSymbol &child : children)
appendChild(new LanguageClientOutlineItem(child, stringifier));
}
@@ -103,13 +122,13 @@ public:
void setInfo(const QList<SymbolInformation> &info)
{
clear();
for (const SymbolInformation &symbol : info)
for (const SymbolInformation &symbol : sortedSymbols(info))
rootItem()->appendChild(new LanguageClientOutlineItem(symbol));
}
void setInfo(const QList<DocumentSymbol> &info)
{
clear();
for (const DocumentSymbol &symbol : info)
for (const DocumentSymbol &symbol : sortedSymbols(info))
rootItem()->appendChild(new LanguageClientOutlineItem(symbol, m_symbolStringifier));
}