Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
b19c51d6
Commit
b19c51d6
authored
Apr 07, 2010
by
Christian Kamm
Browse files
QmlJSEditor: Highlight b in 'A on b {' as a property.
Fixes
4f1d5ce1
Task-number: QTCREATORBUG-893 Reviewed-by: Erik Verbruggen
parent
db2f91ef
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmljseditor/qmljshighlighter.cpp
View file @
b19c51d6
...
...
@@ -147,11 +147,26 @@ void Highlighter::highlightBlock(const QString &text)
if
(
index
+
1
<
tokens
.
size
())
{
const
Token
&
nextToken
=
tokens
.
at
(
index
+
1
);
bool
maybeBinding
=
(
index
==
0
||
checkStartOfBinding
(
tokens
.
at
(
index
-
1
)));
bool
maybeOnBinding
=
false
;
if
(
index
>
0
)
{
const
Token
&
previousToken
=
tokens
.
at
(
index
-
1
);
if
(
text
.
midRef
(
previousToken
.
offset
,
previousToken
.
length
)
==
QLatin1String
(
"on"
))
{
maybeOnBinding
=
true
;
maybeBinding
=
false
;
}
}
if
(
text
.
at
(
token
.
offset
).
isUpper
()
&&
(
nextToken
.
is
(
Token
::
LeftBrace
)
||
text
.
midRef
(
nextToken
.
offset
,
nextToken
.
length
)
==
QLatin1String
(
"on"
)))
{
setFormat
(
token
.
offset
,
token
.
length
,
m_formats
[
TypeFormat
]);
}
else
if
(
index
==
0
||
checkStartOfBinding
(
tokens
.
at
(
index
-
1
)))
{
}
else
if
(
maybeBinding
||
maybeOnBinding
)
{
Token
::
Kind
expectedTerminator
=
Token
::
Colon
;
if
(
maybeOnBinding
)
expectedTerminator
=
Token
::
LeftBrace
;
const
int
start
=
index
;
++
index
;
// skip the identifier.
...
...
@@ -161,7 +176,7 @@ void Highlighter::highlightBlock(const QString &text)
index
+=
2
;
}
if
(
index
<
tokens
.
size
()
&&
tokens
.
at
(
index
).
is
(
Token
::
Colon
))
{
if
(
index
<
tokens
.
size
()
&&
tokens
.
at
(
index
).
is
(
expectedTerminator
))
{
// it's a binding.
for
(
int
i
=
start
;
i
<
index
;
++
i
)
{
const
Token
&
tok
=
tokens
.
at
(
i
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment