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

Designer: Update C++ code model on an object name change in designer

Browse Source 
We try to locate the old symbol name in the generated ui header and
rename the symbol in the background.

Task-number: QTCREATORBUG-1179
Change-Id: Iaf68e3922cd728cbc87d0dc97125e34b8bdaa6be
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2023-01-16 17:03:26 +01:00
parent b4b2600715
commit 0d909c353c
36 changed files with 470 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,7 +295,8 @@ void SymbolSupport::handleFindReferencesResponse(const FindReferencesRequest::Re
Core::EditorManager::openEditorAtSearchResult(item);
});
search->finishSearch(false);
search->popup();
if (search->isInteractive())
search->popup();
}
}
@@ -365,6 +366,7 @@ bool SymbolSupport::supportsRename(TextEditor::TextDocument *document)
void SymbolSupport::renameSymbol(TextEditor::TextDocument *document,
const QTextCursor &cursor,
const QString &newSymbolName,
const std::function<void ()> &callback,
bool preferLowerCaseFileNames)
{
const TextDocumentPositionParams params = generateDocPosParams(document, cursor, m_client);
@@ -376,17 +378,19 @@ void SymbolSupport::renameSymbol(TextEditor::TextDocument *document,
if (!LanguageClient::supportsRename(m_client, document, prepareSupported)) {
const QString error = Tr::tr("Renaming is not supported with %1").arg(m_client->name());
createSearch(params, derivePlaceholder(oldSymbolName, newSymbolName),
{}, {})->finishSearch(true, error);
{}, callback, {})->finishSearch(true, error);
} else if (prepareSupported) {
requestPrepareRename(document,
generateDocPosParams(document, cursor, m_client),
newSymbolName,
oldSymbolName,
callback,
preferLowerCaseFileNames);
} else {
startRenameSymbol(generateDocPosParams(document, cursor, m_client),
newSymbolName,
oldSymbolName,
callback,
preferLowerCaseFileNames);
}
}
@@ -395,6 +399,7 @@ void SymbolSupport::requestPrepareRename(TextEditor::TextDocument *document,
const TextDocumentPositionParams &params,
const QString &placeholder,
const QString &oldSymbolName,
const std::function<void()> &callback,
bool preferLowerCaseFileNames)
{
PrepareRenameRequest request(params);
@@ -402,13 +407,15 @@ void SymbolSupport::requestPrepareRename(TextEditor::TextDocument *document,
params,
placeholder,
oldSymbolName,
callback,
preferLowerCaseFileNames,
document = QPointer<TextEditor::TextDocument>(document)](
const PrepareRenameRequest::Response &response) {
const std::optional<PrepareRenameRequest::Response::Error> &error = response.error();
if (error.has_value()) {
m_client->log(*error);
createSearch(params, placeholder, {}, {})->finishSearch(true, error->toString());
createSearch(params, placeholder, {}, callback, {})
->finishSearch(true, error->toString());
}
const std::optional<PrepareRenameResult> &result = response.result();
@@ -419,6 +426,7 @@ void SymbolSupport::requestPrepareRename(TextEditor::TextDocument *document,
placeholder.isEmpty() ? placeHolderResult.placeHolder()
: placeholder,
oldSymbolName,
callback,
preferLowerCaseFileNames);
} else if (std::holds_alternative<Range>(*result)) {
auto range = std::get<Range>(*result);
@@ -429,9 +437,11 @@ void SymbolSupport::requestPrepareRename(TextEditor::TextDocument *document,
startRenameSymbol(params,
derivePlaceholder(reportedSymbolName, placeholder),
reportedSymbolName,
callback,
preferLowerCaseFileNames);
} else {
startRenameSymbol(params, placeholder, oldSymbolName, preferLowerCaseFileNames);
startRenameSymbol(params, placeholder, oldSymbolName, callback,
preferLowerCaseFileNames);
}
}
}
@@ -449,7 +459,8 @@ void SymbolSupport::requestRename(const TextDocumentPositionParams &positionPara
handleRenameResponse(search, response);
});
m_client->sendMessage(request);
search->popup();
if (search->isInteractive())
search->popup();
}
QList<Core::SearchResultItem> generateReplaceItems(const WorkspaceEdit &edits,
@@ -480,6 +491,7 @@ QList<Core::SearchResultItem> generateReplaceItems(const WorkspaceEdit &edits,
Core::SearchResult *SymbolSupport::createSearch(const TextDocumentPositionParams &positionParams,
const QString &placeholder,
const QString &oldSymbolName,
const std::function<void()> &callback,
bool preferLowerCaseFileNames)
{
Core::SearchResult *search = Core::SearchResultWindow::instance()->startNewSearch(
@@ -491,6 +503,8 @@ Core::SearchResult *SymbolSupport::createSearch(const TextDocumentPositionParams
const auto extraWidget = new ReplaceWidget;
search->setAdditionalReplaceWidget(extraWidget);
search->setTextToReplace(placeholder);
if (callback)
search->makeNonInteractive(callback);
connect(search, &Core::SearchResult::activated, [](const Core::SearchResultItem &item) {
Core::EditorManager::openEditorAtSearchResult(item);
@@ -521,10 +535,12 @@ Core::SearchResult *SymbolSupport::createSearch(const TextDocumentPositionParams
void SymbolSupport::startRenameSymbol(const TextDocumentPositionParams &positionParams,
const QString &placeholder,
const QString &oldSymbolName,
const std::function<void()> &callback,
bool preferLowerCaseFileNames)
{
requestRename(positionParams,
createSearch(positionParams, placeholder, oldSymbolName, preferLowerCaseFileNames));
createSearch(positionParams, placeholder, oldSymbolName, callback,
preferLowerCaseFileNames));
}
void SymbolSupport::handleRenameResponse(Core::SearchResult *search,

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

@@ -42,7 +42,9 @@ public:
bool supportsRename(TextEditor::TextDocument *document);
void renameSymbol(TextEditor::TextDocument *document, const QTextCursor &cursor,
const QString &newSymbolName = {}, bool preferLowerCaseFileNames = true);
const QString &newSymbolName = {},
const std::function<void()> &callback = {},
bool preferLowerCaseFileNames = true);
static Core::Search::TextRange convertRange(const LanguageServerProtocol::Range &range);
static QStringList getFileContents(const Utils::FilePath &filePath);
@@ -61,16 +63,17 @@ private:
void requestPrepareRename(TextEditor::TextDocument *document,
const LanguageServerProtocol::TextDocumentPositionParams &params,
const QString &placeholder,
const QString &oldSymbolName,
const QString &oldSymbolName, const std::function<void()> &callback,
bool preferLowerCaseFileNames);
void requestRename(const LanguageServerProtocol::TextDocumentPositionParams &positionParams,
Core::SearchResult *search);
Core::SearchResult *createSearch(const LanguageServerProtocol::TextDocumentPositionParams &positionParams,
const QString &placeholder, const QString &oldSymbolName,
const std::function<void()> &callback,
bool preferLowerCaseFileNames);
void startRenameSymbol(const LanguageServerProtocol::TextDocumentPositionParams &params,
const QString &placeholder, const QString &oldSymbolName,
bool preferLowerCaseFileNames);
const std::function<void()> &callback, bool preferLowerCaseFileNames);
void handleRenameResponse(Core::SearchResult *search,
const LanguageServerProtocol::RenameRequest::Response &response);
void applyRename(const QList<Core::SearchResultItem> &checkedItems, Core::SearchResult *search);