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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Conflicts:
	src/plugins/python/pipsupport.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/examplesparser.cpp
	tests/auto/examples/tst_examples.cpp

Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
This commit is contained in:
Eike Ziller
2023-04-13 15:59:08 +02:00
parent b1415a0ea5 02f2a93503
commit 2bc37de42b
97 changed files with 550 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,8 +549,11 @@ void SymbolSupport::handleRenameResponse(Core::SearchResult *search,
const std::optional<PrepareRenameRequest::Response::Error> &error = response.error();
QString errorMessage;
if (error.has_value()) {
m_client->log(*error);
errorMessage = error->toString();
if (errorMessage.contains("Cannot rename symbol: new name is the same as the old name"))
errorMessage = Tr::tr("Start typing to see replacements"); // clangd optimization
else
m_client->log(*error);
}
const std::optional<WorkspaceEdit> &edits = response.result();