From 6b504c61cadcddcc17cc29ebd61ddb23ac9fc868 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Tue, 22 Sep 2009 17:43:05 +0200
Subject: [PATCH] Changed navigation back for now.
---
src/plugins/duieditor/duieditor.cpp | 50 ++++++++++++++---------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/plugins/duieditor/duieditor.cpp b/src/plugins/duieditor/duieditor.cpp
index a2e12b86716..088d323cddc 100644
--- a/src/plugins/duieditor/duieditor.cpp
+++ b/src/plugins/duieditor/duieditor.cpp
@@ -716,35 +716,35 @@ TextEditor::BaseTextEditor::Link ScriptEditor::findLinkAt(const QTextCursor &cur
if (!doc)
return link;
-// NavigationTokenFinder finder;
-// finder(doc, cursor.position(), snapshot);
-// if (finder.targetFound()) {
-// link.fileName = finder.fileName();
-// link.pos = finder.linkPosition();
-// link.length = finder.linkLength();
+ NavigationTokenFinder finder;
+ finder(doc, cursor.position(), snapshot);
+ if (finder.targetFound()) {
+ link.fileName = finder.fileName();
+ link.pos = finder.linkPosition();
+ link.length = finder.linkLength();
+
+ if (resolveTarget) {
+ link.line = finder.targetLine();
+ link.column = finder.targetColumn() - 1;
+ }
+ }
+
+// QmlExpressionUnderCursor expressionUnderCursor;
+// expressionUnderCursor(cursor, doc->program());
//
-// if (resolveTarget) {
-// link.line = finder.targetLine();
-// link.column = finder.targetColumn() - 1;
+// QmlLookupContext context(expressionUnderCursor.expressionScopes(),
+// expressionUnderCursor.expressionNode(),
+// doc, snapshot);
+//
+// ResolveQmlExpression resolve(context);
+// if (QmlLookupContext::Symbol *symbol = resolve(expressionUnderCursor.expressionNode())) {
+// if (UiObjectMember *member = static_cast<UiObjectMember *>(symbol)) { // ### FIXME: don't use static_cast<>
+// const int begin = member->firstSourceLocation().begin();
+// const int end = member->lastSourceLocation().end();
+// qDebug() << doc->source().mid(begin, end - begin);
// }
// }
- QmlExpressionUnderCursor expressionUnderCursor;
- expressionUnderCursor(cursor, doc->program());
-
- QmlLookupContext context(expressionUnderCursor.expressionScopes(),
- expressionUnderCursor.expressionNode(),
- doc, snapshot);
-
- ResolveQmlExpression resolve(context);
- if (QmlLookupContext::Symbol *symbol = resolve(expressionUnderCursor.expressionNode())) {
- if (UiObjectMember *member = static_cast<UiObjectMember *>(symbol)) { // ### FIXME: don't use static_cast<>
- const int begin = member->firstSourceLocation().begin();
- const int end = member->lastSourceLocation().end();
- qDebug() << doc->source().mid(begin, end - begin);
- }
- }
-
return link;
}
--
GitLab