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

LanguageClient: Improve refactoring markers

Browse Source 
Clicking the lightbulb should bring up a menu if and only if there is
more than one possible action for this location.
Amends 089e1edcbf.

Change-Id: I45348ed4fbf9b3f32e19bbe17f0c2c030ecd24ed
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2022-05-17 12:34:00 +02:00
parent 54d4c4db62
commit 5d615e916f
4 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/plugins/languageclient/languageclientutils.cpp
View File

@@ -149,7 +149,7 @@ QTextCursor endOfLineCursor(const QTextCursor &cursor)
}
void updateCodeActionRefactoringMarker(Client *client,
const CodeAction &action,
const QList<CodeAction> &actions,
const DocumentUri &uri)
{
TextDocument* doc = TextDocument::textDocumentForFilePath(uri.toFilePath());
@@ -159,46 +159,59 @@ void updateCodeActionRefactoringMarker(Client *client,
if (editors.isEmpty())
return;
const QList<Diagnostic> &diagnostics = action.diagnostics().value_or(QList<Diagnostic>());
QHash<int, RefactorMarker> markersAtBlock;
RefactorMarker marker;
marker.type = client->id();
marker.tooltip = LanguageClientManager::tr("Show available quick fixes");
auto addMarkerForCursor = [&](const QTextCursor &cursor) {
if (!markersAtBlock.contains(cursor.blockNumber())) {
marker.cursor = cursor;
marker.callback = [=](TextEditorWidget *editor) {
const auto addMarkerForCursor = [&](const CodeAction &action, const Range &range) {
const QTextCursor cursor = endOfLineCursor(range.start().toTextCursor(doc->document()));
const auto it = markersAtBlock.find(cursor.blockNumber());
if (it != markersAtBlock.end()) {
it->tooltip = LanguageClientManager::tr("Show available quick fixes");
it->callback = [cursor](TextEditorWidget *editor) {
editor->setTextCursor(cursor);
editor->invokeAssist(TextEditor::QuickFix);
};
markersAtBlock[cursor.blockNumber()] = marker;
return;
}
RefactorMarker marker;
marker.type = client->id();
marker.cursor = cursor;
if (action.isValid())
marker.tooltip = action.title();
if (action.edit()) {
marker.callback = [client, edit = action.edit()](const TextEditorWidget *) {
applyWorkspaceEdit(client, *edit);
};
} else if (action.command()) {
marker.callback = [command = action.command(),
client = QPointer(client)](const TextEditorWidget *) {
if (client)
client->executeCommand(*command);
};
}
markersAtBlock[cursor.blockNumber()] = marker;
};
if (Utils::optional<WorkspaceEdit> edit = action.edit()) {
if (diagnostics.isEmpty()) {
QList<TextEdit> edits;
if (optional<QList<TextDocumentEdit>> documentChanges = edit->documentChanges()) {
QList<TextDocumentEdit> changesForUri = Utils::filtered(
*documentChanges, [uri](const TextDocumentEdit &edit) {
return edit.textDocument().uri() == uri;
});
for (const TextDocumentEdit &edit : changesForUri)
edits << edit.edits();
} else if (optional<WorkspaceEdit::Changes> localChanges = edit->changes()) {
edits = (*localChanges)[uri];
}
for (const TextEdit &edit : qAsConst(edits)) {
addMarkerForCursor(
endOfLineCursor(edit.range().start().toTextCursor(doc->document())));
for (const CodeAction &action : actions) {
const QList<Diagnostic> &diagnostics = action.diagnostics().value_or(QList<Diagnostic>());
if (Utils::optional<WorkspaceEdit> edit = action.edit()) {
if (diagnostics.isEmpty()) {
QList<TextEdit> edits;
if (optional<QList<TextDocumentEdit>> documentChanges = edit->documentChanges()) {
QList<TextDocumentEdit> changesForUri = Utils::filtered(
*documentChanges, [uri](const TextDocumentEdit &edit) {
return edit.textDocument().uri() == uri;
});
for (const TextDocumentEdit &edit : changesForUri)
edits << edit.edits();
} else if (optional<WorkspaceEdit::Changes> localChanges = edit->changes()) {
edits = (*localChanges)[uri];
}
for (const TextEdit &edit : qAsConst(edits))
addMarkerForCursor(action, edit.range());
}
}
for (const Diagnostic &diagnostic : diagnostics)
addMarkerForCursor(action, diagnostic.range());
}
for (const Diagnostic &diagnostic : diagnostics)
addMarkerForCursor(
endOfLineCursor(diagnostic.range().start().toTextCursor(doc->document())));
const RefactorMarkers markers = markersAtBlock.values();
for (BaseTextEditor *editor : editors) {
if (TextEditorWidget *editorWidget = editor->editorWidget())