Skip to content

Commit

Permalink
[erlang-mode] Improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@anaran
mats cronqvist authored and anaran committed Feb 22, 2014
1 parent 9b48056 commit 8a25485
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 86 deletions.
184 changes: 100 additions & 84 deletions mode/erlang/erlang.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
switch (type) {
case "atom": return "atom";
case "attribute": return "attribute";
case "boolean": return "special";
case "builtin": return "builtin";
case "comment": return "comment";
case "fun": return "meta";
Expand Down Expand Up @@ -47,19 +48,23 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
"after","begin","catch","case","cond","end","fun","if",
"let","of","query","receive","try","when"];

var separatorRE = /[\->\.,:;]/;
var separatorWords = [
"->",";",":",".",","];

var operatorWords = [
"and","andalso","band","bnot","bor","bsl","bsr","bxor",
"div","not","or","orelse","rem","xor"];

var symbolRE = /[\+\-\*\/<>=\|:!]/;
var symbolWords = [
"+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-"];
"+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"];

var openParenRE = /[<\(\[\{]/;
var openParenWords = [
"<<","(","[","{"];

var closeParenRE = /[>\)\]\}]/;
var closeParenWords = [
"}","]",")",">>"];

Expand Down Expand Up @@ -94,37 +99,14 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
"term_to_binary","time","throw","tl","trunc","tuple_size",
"tuple_to_list","unlink","unregister","whereis"];

// ignored for indenting purposes
var ignoreWords = [
",", ":", "catch", "after", "of", "cond", "let", "query"];


var smallRE = /[a-z_]/;
var largeRE = /[A-Z_]/;
var digitRE = /[0-9]/;
var octitRE = /[0-7]/;
var anumRE = /[a-z_A-Z0-9]/;
var symbolRE = /[\+\-\*\/<>=\|:]/;
var openParenRE = /[<\(\[\{]/;
var closeParenRE = /[>\)\]\}]/;
var sepRE = /[\->\.,:;]/;

function isMember(element,list) {
return (-1 < list.indexOf(element));
}

