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

QmlJSEditor: Fix auto-indentation

Browse Source 
Broke with 3ad3876611

Change-Id: Id67e574b11e92d83124081f05262110033c8504e
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Eike Ziller
2014-01-23 16:21:05 +01:00
parent 782e0d37c3
commit ae5ef38e3c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -48,7 +48,6 @@
#include <qmljs/qmljsutils.h> #include <qmljs/qmljsutils.h>
#include <qmljstools/qmljstoolsconstants.h> #include <qmljstools/qmljstoolsconstants.h>
#include <qmljstools/qmljsindenter.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>

4
src/plugins/qmljseditor/qmljseditordocument.cpp
View File

@@ -32,8 +32,9 @@
#include "qmljseditordocument_p.h" #include "qmljseditordocument_p.h"
#include "qmljshighlighter.h" #include "qmljshighlighter.h"
#include <qmljstools/qmljsqtstylecodeformatter.h> #include <qmljstools/qmljsindenter.h>
#include <qmljstools/qmljsmodelmanager.h> #include <qmljstools/qmljsmodelmanager.h>
#include <qmljstools/qmljsqtstylecodeformatter.h>
using namespace QmlJSEditor; using namespace QmlJSEditor;
using namespace QmlJSEditor::Internal; using namespace QmlJSEditor::Internal;
@@ -74,6 +75,7 @@ QmlJSEditorDocument::QmlJSEditorDocument()
connect(this, SIGNAL(tabSettingsChanged()), connect(this, SIGNAL(tabSettingsChanged()),
m_d, SLOT(invalidateFormatterCache())); m_d, SLOT(invalidateFormatterCache()));
setSyntaxHighlighter(new Highlighter(document())); setSyntaxHighlighter(new Highlighter(document()));
setIndenter(new Indenter);
} }
QmlJSEditorDocument::~QmlJSEditorDocument() QmlJSEditorDocument::~QmlJSEditorDocument()