diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-12 14:00:05 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-14 11:51:35 +0200 |
| commit | 1a0fb751cde975f43564c9a8b1475c263acecc9a (patch) | |
| tree | 2dc32f37b798befb6ace66753e92ea3663812b5b /src/plugins/texteditor | |
| parent | a8b03e9c282dbe3a100726367ac5159cf8e5553e (diff) | |
| download | qt-creator-1a0fb751cde975f43564c9a8b1475c263acecc9a.tar.gz | |
QmlJS highlighting: Use semantics for types and binding names.
This fixes some problems with highlighting like anchors {}, allows us
to only highlight correct types and to make the binding name formatting
customizable.
Change-Id: I7ab0c0ed384108b74a2998796d868d5ced4a5310
Reviewed-on: http://codereview.qt-project.org/4669
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'src/plugins/texteditor')
| -rw-r--r-- | src/plugins/texteditor/texteditorconstants.h | 1 | ||||
| -rw-r--r-- | src/plugins/texteditor/texteditorsettings.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h index fb06787a1b..9e1ed7911e 100644 --- a/src/plugins/texteditor/texteditorconstants.h +++ b/src/plugins/texteditor/texteditorconstants.h @@ -138,6 +138,7 @@ const char * const C_JS_SCOPE_VAR = "JsScopeVar"; const char * const C_JS_IMPORT_VAR = "JsImportVar"; const char * const C_JS_GLOBAL_VAR = "JsGlobalVar"; const char * const C_QML_STATE_NAME = "QmlStateName"; +const char * const C_BINDING = "Binding"; const char * const C_DISABLED_CODE = "DisabledCode"; diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 3c8ca76163..0d04562bc3 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -146,6 +146,8 @@ TextEditorSettings::TextEditorSettings(QObject *parent) virtualMethodFormatDescriptor.format().setItalic(true); formatDescriptions.append(virtualMethodFormatDescriptor); + formatDescriptions.append(FormatDescription(QLatin1String(C_BINDING), tr("QML Binding"), Qt::darkRed)); + Format qmlLocalNameFormat; qmlLocalNameFormat.setItalic(true); formatDescriptions.append(FormatDescription(QLatin1String(C_QML_LOCAL_ID), tr("QML Local Id"), qmlLocalNameFormat)); |