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

QmlJS.QtQuickToolBar: Using proper indenter

Browse Source 
Task-number: QTCREATORBUG-11334
Change-Id: I65b3f95bdc5a57971854fb8bce620a275f646ff5
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Thomas Hartmann
2014-03-03 16:03:35 +01:00
parent 92032b9615
commit 3ee64ed699
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/qmljseditor/quicktoolbar.cpp
View File

@@ -37,7 +37,7 @@
#include <qmljs/qmljsdocument.h>
#include <qmljs/qmljspropertyreader.h>
#include <qmljs/qmljsrewriter.h>
#include <qmljs/qmljsindenter.h>
#include <qmljstools/qmljsindenter.h>
#include <qmljs/qmljscontext.h>
#include <qmljs/qmljsbind.h>
#include <qmljs/qmljsscopebuilder.h>
@@ -327,24 +327,7 @@ void QuickToolBar::setProperty(const QString &propertyName, const QVariant &valu
m_editor->convertPosition(changeSetPos, &line, &column); //get line
m_editor->convertPosition(changeSetPos + changeSetLength, &endLine, &column); //get line
if (line > 0) {
TextEditor::TabSettings ts = m_editor->baseTextDocument()->tabSettings();
QmlJSIndenter indenter;
indenter.setTabSize(ts.m_tabSize);
indenter.setIndentSize(ts.m_indentSize);
for (int i=line;i<=endLine;i++) {
QTextBlock start = m_editor->baseTextDocument()->document()->findBlockByNumber(i);
QTextBlock end = m_editor->baseTextDocument()->document()->findBlockByNumber(i);
if (end.isValid()) {
const int indent = indenter.indentForBottomLine(m_editor->baseTextDocument()
->document()->begin(),
end.next(), QChar::Null);
ts.indentLine(start, indent);
}
}
}
indentLines(line, endLine);
tc.endEditBlock();
}
}
@@ -439,6 +422,21 @@ void QuickToolBar::onEnabledChanged(bool b)
settings.set();
}
void QuickToolBar::indentLines(int startLine, int endLine)
{
if (startLine > 0) {
TextEditor::TabSettings tabSettings = m_editor->baseTextDocument()->tabSettings();
for (int i = startLine; i <= endLine; i++) {
QTextBlock start = m_editor->editorWidget()->document()->findBlockByNumber(i);
if (start.isValid()) {
QmlJSEditor::Internal::Indenter indenterMy;
indenterMy.indentBlock(m_editor->editorWidget()->document(), start, QChar::Null, tabSettings);
}
}
}
}
ContextPaneWidget* QuickToolBar::contextWidget()
{
if (m_widget.isNull()) { //lazily recreate widget

2
src/plugins/qmljseditor/quicktoolbar.h
View File

@@ -62,6 +62,8 @@ public slots:
void onEnabledChanged(bool);
private:
void indentLines(int startLine, int endLine);
QmlEditorWidgets::ContextPaneWidget* contextWidget();
QPointer<QmlEditorWidgets::ContextPaneWidget> m_widget;
QmlJS::Document::Ptr m_doc;