summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2016-10-19 13:49:35 +0200
committerTim Jenssen <tim.jenssen@qt.io>2016-10-21 15:08:41 +0000
commit81bdb9cdf9b6acdf13e9c44b3d6cf50207fd6370 (patch)
tree36dd72034061a93b12d6a4ac640844eed1aa9ea0
parent9844cd242e1e517d02876fbbcc622775f3cb4bd4 (diff)
downloadqt-creator-81bdb9cdf9b6acdf13e9c44b3d6cf50207fd6370.tar.gz
QmlDesigner: add getLineInDocument() for convenience
Change-Id: I34f788e320fe4c38e3dbb55ba6d0bc1b8d9ba59a Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
-rw-r--r--src/plugins/qmldesigner/designercore/include/textmodifier.h1
-rw-r--r--src/plugins/qmldesigner/designercore/model/textmodifier.cpp9
2 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h
index 98a9d671a7..c5d494e0e5 100644
--- a/src/plugins/qmldesigner/designercore/include/textmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/textmodifier.h
@@ -74,6 +74,7 @@ public:
virtual QTextDocument *textDocument() const = 0;
virtual QString text() const = 0;
virtual QTextCursor textCursor() const = 0;
+ static int getLineInDocument(QTextDocument* document, int offset);
virtual void deactivateChangeSignals() = 0;
virtual void reactivateChangeSignals() = 0;
diff --git a/src/plugins/qmldesigner/designercore/model/textmodifier.cpp b/src/plugins/qmldesigner/designercore/model/textmodifier.cpp
index 3434b21497..8b5ea35ff1 100644
--- a/src/plugins/qmldesigner/designercore/model/textmodifier.cpp
+++ b/src/plugins/qmldesigner/designercore/model/textmodifier.cpp
@@ -26,6 +26,7 @@
#include "textmodifier.h"
#include <qmljs/qmljsmodelmanagerinterface.h>
+#include <texteditor/convenience.h>
using namespace QmlDesigner;
@@ -33,6 +34,14 @@ TextModifier::~TextModifier()
{
}
+int TextModifier::getLineInDocument(QTextDocument *document, int offset)
+{
+ int line = -1;
+ int column = -1;
+ TextEditor::Convenience::convertPosition(document, offset, &line, &column);
+ return line;
+}
+
QmlJS::Snapshot TextModifier::qmljsSnapshot()
{
QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();