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

LSP: take account of resolveTarget when checking for links

Browse Source 
Return a link to the word under cursor when the target should not
get resolved. This results in a highlight of the text the mouse cursor
is positioned on when pressing ctrl to follow a link.

Change-Id: Iaf1ba289644ed3e3fc062b418dd2fa3bfa8da6ad
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-01-21 14:28:13 +01:00
parent 11eea3aae0
commit 73161356d5
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -384,8 +384,8 @@ void LanguageClientManager::editorOpened(Core::IEditor *editor)
if (TextEditorWidget *widget = textEditor->editorWidget()) { if (TextEditorWidget *widget = textEditor->editorWidget()) {
connect(widget, &TextEditorWidget::requestLinkAt, this, connect(widget, &TextEditorWidget::requestLinkAt, this,
[this, document = textEditor->textDocument()] [this, document = textEditor->textDocument()]
(const QTextCursor &cursor, Utils::ProcessLinkCallback &callback) { (const QTextCursor &cursor, Utils::ProcessLinkCallback &callback, bool resolveTarget) {
findLinkAt(document, cursor, callback); findLinkAt(document, cursor, callback, resolveTarget);
}); });
connect(widget, &TextEditorWidget::requestUsages, this, connect(widget, &TextEditorWidget::requestUsages, this,
[this, document = textEditor->textDocument()](const QTextCursor &cursor) { [this, document = textEditor->textDocument()](const QTextCursor &cursor) {
@@ -483,23 +483,35 @@ void LanguageClientManager::documentWillSave(Core::IDocument *document)
void LanguageClientManager::findLinkAt(TextEditor::TextDocument *document, void LanguageClientManager::findLinkAt(TextEditor::TextDocument *document,
const QTextCursor &cursor, const QTextCursor &cursor,
Utils::ProcessLinkCallback callback) Utils::ProcessLinkCallback callback,
bool resolveTarget)
{ {
const DocumentUri uri = DocumentUri::fromFilePath(document->filePath()); const DocumentUri uri = DocumentUri::fromFilePath(document->filePath());
const TextDocumentIdentifier documentId(uri); const TextDocumentIdentifier documentId(uri);
const Position pos(cursor); const Position pos(cursor);
TextDocumentPositionParams params(documentId, pos); TextDocumentPositionParams params(documentId, pos);
GotoDefinitionRequest request(params); GotoDefinitionRequest request(params);
request.setResponseCallback([callback](const GotoDefinitionRequest::Response &response){ request.setResponseCallback([callback, filePath = document->filePath(), cursor, resolveTarget]
(const GotoDefinitionRequest::Response &response) {
if (Utils::optional<GotoResult> _result = response.result()) { if (Utils::optional<GotoResult> _result = response.result()) {
const GotoResult result = _result.value(); const GotoResult result = _result.value();
if (Utils::holds_alternative<std::nullptr_t>(result)) if (Utils::holds_alternative<std::nullptr_t>(result))
return; return;
auto wordUnderCursor = [cursor, filePath]() {
QTextCursor linkCursor = cursor;
linkCursor.select(QTextCursor::WordUnderCursor);
Utils::Link link(filePath.toString(),
linkCursor.blockNumber() + 1,
linkCursor.positionInBlock());
link.linkTextStart = linkCursor.selectionStart();
link.linkTextEnd = linkCursor.selectionEnd();
return link;
};
if (auto ploc = Utils::get_if<Location>(&result)) { if (auto ploc = Utils::get_if<Location>(&result)) {
callback(ploc->toLink()); callback(resolveTarget ? ploc->toLink() : wordUnderCursor());
} else if (auto plloc = Utils::get_if<QList<Location>>(&result)) { } else if (auto plloc = Utils::get_if<QList<Location>>(&result)) {
if (!plloc->isEmpty()) if (!plloc->isEmpty())
callback(plloc->value(0).toLink()); callback(resolveTarget ? plloc->value(0).toLink() : wordUnderCursor());
} }
} }
}); });

2
src/plugins/languageclient/languageclientmanager.h
View File

@@ -97,7 +97,7 @@ private:
void documentContentsSaved(Core::IDocument *document); void documentContentsSaved(Core::IDocument *document);
void documentWillSave(Core::IDocument *document); void documentWillSave(Core::IDocument *document);
void findLinkAt(TextEditor::TextDocument *document, const QTextCursor &cursor, void findLinkAt(TextEditor::TextDocument *document, const QTextCursor &cursor,
Utils::ProcessLinkCallback callback); Utils::ProcessLinkCallback callback, const bool resolveTarget);
void findUsages(TextEditor::TextDocument *document, const QTextCursor &cursor); void findUsages(TextEditor::TextDocument *document, const QTextCursor &cursor);
void projectAdded(ProjectExplorer::Project *project); void projectAdded(ProjectExplorer::Project *project);