Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-31 18:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

ecode:

Browse Source 
LSP plugin: Try fix a deadlock. Support string/UUID message IDs. Fixed response/notification parsing.
This commit is contained in:
Martín Lucas Golini
2022-11-12 21:05:35 -03:00
parent 9fc01999f3
commit ae9879c9b4
9 changed files with 170 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
View File

@@ -21,7 +21,10 @@ namespace ecode {
static json getURIJSON( TextDocument* doc, const PluginIDType& id ) {
json data;
data["uri"] = doc->getURI().toString();
data["id"] = id;
if ( id.isInteger() )
data["id"] = id.asInt();
else
data["id"] = id.asString();
return data;
}
@@ -55,7 +58,10 @@ fuzzyMatchSymbols( const std::vector<const AutoCompletePlugin::SymbolsList*>& sy
}
std::sort( matches.begin(), matches.end(),
[]( const auto& left, const auto& right ) { return left.score > right.score; } );
[]( const AutoCompletePlugin::Suggestion& left,
const AutoCompletePlugin::Suggestion& right ) {
return left.score > right.score && left.kind != LSPCompletionItemKind::Text;
} );
return matches;
}
@@ -419,11 +425,13 @@ PluginRequestHandle
AutoCompletePlugin::processCodeCompletion( const LSPCompletionList& completion ) {
SymbolsList suggestions;
for ( const auto& item : completion.items ) {
if ( !item.textEdit.text.empty() )
if ( !item.insertText.empty() )
suggestions.push_back(
{ item.kind, item.insertText, item.detail, item.sortText, item.textEdit.range } );
else if ( !item.textEdit.text.empty() )
suggestions.push_back( { item.kind, item.textEdit.text, item.detail, item.sortText,
item.textEdit.range } );
else if ( !item.insertText.empty() )
suggestions.push_back( { item.kind, item.insertText, item.detail, item.sortText } );
else
suggestions.push_back( { item.kind, item.filterText, item.detail, item.sortText } );
}