mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

"iface" -> "trait" in CodeMirror mode.

Browse source
This commit is contained in:
Lindsey Kuper 2012-07-31 10:40:49 -07:00
parent a413d4e502
commit 4998a7dde8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/lib/codemirror-rust.js
View file

@ -4,7 +4,7 @@ CodeMirror.defineMode("rust", function() {
"if": "if-style", "while": "if-style", "loop": "if-style", "else": "else-style", "if": "if-style", "while": "if-style", "loop": "if-style", "else": "else-style",
"do": "else-style", "ret": "else-style", "fail": "else-style", "do": "else-style", "ret": "else-style", "fail": "else-style",
"break": "atom", "cont": "atom", "const": "let", "resource": "fn", "break": "atom", "cont": "atom", "const": "let", "resource": "fn",
"let": "let", "fn": "fn", "for": "for", "alt": "alt", "iface": "iface", "let": "let", "fn": "fn", "for": "for", "alt": "alt", "trait": "trait",
"impl": "impl", "type": "type", "enum": "enum", "class": "atom", "mod": "mod", "impl": "impl", "type": "type", "enum": "enum", "class": "atom", "mod": "mod",
"as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op", "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op",
"claim": "op", "extern": "ignore", "unsafe": "ignore", "import": "else-style", "claim": "op", "extern": "ignore", "unsafe": "ignore", "import": "else-style",
@ -179,7 +179,7 @@ CodeMirror.defineMode("rust", function() {
if (type == "type") return cont(pushlex("stat"), tydef, endstatement, poplex, block); if (type == "type") return cont(pushlex("stat"), tydef, endstatement, poplex, block);
if (type == "enum") return stat_of(tagdef); if (type == "enum") return stat_of(tagdef);
if (type == "mod") return stat_of(mod); if (type == "mod") return stat_of(mod);
if (type == "iface") return stat_of(iface); if (type == "trait") return stat_of(trait);
if (type == "impl") return stat_of(impl); if (type == "impl") return stat_of(impl);
if (type == "open-attr") return cont(pushlex("]"), commasep(expression, "]"), poplex); if (type == "open-attr") return cont(pushlex("]"), commasep(expression, "]"), poplex);
if (type == "ignore" || type.match(/[\]\);,]/)) return cont(block); if (type == "ignore" || type.match(/[\]\);,]/)) return cont(block);
@ -291,9 +291,9 @@ CodeMirror.defineMode("rust", function() {
if (type == "{") return cont(pushlex("}"), block, poplex); if (type == "{") return cont(pushlex("}"), block, poplex);
return pass(); return pass();
} }
function iface(type) { function trait(type) {
if (type == "name") {cx.marked = "def"; return cont(iface);} if (type == "name") {cx.marked = "def"; return cont(trait);}
if (content == "<") return cont(typarams, iface); if (content == "<") return cont(typarams, trait);
if (type == "{") return cont(pushlex("}"), block, poplex); if (type == "{") return cont(pushlex("}"), block, poplex);
return pass(); return pass();
} }