From 51ed781953bc44bba3c70938aa57b856394cbc88 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 27 Feb 2012 14:41:21 -0800 Subject: updating to codemirror 2.22 Signed-off-by: Ananya Sen --- imports/codemirror/mode/php/index.html | 0 imports/codemirror/mode/php/php.js | 78 +++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 24 deletions(-) mode change 100755 => 100644 imports/codemirror/mode/php/index.html mode change 100755 => 100644 imports/codemirror/mode/php/php.js (limited to 'imports/codemirror/mode/php') diff --git a/imports/codemirror/mode/php/index.html b/imports/codemirror/mode/php/index.html old mode 100755 new mode 100644 diff --git a/imports/codemirror/mode/php/php.js b/imports/codemirror/mode/php/php.js old mode 100755 new mode 100644 index f88b3f84..5406a5ce --- a/imports/codemirror/mode/php/php.js +++ b/imports/codemirror/mode/php/php.js @@ -13,11 +13,12 @@ } var phpConfig = { name: "clike", - keywords: keywords("abstract and array as break case catch cfunction class clone const continue declare " + - "default do else elseif enddeclare endfor endforeach endif endswitch endwhile extends " + - "final for foreach function global goto if implements interface instanceof namespace " + - "new or private protected public static switch throw try use var while xor return" + - "die echo empty exit eval include include_once isset list require require_once print unset"), + keywords: keywords("abstract and array as break case catch class clone const continue declare default " + + "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " + + "for foreach function global goto if implements interface instanceof namespace " + + "new or private protected public static switch throw trait try use var while xor " + + "die echo empty exit eval include include_once isset list require require_once return " + + "print unset __halt_compiler self static parent"), blockKeywords: keywords("catch do else elseif for foreach if switch try while"), atoms: keywords("true false null TRUE FALSE NULL"), multiLineStrings: true, @@ -35,8 +36,15 @@ return false; }, "#": function(stream, state) { - stream.skipToEnd(); + while (!stream.eol() && !stream.match("?>", false)) stream.next(); return "comment"; + }, + "/": function(stream, state) { + if (stream.eat("/")) { + while (!stream.eol() && !stream.match("?>", false)) stream.next(); + return "comment"; + } + return false; } } }; @@ -48,38 +56,57 @@ var phpMode = CodeMirror.getMode(config, phpConfig); function dispatch(stream, state) { // TODO open PHP inside text/css + var isPHP = state.mode == "php"; + if (stream.sol() && state.pending != '"') state.pending = null; if (state.curMode == htmlMode) { - var style = htmlMode.token(stream, state.curState); - if (style == "meta" && /^<\?/.test(stream.current())) { + if (stream.match(/^<\?\w*/)) { state.curMode = phpMode; state.curState = state.php; - state.curClose = /^\?>/; - state.mode = 'php'; + state.curClose = "?>"; + state.mode = "php"; + return "meta"; } - else if (style == "tag" && stream.current() == ">" && state.curState.context) { + if (state.pending == '"') { + while (!stream.eol() && stream.next() != '"') {} + var style = "string"; + } else if (state.pending && stream.pos < state.pending.end) { + stream.pos = state.pending.end; + var style = state.pending.style; + } else { + var style = htmlMode.token(stream, state.curState); + } + state.pending = null; + var cur = stream.current(), openPHP = cur.search(/<\?/); + if (openPHP != -1) { + if (style == "string" && /\"$/.test(cur) && !/\?>/.test(cur)) state.pending = '"'; + else state.pending = {end: stream.pos, style: style}; + stream.backUp(cur.length - openPHP); + } else if (style == "tag" && stream.current() == ">" && state.curState.context) { if (/^script$/i.test(state.curState.context.tagName)) { state.curMode = jsMode; state.curState = jsMode.startState(htmlMode.indent(state.curState, "")); state.curClose = /^<\/\s*script\s*>/i; - state.mode = 'javascript'; + state.mode = "javascript"; } else if (/^style$/i.test(state.curState.context.tagName)) { state.curMode = cssMode; state.curState = cssMode.startState(htmlMode.indent(state.curState, "")); - state.curClose = /^<\/\s*style\s*>/i; - state.mode = 'css'; + state.curClose = /^<\/\s*style\s*>/i; + state.mode = "css"; } } return style; - } - else if (stream.match(state.curClose, false)) { + } else if ((!isPHP || state.php.tokenize == null) && + stream.match(state.curClose, isPHP)) { state.curMode = htmlMode; state.curState = state.html; state.curClose = null; - state.mode = 'html'; - return dispatch(stream, state); + state.mode = "html"; + if (isPHP) return "meta"; + else return dispatch(stream, state); + } else { + return state.curMode.token(stream, state.curState); } - else return state.curMode.token(stream, state.curState); } return { @@ -87,10 +114,11 @@ var html = htmlMode.startState(); return {html: html, php: phpMode.startState(), - curMode: parserConfig.startOpen ? phpMode : htmlMode, - curState: parserConfig.startOpen ? phpMode.startState() : html, - curClose: parserConfig.startOpen ? /^\?>/ : null, - mode: parserConfig.startOpen ? 'php' : 'html'} + curMode: parserConfig.startOpen ? phpMode : htmlMode, + curState: parserConfig.startOpen ? phpMode.startState() : html, + curClose: parserConfig.startOpen ? /^\?>/ : null, + mode: parserConfig.startOpen ? "php" : "html", + pending: null} }, copyState: function(state) { @@ -99,7 +127,9 @@ if (state.curState == html) cur = htmlNew; else if (state.curState == php) cur = phpNew; else cur = CodeMirror.copyState(state.curMode, state.curState); - return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur, curClose: state.curClose}; + return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur, + curClose: state.curClose, mode: state.mode, + pending: state.pending}; }, token: dispatch, -- cgit v1.2.3