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

ecode: Added textDocument/rename support ("Rename Symbol Under Cursor").

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-03-13 02:23:00 -03:00
parent de59ee7423
commit 51381a38db
11 changed files with 137 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/tools/ecode/plugins/lsp/lspclientplugin.cpp
View File

@@ -722,14 +722,16 @@ void LSPClientPlugin::loadLSPConfig( std::vector<LSPDefinition>& lsps, const std
mKeyBindings["lsp-go-to-definition"] = "f2";
mKeyBindings["lsp-symbol-info"] = "f1";
mKeyBindings["lsp-symbol-code-action"] = "alt+return";
mKeyBindings["lsp-rename-symbol-under-cursor"] = "ctrl+shift+r";
}
if ( j.contains( "keybindings" ) ) {
auto& kb = j["keybindings"];
auto list = {
"lsp-go-to-definition", "lsp-go-to-declaration", "lsp-go-to-implementation",
"lsp-go-to-type-definition", "lsp-switch-header-source", "lsp-symbol-info",
"lsp-symbol-references", "lsp-memory-usage", "lsp-symbol-code-action" };
auto list = { "lsp-go-to-definition", "lsp-go-to-declaration",
"lsp-go-to-implementation", "lsp-go-to-type-definition",
"lsp-switch-header-source", "lsp-symbol-info",
"lsp-symbol-references", "lsp-memory-usage",
"lsp-symbol-code-action", "lsp-rename-symbol-under-cursor" };
for ( const auto& key : list ) {
if ( kb.contains( key ) ) {
if ( !kb[key].empty() )
@@ -905,6 +907,29 @@ void LSPClientPlugin::codeAction( UICodeEditor* editor ) {
} );
}
void LSPClientPlugin::renameSymbol( UICodeEditor* editor ) {
UIMessageBox* msgBox = UIMessageBox::New(
UIMessageBox::INPUT, editor->getUISceneNode()->i18n(
"new_symbol_under_cursor_name",
"New name (caution: not all references may be replaced)" ) );
msgBox->setTitle( editor->getUISceneNode()->i18n( "rename", "Rename" ) );
msgBox->setCloseShortcut( { KEY_ESCAPE, KEYMOD_NONE } );
TextPosition pos = editor->getDocument().getSelection().start();
msgBox->getTextInput()->setText(
editor->getDocument().getWordInPosition( editor->getDocument().getSelection().start() ) );
msgBox->getTextInput()->getDocument().selectAll();
msgBox->showWhenReady();
msgBox->addEventListener( Event::OnConfirm, [this, pos, editor, msgBox]( const Event* ) {
String newName( msgBox->getTextInput()->getText() );
mClientManager.renameSymbol( editor->getDocumentRef()->getURI(), pos, newName );
msgBox->closeWindow();
} );
msgBox->addEventListener( Event::OnClose, [&]( const Event* ) {
if ( mManager->getSplitter() && mManager->getSplitter()->getCurWidget() )
mManager->getSplitter()->getCurWidget()->setFocus();
} );
}
void LSPClientPlugin::onRegister( UICodeEditor* editor ) {
Lock l( mDocMutex );
mDocs.insert( editor->getDocumentRef().get() );
@@ -921,6 +946,9 @@ void LSPClientPlugin::onRegister( UICodeEditor* editor ) {
getAndGoToLocation( editor, "textDocument/definition" );
} );
doc.setCommand( "lsp-rename-symbol-under-cursor",
[this, editor]() { renameSymbol( editor ); } );
doc.setCommand( "lsp-go-to-declaration", [&, editor]() {
getAndGoToLocation( editor, "textDocument/declaration" );
} );
@@ -1060,6 +1088,9 @@ bool LSPClientPlugin::onCreateContextMenu( UICodeEditor* editor, UIPopUpMenu* me
if ( cap.implementationProvider )
addFn( "lsp-go-to-implementation", "Go To Implementation" );
if ( cap.renameProvider )
addFn( "lsp-rename-symbol-under-cursor", "Rename Symbol Under Cursor" );
if ( cap.referencesProvider )
addFn( "lsp-symbol-references", "Find References to Symbol Under Cursor" );

2
src/tools/ecode/plugins/lsp/lspclientplugin.hpp
View File

@@ -171,6 +171,8 @@ class LSPClientPlugin : public UICodeEditorPlugin {
LSPSymbolInformationList&& res );
void processDiagnosticsCodeAction( const PluginMessage& msg );
void renameSymbol( UICodeEditor* editor );
};
} // namespace ecode

31
src/tools/ecode/plugins/lsp/lspclientserver.cpp
View File

