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

QmlJS: Clean up idOfObject() and folding text code.

Browse Source 
Change-Id: Id3e9d24689c67ce0e12b12b82636177a0344ede1
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-10-24 09:28:02 +02:00
parent 2ec51f5b2c
commit c8fc9b33ae
4 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1695,27 +1695,15 @@ TextEditor::IAssistInterface *QmlJSTextEditorWidget::createAssistInterface(
QString QmlJSTextEditorWidget::foldReplacementText(const QTextBlock &block) const
{
int curlyIndex = block.text().indexOf(QLatin1Char('{'));
const int curlyIndex = block.text().indexOf(QLatin1Char('{'));
if ((curlyIndex == -1) || !m_semanticInfo.isValid())
return TextEditor::BaseTextEditorWidget::foldReplacementText(block);
if (curlyIndex != -1 && m_semanticInfo.isValid()) {
const int pos = block.position() + curlyIndex;
Node *node = m_semanticInfo.rangeAt(pos);
int pos = block.position() + curlyIndex;
Node *node = m_semanticInfo.rangeAt(pos);
if (node) {
UiObjectInitializer *objectInitializer = 0;
if (UiObjectDefinition *def = cast<UiObjectDefinition *>(node))
objectInitializer = def->initializer;
else if (UiObjectBinding *binding = cast<UiObjectBinding *>(node))
objectInitializer = binding->initializer;
// Get the id value, if it exists, and display it
if (objectInitializer) {
QString objectId = idOfObject(objectInitializer);
if (!objectId.isEmpty())
return QLatin1String("id: ") + objectId + QLatin1String("...");
}
const QString objectId = idOfObject(node);
if (!objectId.isEmpty())
return QLatin1String("id: ") + objectId + QLatin1String("...");
}
return TextEditor::BaseTextEditorWidget::foldReplacementText(block);