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

LanguageClient: run quick fix assist on lightbulb click

Browse Source 
This will bring up a list of all possible quickfixes instead of just the
last one.

Task-number: QTCREATORBUG-27514
Change-Id: I9066c701f9aab404d26075803b4f62f71078016b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2022-05-13 08:33:15 +02:00
parent 4f29bd5613
commit 089e1edcbf
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,15 +161,23 @@ void updateCodeActionRefactoringMarker(Client *client,
const QList<Diagnostic> &diagnostics = action.diagnostics().value_or(QList<Diagnostic>()); const QList<Diagnostic> &diagnostics = action.diagnostics().value_or(QList<Diagnostic>());
RefactorMarkers markers; QHash<int, RefactorMarker> markersAtBlock;
RefactorMarker marker; RefactorMarker marker;
marker.type = client->id(); marker.type = client->id();
if (action.isValid()) marker.tooltip = LanguageClientManager::tr("Show available quick fixes");
marker.tooltip = action.title();
auto addMarkerForCursor = [&](const QTextCursor &cursor) {
if (!markersAtBlock.contains(cursor.blockNumber())) {
marker.cursor = cursor;
marker.callback = [=](TextEditorWidget *editor) {
editor->setTextCursor(cursor);
editor->invokeAssist(TextEditor::QuickFix);
};
markersAtBlock[cursor.blockNumber()] = marker;
}
};
if (Utils::optional<WorkspaceEdit> edit = action.edit()) { if (Utils::optional<WorkspaceEdit> edit = action.edit()) {
marker.callback = [client, edit](const TextEditorWidget *) {
applyWorkspaceEdit(client, *edit);
};
if (diagnostics.isEmpty()) { if (diagnostics.isEmpty()) {
QList<TextEdit> edits; QList<TextEdit> edits;
if (optional<QList<TextDocumentEdit>> documentChanges = edit->documentChanges()) { if (optional<QList<TextDocumentEdit>> documentChanges = edit->documentChanges()) {
@@ -183,23 +191,15 @@ void updateCodeActionRefactoringMarker(Client *client,
edits = (*localChanges)[uri]; edits = (*localChanges)[uri];
} }
for (const TextEdit &edit : qAsConst(edits)) { for (const TextEdit &edit : qAsConst(edits)) {
marker.cursor = endOfLineCursor(edit.range().start().toTextCursor(doc->document())); addMarkerForCursor(
markers << marker; endOfLineCursor(edit.range().start().toTextCursor(doc->document())));
} }
} }
} else if (action.command().has_value()) {
const Command command = action.command().value();
marker.callback = [command, client = QPointer<Client>(client)](const TextEditorWidget *) {
if (client)
client->executeCommand(command);
};
} else {
return;
}
for (const Diagnostic &diagnostic : diagnostics) {
marker.cursor = endOfLineCursor(diagnostic.range().start().toTextCursor(doc->document()));
markers << marker;
} }
for (const Diagnostic &diagnostic : diagnostics)
addMarkerForCursor(
endOfLineCursor(diagnostic.range().start().toTextCursor(doc->document())));
const RefactorMarkers markers = markersAtBlock.values();
for (BaseTextEditor *editor : editors) { for (BaseTextEditor *editor : editors) {
if (TextEditorWidget *editorWidget = editor->editorWidget()) if (TextEditorWidget *editorWidget = editor->editorWidget())
editorWidget->setRefactorMarkers(markers + editorWidget->refactorMarkers()); editorWidget->setRefactorMarkers(markers + editorWidget->refactorMarkers());