[jinja2 mode] Improve

Conflicts:
	mode/jinja2/jinja2.js

Author: Gergely Hegykozi

mode/jinja2/index.html

@@ -25,22 +25,26 @@
 <article>
 <h2>Jinja2 mode</h2>
 <form><textarea id="code" name="code">
-&lt;html style="color: green"&gt;
-  &lt;!-- this is a comment --&gt;
-  &lt;head&gt;
-    &lt;title&gt;Jinja2 Example&lt;/title&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    &lt;ul&gt;
-    {# this is a comment #}
-    {%- for item in li -%}
-      &lt;li&gt;
-        {{ item.label }}
-      &lt;/li&gt;
-    {% endfor -%}
-    &lt;/ul&gt;
-  &lt;/body&gt;
-&lt;/html&gt;
+{# this is a comment #}
+{%- for item in li -%}
+  &lt;li&gt;{{ item.label }}&lt;/li&gt;
+{% endfor -%}
+{{ item.sand == true and item.keyword == false ? 1 : 0 }}
+{{ app.get(55, 1.2, true) }}
+{% if app.get(&#39;_route&#39;) == (&#39;_home&#39;) %}home{% endif %}
+{% if app.session.flashbag.has(&#39;message&#39;) %}
+  {% for message in app.session.flashbag.get(&#39;message&#39;) %}
+    {{ message.content }}
+  {% endfor %}
+{% endif %}
+{{ path(&#39;_home&#39;, {&#39;section&#39;: app.request.get(&#39;section&#39;)}) }}
+{{ path(&#39;_home&#39;, {
+    &#39;section&#39;: app.request.get(&#39;section&#39;),
+    &#39;boolean&#39;: true,
+    &#39;number&#39;: 55.33
+  })
+}}
+{% include (&#39;test.incl.html.twig&#39;) %}
 </textarea></form>
     <script>
       var editor =

mode/jinja2/jinja2.js

@@ -1,46 +1,122 @@
 CodeMirror.defineMode("jinja2", function() {
     var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif",
-                    "extends", "filter", "endfilter", "firstof", "for",
-                    "endfor", "if", "endif", "ifchanged", "endifchanged",
-                    "ifequal", "endifequal", "ifnotequal",
-                    "endifnotequal", "in", "include", "load", "not", "now", "or",
-                    "parsed", "regroup", "reversed", "spaceless",
-                    "endspaceless", "ssi", "templatetag", "openblock",
-                    "closeblock", "openvariable", "closevariable",
-                    "openbrace", "closebrace", "opencomment",
-                    "closecomment", "widthratio", "url", "with", "endwith",
-                    "get_current_language", "trans", "noop", "blocktrans",
-                    "endblocktrans", "get_available_languages",
-                    "get_current_language_bidi", "plural"];
-    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
+      "extends", "filter", "endfilter", "firstof", "for",
+      "endfor", "if", "endif", "ifchanged", "endifchanged",
+      "ifequal", "endifequal", "ifnotequal",
+      "endifnotequal", "in", "include", "load", "not", "now", "or",
+      "parsed", "regroup", "reversed", "spaceless",
+      "endspaceless", "ssi", "templatetag", "openblock",
+      "closeblock", "openvariable", "closevariable",
+      "openbrace", "closebrace", "opencomment",
+      "closecomment", "widthratio", "url", "with", "endwith",
+      "get_current_language", "trans", "endtrans", "noop", "blocktrans",
+      "endblocktrans", "get_available_languages",
+      "get_current_language_bidi", "plural"],
+    operator = /^[+\-*&%=<>!?|~^]/,
+    sign = /^[:\[\(\{]/,
+    atom = ["true", "false"],
+    number = /^(\d[+\-\*\/])?\d+(\.\d+)?/;
+
+    keywords = new RegExp("((" + keywords.join(")|(") + "))\\b");
+    atom = new RegExp("((" + atom.join(")|(") + "))\\b");
 
     function tokenBase (stream, state) {
-        var ch = stream.next();
-        if (ch == "{") {
-            if (ch = stream.eat(/\{|%|#/)) {
-                stream.eat("-");
-                state.tokenize = inTag(ch);
-                return "tag";
-            }
+      var ch = stream.peek();
+
+      //Comment
+      if (state.incomment) {
+        if(!stream.skipTo("#}")) {
+          stream.skipToEnd();
+        } else {
+          stream.eatWhile(/\#|}/);
+          state.incomment = false;
         }
-    }
-    function inTag (close) {
-        if (close == "{") {
-            close = "}";
+        return "comment";
+      //Tag
+      } else if (state.intag) {
+        //After operator
+        if(state.operator) {
+          state.operator = false;
+          if(stream.match(atom)) {
+            return "atom";
+          }
+          if(stream.match(number)) {
+            return "number";
+          }
         }
-        return function (stream, state) {
-            var ch = stream.next();
-            if ((ch == close || (ch == "-" && stream.eat(close)))
-                && stream.eat("}")) {
-                state.tokenize = tokenBase;
-                return "tag";
+        //After sign
+        if(state.sign) {
+          state.sign = false;
+          if(stream.match(atom)) {
+            return "atom";
+          }
+          if(stream.match(number)) {
+            return "number";
+          }
+        }
+
+        if(state.instring) {
+          if(ch == state.instring) {
+            state.instring = false;
+          }
+          stream.next();
+          return "string";
+        } else if(ch == "'" || ch == '"') {
+          state.instring = ch;
+          stream.next();
+          return "string";
+        } else if(stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
+          state.intag = false;
+          return "tag";
+        } else if(stream.match(operator)) {
+          state.operator = true;
+          return "operator";
+        } else if(stream.match(sign)) {
+          state.sign = true;
+        } else {
+          if(stream.eat(" ") || stream.sol()) {
+            if(stream.match(keywords)) {
+              return "keyword";
+            }
+            if(stream.match(atom)) {
+              return "atom";
             }
-            if (stream.match(keywords)) {
-                return "keyword";
+            if(stream.match(number)) {
+              return "number";
             }
-            return close == "#" ? "comment" : "string";
-        };
-    }
+            if(stream.sol()) {
+              stream.next();
+            }
+          } else {
+            stream.next();
+          }
+
+        }
+        return "variable";
+      } else if (stream.eat("{")) {
+        if (ch = stream.eat("#")) {
+          state.incomment = true;
+          if(!stream.skipTo("#}")) {
+            stream.skipToEnd();
+          } else {
+            stream.eatWhile(/\#|}/);
+            state.incomment = false;
+          }
+          return "comment";
+        //Open tag
+        } else if (ch = stream.eat(/\{|%/)) {
+          //Cache close tag
+          state.intag = ch;
+          if(ch == "{") {
+            state.intag = "}";
+          }
+          stream.eat("-");
+          return "tag";
+        }
+      }
+      stream.next();
+    };
+
     return {
         startState: function () {
             return {tokenize: tokenBase};