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

Introduced Document::isQmlDocument() and Document::isJSDocument().

Browse Source
This commit is contained in:
Roberto Raggi
2010-03-29 12:56:25 +02:00
parent 6c1606a31b
commit 4ee8a199af
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmljseditor/qmljscodecompletion.cpp
View File

@@ -703,10 +703,16 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
}
// add qml extra words
if (document && document->qmlProgram()) {
if (isQmlFile) {
static QStringList qmlWords;
if (qmlWords.isEmpty())
qmlWords << "property" << "readonly" << "signal";
if (qmlWords.isEmpty()) {
qmlWords << QLatin1String("property")
<< QLatin1String("readonly")
<< QLatin1String("signal")
<< QLatin1String("import");
}
foreach (const QString &word, qmlWords) {
TextEditor::CompletionItem item(this);
item.text = word;

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

@@ -1354,12 +1354,7 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
if (! doc) {
snapshot = source.snapshot;
doc = snapshot.documentFromSource(source.code, source.fileName);
// ### This doesn't really work: what if snapshot doesn't have the doc?
if (snapshot.document(source.fileName)->qmlProgram())
doc->parseQml();
else if (snapshot.document(source.fileName)->jsProgram())
doc->parseJavaScript();
doc->parse();
}
SemanticInfo semanticInfo;