bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Improve syntax highlighting in tutorial

Browse source
This commit is contained in:
Marijn Haverbeke 2011-11-01 15:16:50 +01:00
parent 59cc8636b7
commit a6d856c57c
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
doc/tutorial/lib/codemirror-rust.js
View file

@ -213,15 +213,19 @@ CodeMirror.defineMode("rust", function() {
if (content == "||") return cont(poplex, pushlex("}", "block"), block); if (content == "||") return cont(poplex, pushlex("}", "block"), block);
} }
if (content == "mutable" || (content.match(/^\w+$/) && cx.stream.peek() == ":" if (content == "mutable" || (content.match(/^\w+$/) && cx.stream.peek() == ":"
&& !cx.stream.match("::", false))) return pass(recliteral); && !cx.stream.match("::", false)))
return pass(record_of(expression));
return pass(block); return pass(block);
} }
function recliteral(type) { function record_of(comb) {
if (content == "mutable" || content == "with") {cx.marked = "keyword"; return cont(recliteral);} function ro(type) {
if (content.match(/^\w*$/)) {cx.marked = "variable"; return cont(recliteral);} if (content == "mutable" || content == "with") {cx.marked = "keyword"; return cont(ro);}
if (type == ":") return cont(expression, recliteral); if (content.match(/^\w*$/)) {cx.marked = "variable"; return cont(ro);}
if (type == ":") return cont(comb, ro);
if (type == "}") return cont(); if (type == "}") return cont();
return cont(recliteral); return cont(ro);
}
return ro;
} }
function blockvars(type) { function blockvars(type) {
if (type == "name") {cx.marked = "def"; return cont(blockvars);} if (type == "name") {cx.marked = "def"; return cont(blockvars);}
@ -230,7 +234,7 @@ CodeMirror.defineMode("rust", function() {
} }
function letdef1(type) { function letdef1(type) {
if (type == ";") return cont(); if (type.match(/[\]\)\};]/)) return cont();
if (content == "=") return cont(expression, letdef2); if (content == "=") return cont(expression, letdef2);
if (type == ",") return cont(letdef1); if (type == ",") return cont(letdef1);
return pass(pattern, maybetype, letdef1); return pass(pattern, maybetype, letdef1);
@ -295,6 +299,7 @@ CodeMirror.defineMode("rust", function() {
if (type == "atom") return cont(rtypemaybeparam); if (type == "atom") return cont(rtypemaybeparam);
if (type == "op" || type == "obj") return cont(rtype); if (type == "op" || type == "obj") return cont(rtype);
if (type == "fn") return cont(fntype); if (type == "fn") return cont(fntype);
if (type == "{") return cont(pushlex("{"), record_of(rtype), poplex);
return matchBrackets(type, rtype); return matchBrackets(type, rtype);
} }
function rtypemaybeparam(type) { function rtypemaybeparam(type) {