@@ -508,9 +508,9 @@ static LSPWorkspaceEdit parseWorkSpaceEdit( const json& result ) {
}
}
if ( result.contains( "documentChanges" ) ) {
auto& documentChanges = result.at( "documentChanges" );
const auto& documentChanges = result.at( "documentChanges" );
// resourceOperations not supported for now
for ( auto& edit : documentChanges ) {
for ( const auto& edit : documentChanges ) {
ret.documentChanges.push_back( parseTextDocumentEdit( edit ) );
}
}
@@ -520,7 +520,7 @@ static LSPWorkspaceEdit parseWorkSpaceEdit( const json& result ) {
static LSPCommand parseCommand( const json& result ) {
auto title = result.at( MEMBER_TITLE ).get<std::string>();
auto command = result.at( MEMBER_COMMAND ).get<std::string>();
auto& args = result.at( MEMBER_ARGUMENTS );
const auto& args = result.at( MEMBER_ARGUMENTS );
return { title, command, args };
}
@@ -908,6 +908,13 @@ static json applyWorkspaceEditResponse( const PluginIDType& msgid,
return j;
}
static json renameParams( const URI& document, const TextPosition& pos,
const std::string& newName ) {
auto params = textDocumentPositionParams( document, pos );
params["newName"] = newName;
return params;
}
void LSPClientServer::registerCapabilities( const json& jcap ) {
if ( !jcap.is_object() || !jcap.contains( "registrations" ) ||
!jcap["registrations"].is_array() )
@@ -923,6 +930,9 @@ void LSPClientServer::registerCapabilities( const json& jcap ) {
} else if ( reg["method"] == "textDocument/documentSymbol" ) {
mCapabilities.documentSymbolProvider = true;
registered = true;
} else if ( reg["method"] == "textDocument/rename" ) {
mCapabilities.renameProvider = true;
registered = true;
}
}
}
@@ -975,6 +985,7 @@ void LSPClientServer::initialize() {
{ "selectionRange", json{ { "dynamicRegistration", false } } },
{ "hover", json{ { "contentFormat", { "markdown", "plaintext" } } } },
{ "completion", completionItem },
{ "rename", json{ { "dynamicRegistration", true } } },
} },
{ "window", json{ { "workDoneProgress", true },
{ "showMessage", showMessage },
@@ -1812,6 +1823,20 @@ LSPClientServer::documentFormatting( const URI& document, const json& options,
} );
}
void LSPClientServer::documentRename( const URI& document, const TextPosition& pos,
const std::string& newName, const JsonReplyHandler& h ) {
auto params = renameParams( document, pos, newName );
sendAsync( newRequest( "textDocument/rename", params ), h );
}
void LSPClientServer::documentRename( const URI& document, const TextPosition& pos,
const std::string& newName, const WorkspaceEditHandler& h ) {
documentRename( document, pos, newName, [h]( const IdType& id, const json& json ) {
if ( h )
h( id, parseWorkSpaceEdit( json ) );
} );
}
void LSPClientServer::memoryUsage( const JsonReplyHandler& h ) {
return sendAsync( newRequest( "$/memoryUsage" ), h );
}

7
src/tools/ecode/plugins/lsp/lspclientserver.hpp
View File

@@ -43,6 +43,7 @@ class LSPClientServer {
using SignatureHelpHandler = ReplyHandler<LSPSignatureHelp>;
using LocationHandler = ReplyHandler<std::vector<LSPLocation>>;
using TextEditArrayHandler = ReplyHandler<std::vector<LSPTextEdit>>;
using WorkspaceEditHandler = ReplyHandler<LSPWorkspaceEdit>;
class LSPRequestHandle : public PluginRequestHandle {
public:
@@ -196,6 +197,12 @@ class LSPClientServer {
LSPRequestHandle documentFormatting( const URI& document, const json& options,
const TextEditArrayHandler& h );
void documentRename( const URI& document, const TextPosition& pos,
const std::string& newName, const JsonReplyHandler& h );
void documentRename( const URI& document, const TextPosition& pos,
const std::string& newName, const WorkspaceEditHandler& h );
void memoryUsage( const JsonReplyHandler& h );
void memoryUsage();

11
src/tools/ecode/plugins/lsp/lspclientservermanager.cpp
View File

@@ -186,6 +186,17 @@ void LSPClientServerManager::applyWorkspaceEdit(
} );
}
void LSPClientServerManager::renameSymbol( const URI& uri, const TextPosition& pos,
const std::string& newName ) {
auto* server = getOneLSPClientServer( uri );
if ( !server )
return;
server->documentRename( uri, pos, newName,
[this]( const PluginIDType&, const LSPWorkspaceEdit& edit ) {
applyWorkspaceEdit( edit, []( const auto& ) {} );
} );
}
void LSPClientServerManager::run( const std::shared_ptr<TextDocument>& doc ) {
mThreadPool->run( [&, doc]() { tryRunServer( doc ); } );
}

2
src/tools/ecode/plugins/lsp/lspclientservermanager.hpp
View File

@@ -92,6 +92,8 @@ class LSPClientServerManager {
const LSPWorkspaceEdit& edit,
const std::function<void( const LSPApplyWorkspaceEditResponse& res )>& resCb );
void renameSymbol( const URI& uri, const TextPosition& pos, const std::string& newName );
protected:
friend class LSPClientServer;
PluginManager* mPluginManager{ nullptr };