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

LanguageClient: correctly cancel running rename request

Browse Source 
When requesting rename results while we have not received the response
to the previous rename request, we have to cancel that previous request
otherwise we end up with duplicated replace operations that potentially
can invalidate the document.

Task-number: QTCREATORBUG-29389
Change-Id: I3be425b8306c18b64fca7bb71bf65c32ae50fed1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2023-08-21 15:18:55 +02:00
parent 8f9e75a3b8
commit e6b8791fa9
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/languageclient/languageclientsymbolsupport.cpp
View File

@@ -452,12 +452,15 @@ void SymbolSupport::requestPrepareRename(TextEditor::TextDocument *document,
void SymbolSupport::requestRename(const TextDocumentPositionParams &positionParams, void SymbolSupport::requestRename(const TextDocumentPositionParams &positionParams,
Core::SearchResult *search) Core::SearchResult *search)
{ {
if (m_renameRequestIds[search].isValid())
m_client->cancelRequest(m_renameRequestIds[search]);
RenameParams params(positionParams); RenameParams params(positionParams);
params.setNewName(search->textToReplace()); params.setNewName(search->textToReplace());
RenameRequest request(params); RenameRequest request(params);
request.setResponseCallback([this, search](const RenameRequest::Response &response) { request.setResponseCallback([this, search](const RenameRequest::Response &response) {
handleRenameResponse(search, response); handleRenameResponse(search, response);
}); });
m_renameRequestIds[search] = request.id();
m_client->sendMessage(request); m_client->sendMessage(request);
if (search->isInteractive()) if (search->isInteractive())
search->popup(); search->popup();
@@ -546,6 +549,7 @@ void SymbolSupport::startRenameSymbol(const TextDocumentPositionParams &position
void SymbolSupport::handleRenameResponse(Core::SearchResult *search, void SymbolSupport::handleRenameResponse(Core::SearchResult *search,
const RenameRequest::Response &response) const RenameRequest::Response &response)
{ {
m_renameRequestIds.remove(search);
const std::optional<PrepareRenameRequest::Response::Error> &error = response.error(); const std::optional<PrepareRenameRequest::Response::Error> &error = response.error();
QString errorMessage; QString errorMessage;
if (error.has_value()) { if (error.has_value()) {

1
src/plugins/languageclient/languageclientsymbolsupport.h
View File

@@ -78,6 +78,7 @@ private:
Client *m_client = nullptr; Client *m_client = nullptr;
SymbolMapper m_defaultSymbolMapper; SymbolMapper m_defaultSymbolMapper;
QHash<Core::SearchResult *, LanguageServerProtocol::MessageId> m_renameRequestIds;
bool m_limitRenamingToProjects = false; bool m_limitRenamingToProjects = false;
}; };