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

LanguageClient: add snippet parsing

Browse Source 
Task-number: QTCREATORBUG-22406
Change-Id: I5b3a65984f1b4a9198bcbfec24aaa920dcb6dbf1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-05-11 13:37:52 +02:00
parent a80546593d
commit d729835c24
10 changed files with 359 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/languageclient/languageclientcompletionassist.cpp
View File

@@ -27,6 +27,7 @@
#include "client.h"
#include "languageclientutils.h"
#include "snippet.h"
#include <languageserverprotocol/completion.h>
#include <texteditor/codeassist/assistinterface.h>
@@ -108,7 +109,7 @@ void LanguageClientCompletionItem::apply(TextDocumentManipulatorInterface &manip
{
const int pos = manipulator.currentPosition();
if (auto edit = m_item.textEdit()) {
applyTextEdit(manipulator, *edit);
applyTextEdit(manipulator, *edit, isSnippet());
} else {
const QString textToInsert(m_item.insertText().value_or(text()));
int length = 0;
@@ -126,7 +127,12 @@ void LanguageClientCompletionItem::apply(TextDocumentManipulatorInterface &manip
QRegularExpressionMatch match = identifier.match(blockTextUntilPosition);
int matchLength = match.hasMatch() ? match.capturedLength(0) : 0;
length = qMax(length, matchLength);
manipulator.replace(pos - length, length, textToInsert);
if (isSnippet()) {
manipulator.replace(pos - length, length, {});
manipulator.insertCodeSnippet(pos - length, textToInsert, &parseSnippet);
} else {
manipulator.replace(pos - length, length, textToInsert);
}
}
if (auto additionalEdits = m_item.additionalTextEdits()) {
@@ -182,9 +188,7 @@ QString LanguageClientCompletionItem::detail() const
bool LanguageClientCompletionItem::isSnippet() const
{
// FIXME add lsp > creator snippet converter
// return m_item.insertTextFormat().value_or(CompletionItem::PlainText);
return false;
return m_item.insertTextFormat().value_or(CompletionItem::PlainText);
}
bool LanguageClientCompletionItem::isValid() const
@@ -226,6 +230,8 @@ bool LanguageClientCompletionItem::isPerfectMatch(int pos, QTextDocument *doc) c
if (!additionalEdits.value().isEmpty())
return false;
}
if (isSnippet())
return false;
if (auto edit = m_item.textEdit()) {
auto range = edit->range();
const int start = positionInText(doc, range.start().line() + 1, range.start().character() + 1);