QmlJSEditor: Add completion for JS keywords and Qml reserved words.

Task-number: QTCREATORBUG-919
Reviewed-by: Roberto Raggi

2 files changed, 11 insertions, 0 deletions

diff --git a/src/libs/qmljs/qmljsscanner.cpp b/src/libs/qmljs/qmljsscanner.cpp
index 7b201d2c6c7..79f81509f23 100644
--- a/src/libs/qmljs/qmljsscanner.cpp
+++ b/src/libs/qmljs/qmljsscanner.cpp
@@ -309,3 +309,13 @@ bool Scanner::isKeyword(const QString &text) const
 
     return false;
 }
+
+QStringList Scanner::keywords()
+{
+    static QStringList words;
+    if (words.isEmpty()) {
+        for (const QString *word = begin(js_keywords); word != end(js_keywords); ++word)
+            words.append(*word);
+    }
+    return words;
+}
diff --git a/src/libs/qmljs/qmljsscanner.h b/src/libs/qmljs/qmljsscanner.h
index 7d02e1b42dd..9141842cd71 100644
--- a/src/libs/qmljs/qmljsscanner.h
+++ b/src/libs/qmljs/qmljsscanner.h
@@ -87,6 +87,7 @@ public:
     int state() const;
 
     bool isKeyword(const QString &text) const;
+    static QStringList keywords();
 
 private:
     int _state;