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

LanguageClient: Inform user of failed prepareRename request

Browse Source 
Also instantiate the search result window if we get an error and use it
to display errors.

Change-Id: I49dcdcc5ad2ace64391f8d2d849995b046032957
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2022-09-30 07:34:53 +02:00
parent 9e27ea3bb3
commit 4f9a5ea896
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,20 +284,22 @@ bool SymbolSupport::supportsRename(TextEditor::TextDocument *document)
void SymbolSupport::renameSymbol(TextEditor::TextDocument *document, const QTextCursor &cursor)
{
bool prepareSupported;
if (!LanguageClient::supportsRename(m_client, document, prepareSupported))
return;
const TextDocumentPositionParams params = generateDocPosParams(document, cursor);
QTextCursor tc = cursor;
tc.select(QTextCursor::WordUnderCursor);
const QString oldSymbolName = tc.selectedText();
const QString placeHolder = m_defaultSymbolMapper ? m_defaultSymbolMapper(oldSymbolName)
const QString placeholder = m_defaultSymbolMapper ? m_defaultSymbolMapper(oldSymbolName)
: oldSymbolName;
if (prepareSupported)
requestPrepareRename(generateDocPosParams(document, cursor), placeHolder);
else
startRenameSymbol(generateDocPosParams(document, cursor), placeHolder);
bool prepareSupported;
if (!LanguageClient::supportsRename(m_client, document, prepareSupported)) {
const QString error = tr("Renaming is not supported with %1").arg(m_client->name());
createSearch(params, placeholder)->finishSearch(true, error);
} else if (prepareSupported) {
requestPrepareRename(generateDocPosParams(document, cursor), placeholder);
} else {
startRenameSymbol(generateDocPosParams(document, cursor), placeholder);
}
}
void SymbolSupport::requestPrepareRename(const TextDocumentPositionParams &params,
@@ -307,8 +309,10 @@ void SymbolSupport::requestPrepareRename(const TextDocumentPositionParams &param
request.setResponseCallback([this, params, placeholder](
const PrepareRenameRequest::Response &response) {
const std::optional<PrepareRenameRequest::Response::Error> &error = response.error();
if (error.has_value())
if (error.has_value()) {
m_client->log(*error);
createSearch(params, placeholder)->finishSearch(true, error->toString());
}
const std::optional<PrepareRenameResult> &result = response.result();
if (result.has_value()) {
@@ -361,8 +365,8 @@ QList<Core::SearchResultItem> generateReplaceItems(const WorkspaceEdit &edits)
return generateSearchResultItems(rangesInDocument);
}
void SymbolSupport::startRenameSymbol(const TextDocumentPositionParams &positionParams,
const QString &placeholder)
Core::SearchResult *SymbolSupport::createSearch(const TextDocumentPositionParams &positionParams,
const QString &placeholder)
{
Core::SearchResult *search = Core::SearchResultWindow::instance()->startNewSearch(
tr("Find References with %1 for:").arg(m_client->name()),
@@ -394,7 +398,13 @@ void SymbolSupport::startRenameSymbol(const TextDocumentPositionParams &position
applyRename(checkedItems);
});
requestRename(positionParams, placeholder, search);
return search;
}
void SymbolSupport::startRenameSymbol(const TextDocumentPositionParams &positionParams,
const QString &placeholder)
{
requestRename(positionParams, placeholder, createSearch(positionParams, placeholder));
}
void SymbolSupport::handleRenameResponse(Core::SearchResult *search,

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

@@ -60,6 +60,9 @@ private:
const QString &placeholder);
void requestRename(const LanguageServerProtocol::TextDocumentPositionParams &positionParams,
const QString &newName, Core::SearchResult *search);
Core::SearchResult *createSearch(
const LanguageServerProtocol::TextDocumentPositionParams &positionParams,
const QString &placeholder);
void startRenameSymbol(const LanguageServerProtocol::TextDocumentPositionParams &params,
const QString &placeholder);
void handleRenameResponse(Core::SearchResult *search,