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

qmljs: improve handling of qml dialects

Browse Source 
Language::Enum -> QmlDialect
 * class instead of enum
 * moved Language specific operations to it (from Document)
 * nicer handling
QStringList -> PathsAndLanguages
 * store language along with path, to perform a correct scan and improve
   path handling

Change-Id: If69d35c63cfeb48aa670b51870916cd0c40f1916
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-07-22 19:06:44 +02:00
parent faa0e5b96c
commit 02bdf30f45
40 changed files with 752 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/qmljs/qmljsdocument.h
View File

@@ -35,6 +35,7 @@
#include <languageutils/fakemetaobject.h>
#include "qmljsdialect.h"
#include "parser/qmldirparser_p.h"
#include "parser/qmljsengine_p.h"
#include "qmljs_global.h"
@@ -52,24 +53,19 @@ class QMLJS_EXPORT Document
public:
typedef QSharedPointer<const Document> Ptr;
typedef QSharedPointer<Document> MutablePtr;
static bool isQmlLikeLanguage(Language::Enum languge);
static bool isFullySupportedLanguage(Language::Enum language);
static bool isQmlLikeOrJsLanguage(Language::Enum language);
static QList<Language::Enum> companionLanguages(Language::Enum language);
protected:
Document(const QString &fileName, Language::Enum language);
Document(const QString &fileName, Dialect language);
public:
~Document();
static MutablePtr create(const QString &fileName, Language::Enum language);
static MutablePtr create(const QString &fileName, Dialect language);
Document::Ptr ptr() const;
bool isQmlDocument() const;
Language::Enum language() const;
void setLanguage(Language::Enum l);
Dialect language() const;
void setLanguage(Dialect l);
QString importId() const;
QByteArray fingerprint() const;
@@ -117,7 +113,7 @@ private:
QWeakPointer<Document> _ptr;
QByteArray _fingerprint;
int _editorRevision;
Language::Enum _language;
Dialect _language;
bool _parsedCorrectly;
// for documentFromSource
@@ -246,7 +242,7 @@ public:
Document::MutablePtr documentFromSource(const QString &code,
const QString &fileName,
Language::Enum language) const;
Dialect language) const;
};
} // namespace QmlJS