forked from qt-creator/qt-creator
Added a bit more completion for the DUI editor.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
|
||||
#include "duicompletionvisitor.h"
|
||||
#include "duicodecompletion.h"
|
||||
#include "duieditor.h"
|
||||
#include <texteditor/basetexteditor.h>
|
||||
@@ -61,6 +61,21 @@ int DuiCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
|
||||
m_completions.append(item);
|
||||
}
|
||||
|
||||
DuiDocument::Ptr duiDocument = edit->duiDocument();
|
||||
if (!duiDocument.isNull()) {
|
||||
QmlJS::AST::UiProgram *program = duiDocument->program();
|
||||
|
||||
if (program) {
|
||||
DuiCompletionVisitor visitor;
|
||||
|
||||
foreach (const QString &word, visitor(program, m_startPosition)) {
|
||||
TextEditor::CompletionItem item(this);
|
||||
item.m_text = word;
|
||||
m_completions.append(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return pos;
|
||||
}
|
||||
|
||||
|
||||
@@ -106,6 +106,8 @@ public:
|
||||
|
||||
virtual void unCommentSelection();
|
||||
|
||||
DuiDocument::Ptr duiDocument() const { return m_document; }
|
||||
|
||||
public slots:
|
||||
virtual void setFontSettings(const TextEditor::FontSettings &);
|
||||
|
||||
|
||||
@@ -20,7 +20,8 @@ duieditoractionhandler.h \
|
||||
duicodecompletion.h \
|
||||
duieditorconstants.h \
|
||||
duihoverhandler.h \
|
||||
duidocument.h
|
||||
duidocument.h \
|
||||
duicompletionvisitor.h
|
||||
|
||||
SOURCES += duieditor.cpp \
|
||||
duieditorfactory.cpp \
|
||||
@@ -29,6 +30,7 @@ duihighlighter.cpp \
|
||||
duieditoractionhandler.cpp \
|
||||
duicodecompletion.cpp \
|
||||
duihoverhandler.cpp \
|
||||
duidocument.cpp
|
||||
duidocument.cpp \
|
||||
duicompletionvisitor.cpp
|
||||
|
||||
RESOURCES += duieditor.qrc
|
||||
|
||||
Reference in New Issue
Block a user