diff --git a/autotests/folding/test.htm.fold b/autotests/folding/test.htm.fold --- a/autotests/folding/test.htm.fold +++ b/autotests/folding/test.htm.fold @@ -42,7 +42,7 @@ } > - + type="x-tmpl-mustache"> {{#movie}} > @@ -66,4 +66,9 @@
  • Hello
    • > + + > + ? + > + diff --git a/autotests/html/test.htm.html b/autotests/html/test.htm.html --- a/autotests/html/test.htm.html +++ b/autotests/html/test.htm.html @@ -48,7 +48,7 @@ } </script> - <!-- MustacheJS --> + <!-- Mustache/Handlebars --> <script type="x-tmpl-mustache"> {{#movie}} <div> @@ -72,5 +72,10 @@ <li><a href="link">Hello</a></li> </script> + <!-- Close the block correctly after "?" in the JavaScript highlighter --> + <script> + ? + </script> + </html> diff --git a/autotests/input/test.htm b/autotests/input/test.htm --- a/autotests/input/test.htm +++ b/autotests/input/test.htm @@ -42,7 +42,7 @@ } - + + + + diff --git a/autotests/reference/highlight.js.ref b/autotests/reference/highlight.js.ref --- a/autotests/reference/highlight.js.ref +++ b/autotests/reference/highlight.js.ref @@ -26,7 +26,7 @@ /dooh/;

    // This is supposedly legal:
    -re = somebool ? /foo/ : /bar/;
    +re = somebool ? /foo/ : /bar/;

    // NOTE - Special case: an empty regex, not a comment.
    // The rule uses a positive lookahead assertion to catch it: "//(?=;)".
    @@ -87,13 +87,13 @@ var ary = new Array(5);
    // ^ fallthrough ? (if keyword is correctly rendered)

    -var b = a ? 1 : 0;
    +var b = a ? 1 : 0;
    // ^ ^ fallthroughs. numbers must be rendered correctly.

    -var c = d ? true : false;
    +var c = d ? true : false;

    var conditinalstring = b ?
    - "something" :
    + "something" :
    "something else";
    // guess...

    diff --git a/autotests/reference/highlight.qml.ref b/autotests/reference/highlight.qml.ref --- a/autotests/reference/highlight.qml.ref +++ b/autotests/reference/highlight.qml.ref @@ -10,10 +10,10 @@ property string label
    signal clicked
    radius: 5; border.color: "black"
    - color: mouse.pressed ? "steelblue" : "lightsteelblue"
    + color: mouse.pressed ? "steelblue" : "lightsteelblue"
    gradient: Gradient {
    - GradientStop { position: mouse.pressed ? 1.0 : 0.0; color: "steelblue" }
    - GradientStop { position: mouse.pressed ? 0.0 : 1.0; color: "lightsteelblue" }
    + GradientStop { position: mouse.pressed ? 1.0 : 0.0; color: "steelblue" }
    + GradientStop { position: mouse.pressed ? 0.0 : 1.0; color: "lightsteelblue" }
    }
    MouseRegion { id: mouse; anchors.fill: parent; onClicked: container.clicked() }
    Text { anchors.fill: parent; text: container.label; anchors.centerIn: parent }
    diff --git a/autotests/reference/test.htm.ref b/autotests/reference/test.htm.ref --- a/autotests/reference/test.htm.ref +++ b/autotests/reference/test.htm.ref @@ -42,7 +42,7 @@ }


    -
    +
    type="x-tmpl-mustache">
    {{#movie}}

    @@ -66,4 +66,9 @@
  • href="link">Hello



    • +
    +
    +

    diff --git a/data/syntax/javascript.xml b/data/syntax/javascript.xml --- a/data/syntax/javascript.xml +++ b/data/syntax/javascript.xml @@ -6,7 +6,7 @@ - @@ -127,7 +127,6 @@ - @@ -149,11 +148,6 @@ - - - - -