From 6f7aa1f962059c5d056abfbc34d226e092990251 Mon Sep 17 00:00:00 2001
From: Marco Benelli <marco.benelli@qt.io>
Date: Tue, 12 Sep 2017 17:23:49 +0200
Subject: [PATCH] QmlJS: user defined style in reformatting file

The size of tabs and indentation used to be ignored when reformatting
a file.

Task-number: QTCREATORBUG-12849
Change-Id: I0b522b526a199c6397b78b5e193159ec52fc941a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/libs/qmljs/qmljsreformatter.cpp           | 11 +++++++++++
 src/libs/qmljs/qmljsreformatter.h             |  1 +
 src/plugins/qmljseditor/qmljseditorplugin.cpp |  7 +++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index e9d139dd2ba..a3d8481d582 100644
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/src/libs/qmljs/qmljsreformatter.cpp
@@ -102,6 +102,9 @@ public:
     {
     }
 
+    void setIndentSize(int size) { _formatter.setIndentSize(size); }
+    void setTabSize(int size) { _formatter.setTabSize(size); }
+
     QString operator()(Node *node)
     {
         Q_ASSERT(node == _doc->ast()); // comment handling fails otherwise
@@ -1309,3 +1312,11 @@ QString QmlJS::reformat(const Document::Ptr &doc)
     Rewriter rewriter(doc);
     return rewriter(doc->ast());
 }
+
+QString QmlJS::reformat(const Document::Ptr &doc, int indentSize, int tabSize)
+{
+    Rewriter rewriter(doc);
+    rewriter.setIndentSize(indentSize);
+    rewriter.setTabSize(tabSize);
+    return rewriter(doc->ast());
+}
diff --git a/src/libs/qmljs/qmljsreformatter.h b/src/libs/qmljs/qmljsreformatter.h
index 18d5c6fd85c..7465a1a17f0 100644
--- a/src/libs/qmljs/qmljsreformatter.h
+++ b/src/libs/qmljs/qmljsreformatter.h
@@ -31,4 +31,5 @@
 
 namespace QmlJS {
 QMLJS_EXPORT QString reformat(const Document::Ptr &doc);
+QMLJS_EXPORT QString reformat(const Document::Ptr &doc, int indentSize, int tabSize);
 }
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 3b9a50866f5..34f2fa818a1 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -54,6 +54,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <texteditor/snippets/snippetprovider.h>
 #include <texteditor/texteditorconstants.h>
+#include <texteditor/tabsettings.h>
 #include <utils/qtcassert.h>
 #include <utils/json.h>
 
@@ -258,8 +259,10 @@ void QmlJSEditorPlugin::reformatFile()
 
         if (!document->isParsedCorrectly())
             return;
-
-        const QString &newText = QmlJS::reformat(document);
+        TextEditor::TabSettings tabSettings = m_currentDocument->tabSettings();
+        const QString &newText = QmlJS::reformat(document,
+                                                 tabSettings.m_indentSize,
+                                                 tabSettings.m_tabSize);
         QmlJSEditorWidget *widget = EditorManager::currentEditor()
                 ? qobject_cast<QmlJSEditorWidget*>(EditorManager::currentEditor()->widget())
                 : nullptr;