function isPrev(stream,string) {
var start = stream.start;
var len = string.length;
if (len <= start) {
var word = stream.string.slice(start-len,start);
return word == string;
}else{
return false;
}
}
// [Ø-Þ] [À-Ö]
// [ß-ö] [ø-ÿ]
var anumRE = /[\w@Ø-ÞÀ-Öß-öø-ÿ]/;
var escapesRE =
/[0-7]{1,3}|[bdefnrstv\\"']|\^[a-zA-Z]|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+}/;

function tokenize(stream, state) {

// in multi-line string
if (state.in_string) {
state.in_string = (!doubleQuote(stream));
Expand All @@ -143,17 +125,13 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
}

// attributes and type specs
if ((peekToken(state).token == "" || peekToken(state).token == ".") &&
stream.peek() == '-') {
stream.next();
if (stream.eat(smallRE) && stream.eatWhile(anumRE)) {
if (isMember(stream.current(),typeWords)) {
return rval(state,stream,"type");
}else{
return rval(state,stream,"attribute");
}
if ((peekToken(state).token == "") &&
stream.match(/-\s*[a-zß-öø-ÿ][\wØ-ÞÀ-Öß-öø-ÿ]*/)) {
if (isMember(stream.current(),typeWords)) {
return rval(state,stream,"type");
}else{
return rval(state,stream,"attribute");
}
stream.backUp(1);
}

var ch = stream.next();
Expand All @@ -171,24 +149,31 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
}

// record
if ( ch == "#") {
if (ch == "#") {
stream.eatWhile(anumRE);
return rval(state,stream,"record");
}

// char
if ( ch == "$") {
if (stream.next() == "\\") {
if (!stream.eatWhile(octitRE)) {
stream.next();
}
// dollar escape
if ( ch == "$" ) {
if (stream.next() == "\\" && !stream.match(escapesRE)) {
return rval(state,stream,"error");
}
return rval(state,stream,"string");
return rval(state,stream,"number");
}

// quoted atom
if (ch == '\'') {
state.in_atom = (!singleQuote(stream));
if (!(state.in_atom = (!singleQuote(stream)))) {
if (stream.match(/\s*\/\s*[0-9]/,false)) {
stream.match(/\s*\/\s*[0-9]/,true);
popToken(state);
return rval(state,stream,"fun"); // 'f'/0 style fun
}
if (stream.match(/\s*\(/,false) || stream.match(/\s*:/,false)) {
return rval(state,stream,"function");
}
}
return rval(state,stream,"atom");
}

Expand All @@ -199,61 +184,58 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
}

// variable
if (largeRE.test(ch)) {
if (/[A-Z_Ø-ÞÀ-Ö]/.test(ch)) {
stream.eatWhile(anumRE);
return rval(state,stream,"variable");
}

// atom/keyword/BIF/function
if (smallRE.test(ch)) {
if (/[a-z_ß-öø-ÿ]/.test(ch)) {
stream.eatWhile(anumRE);

if (stream.peek() == "/") {
stream.next();
if (stream.eatWhile(digitRE)) {
return rval(state,stream,"fun"); // f/0 style fun
}else{
stream.backUp(1);
return rval(state,stream,"atom");
}
if (stream.match(/\s*\/\s*[0-9]/,false)) {
stream.match(/\s*\/\s*[0-9]/,true);
popToken(state);
return rval(state,stream,"fun"); // f/0 style fun
}

var w = stream.current();

if (isMember(w,keywordWords)) {
pushToken(state,stream);
return rval(state,stream,"keyword");
}
if (stream.peek() == "(") {
}else if (stream.match(/\s*\(/,false)) {
// 'put' and 'erlang:put' are bifs, 'foo:put' is not
if (isMember(w,bifWords) &&
(!isPrev(stream,":") || isPrev(stream,"erlang:"))) {
return rval(state,stream,"builtin");
}else if (isMember(w,guardWords)) {
return rval(state,stream,"guard");
}else{
return rval(state,stream,"function");
}
}
if (isMember(w,guardWords)) {
return rval(state,stream,"guard");
}
if (isMember(w,operatorWords)) {
}else if (isMember(w,operatorWords)) {
return rval(state,stream,"operator");
}
if (stream.peek() == ":") {
}else if (stream.match(/\s*:/,false)) {
if (w == "erlang") {
return rval(state,stream,"builtin");
} else {
return rval(state,stream,"function");
}
}else if (isMember(w,["true","false"])) {
return rval(state,stream,"boolean");
}else{
return rval(state,stream,"atom");
}
return rval(state,stream,"atom");
}

// number
var digitRE = /[0-9]/;
var radixRE = /[0-9a-zA-Z]/; // 36#zZ style int
if (digitRE.test(ch)) {
stream.eatWhile(digitRE);
if (stream.eat('#')) {
stream.eatWhile(digitRE); // 16#10 style integer
stream.eatWhile(radixRE); // 36#aZ style integer
} else {
if (stream.eat('.')) { // float
stream.eatWhile(digitRE);
Expand All @@ -279,7 +261,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
}

// separators
if (greedy(stream,sepRE,separatorWords)) {
if (greedy(stream,separatorRE,separatorWords)) {
// distinguish between "." as terminator and record field operator
if (!state.in_record) {
pushToken(state,stream);
Expand All @@ -295,6 +277,17 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
return rval(state,stream,null);
}

function isPrev(stream,string) {
var start = stream.start;
var len = string.length;
if (len <= start) {
var word = stream.string.slice(start-len,start);
return word == string;
}else{
return false;
}
}

function nongreedy(stream,re,words) {
if (stream.current().length == 1 && re.test(stream.current())) {
stream.backUp(1);
Expand Down Expand Up @@ -346,35 +339,37 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
return false;
}

function Token(stream) {
this.token = stream ? stream.current() : "";
this.column = stream ? stream.column() : 0;
this.indent = stream ? stream.indentation() : 0;
function isMember(element,list) {
return (-1 < list.indexOf(element));
}

/////////////////////////////////////////////////////////////////////////////
function myIndent(state,textAfter) {
var indent = cmCfg.indentUnit;
var outdentWords = ["after","catch"];
var token = (peekToken(state)).token;
var wordAfter = takewhile(textAfter,/[^a-z]/);

if (state.in_string || state.in_atom) {
return 0;
}else if (token == "." || token == "") {
return CodeMirror.Pass;
}else if (token == "") {
return 0;
}else if (isMember(token,openParenWords)) {
return (peekToken(state)).column+token.length;
}else if (token == "when") {
return (peekToken(state)).column+token.length+1;
}else if (token == "fun" && wordAfter == "") {
return (peekToken(state)).column+token.length;
}else if (token == "->") {
if (wordAfter == "end") {
if (isMember(wordAfter,["end","after","catch"])) {
return peekToken(state,2).column;
}else if (peekToken(state,2).token == "fun") {
return peekToken(state,2).column+indent;
}else if (peekToken(state,2).token == ".") {
}else if (peekToken(state,2).token == "") {
return indent;
}else{
return (peekToken(state)).indent+indent;
}
}else if (isMember(wordAfter,outdentWords)) {
}else if (isMember(wordAfter,["after","catch","of"])) {
return (peekToken(state)).indent;
}else{
return (peekToken(state)).column+indent;
Expand All @@ -386,6 +381,12 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
return m ? str.slice(0,m.index) : str;
}

function Token(stream) {
this.token = stream ? stream.current() : "";
this.column = stream ? stream.column() : 0;
this.indent = stream ? stream.indentation() : 0;
}

function popToken(state) {
return state.tokenStack.pop();
}
Expand All @@ -403,26 +404,39 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
function pushToken(state,stream) {
var token = stream.current();
var prev_token = peekToken(state).token;
if (isMember(token,ignoreWords)) {

if (token == ".") {
state.tokenStack = [];
return false;
}else if(isMember(token,[",", ":", "of", "cond", "let", "query"])) {
return false;
}else if (drop_last(prev_token,token)) {
return false;
}else if (drop_both(prev_token,token)) {
popToken(state);
return false;
}else if (drop_first(prev_token,token)) {
popToken(state);
return pushToken(state,stream);
}else if (isMember(token,["after","catch"])) {
return false;
}else{
state.tokenStack.push(new Token(stream));
return true;
}
}

function drop_last(open, close) {
switch(open+" "+close) {
case "when ;": return true;
default: return false;
}
}

function drop_first(open, close) {
switch (open+" "+close) {
case "when ->": return true;
case "-> end": return true;
case "-> .": return true;
case ". .": return true;
default: return false;
}
}
Expand All @@ -439,6 +453,8 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
case "if end": return true;
case "receive end": return true;
case "try end": return true;
case "-> catch": return true;
case "-> after": return true;
case "-> ;": return true;
default: return false;
}
Expand Down
10 changes: 8 additions & 2 deletions theme/erlang-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }

.cm-s-erlang-dark span.cm-atom { color: #845dc4; }
.cm-s-erlang-dark span.cm-atom { color: #f133f1; }
.cm-s-erlang-dark span.cm-attribute { color: #ff80e1; }
.cm-s-erlang-dark span.cm-bracket { color: #ff9d00; }
.cm-s-erlang-dark span.cm-builtin { color: #eaa; }
Expand All @@ -14,11 +14,17 @@
.cm-s-erlang-dark span.cm-keyword { color: #ffee80; }
.cm-s-erlang-dark span.cm-meta { color: #50fefe; }
.cm-s-erlang-dark span.cm-number { color: #ffd0d0; }
.cm-s-erlang-dark span.cm-operator { color: #d11; }
.cm-s-erlang-dark span.cm-operator { color: #d55; }
.cm-s-erlang-dark span.cm-property { color: #ccc; }
.cm-s-erlang-dark span.cm-qualifier { color: #ccc; }
.cm-s-erlang-dark span.cm-quote { color: #ccc; }
.cm-s-erlang-dark span.cm-special { color: #ffbbbb; }
.cm-s-erlang-dark span.cm-string { color: #3ad900; }
.cm-s-erlang-dark span.cm-string-2 { color: #ccc; }
.cm-s-erlang-dark span.cm-tag { color: #9effff; }
.cm-s-erlang-dark span.cm-variable { color: #50fe50; }
.cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }

.cm-s-erlang-dark .CodeMirror-activeline-background {background: #013461 !important;}
.cm-s-erlang-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}

0 comments on commit 8a25485

Please sign in to comment.