Modified and renamed ejs mode to be generic so could include modes for asp, jsp and possibly php.

whalefood · marijnh · commit fb72b7a9012e · 2011-12-13T08:56:52.000+01:00
diff --git a/mode/ejs/ejs.js b/mode/ejs/ejs.js
diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
@@ -0,0 +1,72 @@
+CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
+  
+  //config settings
+  var scriptStartRegex = parserConfig.scriptStartRegex || /^<%/i,
+      scriptEndRegex = parserConfig.scriptEndRegex || /^%>/i,
+      scriptingMode;
+     
+  var htmlMixedMode = CodeMirror.getMode(config, "htmlmixed");
+  
+  //tokenizer when in html mode
+  function htmlDispatch(stream, state) {
+      if (stream.match(scriptStartRegex, false)) {
+          state.token=scriptingDispatch;
+          return scriptingMode.token(stream, state.scriptState);
+          }
+      else
+          return htmlMixedMode.token(stream, state.htmlState);
+    }
+
+  //tokenizer when in scripting mode
+  function scriptingDispatch(stream, state) {
+      if (stream.match(scriptEndRegex, false))  {
+          state.token=htmlDispatch;
+          return htmlMixedMode.token(stream, state.htmlState);
+         }
+      else
+          return scriptingMode.token(stream, state.scriptState);
+         }
+
+
+  return {
+    startState: function() {
+      scriptingMode = scriptingMode || CodeMirror.getMode(config, parserConfig.scriptingModeSpec)
+      return { 
+          token :  parserConfig.startOpen ? scriptingDispatch : htmlDispatch,
+          htmlState : htmlMixedMode.startState(),
+          scriptState : scriptingMode.startState()
+          }
+    },
+
+    token: function(stream, state) {
+      return state.token(stream, state);
+    },
+
+    indent: function(state, textAfter) {
+      if (state.token == htmlDispatch)
+        return htmlMixedMode.indent(state.htmlState, textAfter);
+      else
+        return scriptingMode.indent(state.scriptState, textAfter);
+    },
+    
+    copyState: function(state) {
+      return {
+       token : state.token,
+       htmlState : CodeMirror.copyState(htmlMixedMode, state.htmlState),
+       scriptState : CodeMirror.copyState(scriptingMode, state.scriptState)
+       }
+    },
+    
+
+    electricChars: "/{}:"
+  }
+});
+
+CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
+CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
+CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"});
+/*CodeMirror.defineMIME("application/x-httpd-php", { 
+    name: "htmlembedded", 
+    scriptingModeSpec:"text/x-php",
+    scriptStartRegex: /^<\?/,
+    scriptEndRegex: /^\?>/});*/
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
@@ -1,29 +1,30 @@
 <!doctype html>
 <html>
   <head>
-    <title>CodeMirror 2: Ejs mode</title>
+    <title>CodeMirror 2: Html Embedded Scripts mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
     <script src="../xml/xml.js"></script>
     <script src="../javascript/javascript.js"></script>
     <script src="../css/css.js"></script>
     <script src="../htmlmixed/htmlmixed.js"></script>
-    <script src="ejs.js"></script>
+    <script src="htmlembedded.js"></script>
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>
   <body>
-    <h1>CodeMirror 2: Ejs mode</h1>
+    <h1>CodeMirror 2: Html Embedded Scripts mode</h1>
 
 <form><textarea id="code" name="code">
 <%
 function hello(who) {
 	return "Hello " + who;
 }
 %>
-<p>The program says <%= hello("World") %>.</p>
+This is an example of EJS (embedded javascript)
+<p>The program says <%= hello("world") %>.</p>
 <script>
-	alert("And here is some JS code"); // also colored
+	alert("And here is some normal JS code"); // also colored
 </script>
 </textarea></form>
 
@@ -39,9 +40,10 @@ <h1>CodeMirror 2: Ejs mode</h1>
       });
     </script>
 
-    <p>Simple HTML/EJS mode. Depends on XML,
-    JavaScript, CSS and HtmlMixed modes.</p>
+    <p>Mode for html embedded scripts like JSP and ASP.NET. Depends on HtmlMixed which in turn depends on
+    JavaScript, CSS and XML.<br />Other dependancies include those of the scriping language chosen.</p>
 
-    <p><strong>MIME types defined:</strong> <code>application/x-ejs</code></p>
+    <p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET), 
+    <code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)</p>
   </body>
 </html>
