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

Json: Use the javascript editor for json files.

Browse Source 
Task-number: QTCREATORBUG-4639
Change-Id: Icd0fda434d5ca66056d784dd87240db76e8a442c
Reviewed-on: http://codereview.qt-project.org/6035
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-10-05 12:09:14 +02:00
parent 7dc88639dc
commit b5a92a1957
13 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -75,6 +75,7 @@ QmlJS::Document::Language QmlJSTools::languageOfFile(const QString &fileName)
{
QStringList jsSuffixes("js");
QStringList qmlSuffixes("qml");
QStringList jsonSuffixes("json");
if (Core::ICore::instance()) {
Core::MimeDatabase *db = Core::ICore::instance()->mimeDatabase();
@@ -82,6 +83,8 @@ QmlJS::Document::Language QmlJSTools::languageOfFile(const QString &fileName)
jsSuffixes = jsSourceTy.suffixes();
Core::MimeType qmlSourceTy = db->findByType(Constants::QML_MIMETYPE);
qmlSuffixes = qmlSourceTy.suffixes();
Core::MimeType jsonSourceTy = db->findByType(Constants::JSON_MIMETYPE);
jsonSuffixes = jsonSourceTy.suffixes();
}
const QFileInfo info(fileName);
@@ -90,6 +93,8 @@ QmlJS::Document::Language QmlJSTools::languageOfFile(const QString &fileName)
return QmlJS::Document::JavaScriptLanguage;
if (qmlSuffixes.contains(fileSuffix))
return QmlJS::Document::QmlLanguage;
if (jsonSuffixes.contains(fileSuffix))
return QmlJS::Document::JsonLanguage;
return QmlJS::Document::UnknownLanguage;
}

1
src/plugins/qmljstools/qmljstoolsconstants.h
View File

@@ -40,6 +40,7 @@ namespace Constants {
const char * const QML_MIMETYPE = "application/x-qml";
const char * const JS_MIMETYPE = "application/javascript";
const char * const JSON_MIMETYPE = "application/json";
const char * const TASK_INDEX = "QmlJSEditor.TaskIndex";

3
src/plugins/qmljstools/qmljstoolssettings.cpp
View File

@@ -119,6 +119,9 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent)
textEditorSettings->registerMimeTypeForLanguageId(
QLatin1String(Constants::JS_MIMETYPE),
Constants::QML_JS_SETTINGS_ID);
textEditorSettings->registerMimeTypeForLanguageId(
QLatin1String(Constants::JSON_MIMETYPE),
Constants::QML_JS_SETTINGS_ID);
}
QmlJSToolsSettings::~QmlJSToolsSettings()