diff options
Diffstat (limited to 'src/plugins/texteditor/codeassist')
4 files changed, 12 insertions, 6 deletions
diff --git a/src/plugins/texteditor/codeassist/assistproposalitem.cpp b/src/plugins/texteditor/codeassist/assistproposalitem.cpp index cf9cbe6e38..6542c1580a 100644 --- a/src/plugins/texteditor/codeassist/assistproposalitem.cpp +++ b/src/plugins/texteditor/codeassist/assistproposalitem.cpp @@ -25,8 +25,9 @@ #include "assistproposalitem.h" -#include <texteditor/texteditor.h> #include <texteditor/quickfix.h> +#include <texteditor/snippets/snippet.h> +#include <texteditor/texteditor.h> #include <QTextCursor> @@ -147,7 +148,7 @@ void AssistProposalItem::applyContextualContent(TextDocumentManipulatorInterface void AssistProposalItem::applySnippet(TextDocumentManipulatorInterface &manipulator, int basePosition) const { - manipulator.insertCodeSnippet(basePosition, data().toString()); + manipulator.insertCodeSnippet(basePosition, data().toString(), &Snippet::parse); } void AssistProposalItem::applyQuickFix(TextDocumentManipulatorInterface &manipulator, int basePosition) const diff --git a/src/plugins/texteditor/codeassist/textdocumentmanipulator.cpp b/src/plugins/texteditor/codeassist/textdocumentmanipulator.cpp index 0eee5793db..268d9494a0 100644 --- a/src/plugins/texteditor/codeassist/textdocumentmanipulator.cpp +++ b/src/plugins/texteditor/codeassist/textdocumentmanipulator.cpp @@ -85,11 +85,13 @@ bool TextDocumentManipulator::replace(int position, int length, const QString &t return textWillBeReplaced; } -void TextDocumentManipulator::insertCodeSnippet(int position, const QString &text) +void TextDocumentManipulator::insertCodeSnippet(int position, + const QString &text, + const SnippetParser &parse) { auto cursor = m_textEditorWidget->textCursor(); cursor.setPosition(position, QTextCursor::KeepAnchor); - m_textEditorWidget->insertCodeSnippet(cursor, text); + m_textEditorWidget->insertCodeSnippet(cursor, text, parse); } void TextDocumentManipulator::paste() diff --git a/src/plugins/texteditor/codeassist/textdocumentmanipulator.h b/src/plugins/texteditor/codeassist/textdocumentmanipulator.h index 46aa99f29d..23c7186d60 100644 --- a/src/plugins/texteditor/codeassist/textdocumentmanipulator.h +++ b/src/plugins/texteditor/codeassist/textdocumentmanipulator.h @@ -45,7 +45,7 @@ public: void setCursorPosition(int position) final; void setAutoCompleteSkipPosition(int position) final; bool replace(int position, int length, const QString &text) final; - void insertCodeSnippet(int position, const QString &text) final; + void insertCodeSnippet(int position, const QString &text, const SnippetParser &parse) final; void paste() final; void encourageApply() final; void autoIndent(int position, int length) override; diff --git a/src/plugins/texteditor/codeassist/textdocumentmanipulatorinterface.h b/src/plugins/texteditor/codeassist/textdocumentmanipulatorinterface.h index ae803260c7..88404713ef 100644 --- a/src/plugins/texteditor/codeassist/textdocumentmanipulatorinterface.h +++ b/src/plugins/texteditor/codeassist/textdocumentmanipulatorinterface.h @@ -25,6 +25,7 @@ #pragma once +#include <texteditor/snippets/snippetparser.h> #include <texteditor/texteditor_global.h> QT_BEGIN_NAMESPACE @@ -49,7 +50,9 @@ public: virtual void setCursorPosition(int position) = 0; virtual void setAutoCompleteSkipPosition(int position) = 0; virtual bool replace(int position, int length, const QString &text) = 0; - virtual void insertCodeSnippet(int position, const QString &text) = 0; + virtual void insertCodeSnippet(int position, + const QString &text, + const SnippetParser &parse) = 0; virtual void paste() = 0; virtual void encourageApply() = 0; virtual void autoIndent(int position, int length) = 0; |