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

TextEditor: Simplify SnippetProvider handling

Browse Source 
The group identifier is as good as the actual object, so use that
on the generator and the consumer side.

Change-Id: I6ccd54a2362631af0b50583f12563b8e41a5dd78
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2018-02-06 15:59:05 +01:00
parent 0c3aed2549
commit 91c19c2734
13 changed files with 28 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
View File

@@ -27,10 +27,11 @@
#include "qmljscodestylesettingspage.h"
#include "qmljstoolsconstants.h"
#include "qmljsindenter.h"
#include <texteditor/simplecodestylepreferences.h>
#include <texteditor/snippets/snippetprovider.h>
#include <extensionsystem/pluginmanager.h>
#include <qmljseditor/qmljseditorconstants.h>
#include <QLayout>
using namespace QmlJSTools;
@@ -86,10 +87,9 @@ TextEditor::Indenter *QmlJSCodeStylePreferencesFactory::createIndenter() const
return new QmlJSEditor::Internal::Indenter();
}
TextEditor::SnippetProvider *QmlJSCodeStylePreferencesFactory::snippetProvider() const
QString QmlJSCodeStylePreferencesFactory::snippetProviderGroupId() const
{
return TextEditor::SnippetProvider::snippetProviderForGroupId
(QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID);
return QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID;
}
QString QmlJSCodeStylePreferencesFactory::previewText() const

2
src/plugins/qmljstools/qmljscodestylepreferencesfactory.h
View File

@@ -40,7 +40,7 @@ public:
QWidget *createEditor(TextEditor::ICodeStylePreferences *settings,
QWidget *parent) const;
TextEditor::Indenter *createIndenter() const;
TextEditor::SnippetProvider *snippetProvider() const;
QString snippetProviderGroupId() const;
QString previewText() const;
};

7
src/plugins/qmljstools/qmljscodestylesettingspage.cpp
View File

@@ -82,12 +82,9 @@ void QmlJSCodeStylePreferencesWidget::setPreferences(ICodeStylePreferences *pref
void QmlJSCodeStylePreferencesWidget::decorateEditor(const FontSettings &fontSettings)
{
const SnippetProvider *provider =
SnippetProvider::snippetProviderForGroupId(QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID);
m_ui->previewTextEdit->textDocument()->setFontSettings(fontSettings);
if (provider)
provider->decorateEditor(m_ui->previewTextEdit);
SnippetProvider::decorateEditor(m_ui->previewTextEdit,
QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID);
}
void QmlJSCodeStylePreferencesWidget::setVisualizeWhitespace(bool on)