Make the PHP mode depend on the HTML-mixed mode

In order to not duplicate all its logic.

Issue #751

Author: marijnh

mode/php/index.html

@@ -5,6 +5,7 @@
     <title>CodeMirror: PHP mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
+    <script src="../htmlmixed/htmlmixed.js"></script>
     <script src="../xml/xml.js"></script>
     <script src="../javascript/javascript.js"></script>
     <script src="../css/css.js"></script>

mode/php/php.js

@@ -50,19 +50,16 @@
   };
 
   CodeMirror.defineMode("php", function(config, parserConfig) {
-    var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true});
-    var jsMode = CodeMirror.getMode(config, "javascript");
-    var cssMode = CodeMirror.getMode(config, "css");
+    var htmlMode = CodeMirror.getMode(config, "text/html");
     var phpMode = CodeMirror.getMode(config, phpConfig);
 
-    function dispatch(stream, state) { // TODO open PHP inside text/css
+    function dispatch(stream, state) {
       var isPHP = state.curMode == phpMode;
       if (stream.sol() && state.pending != '"') state.pending = null;
-      if (state.curMode == htmlMode) {
+      if (!isPHP) {
         if (stream.match(/^<\?\w*/)) {
           state.curMode = phpMode;
           state.curState = state.php;
-          state.curClose = "?>";
           return "meta";
         }
         if (state.pending == '"') {
@@ -80,51 +77,33 @@
           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;
-          }
-          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;
-          }
         }
         return style;
-      } else if ((!isPHP || state.php.tokenize == null) &&
-                 stream.match(state.curClose, isPHP)) {
+      } else if (isPHP && state.php.tokenize == null && stream.match("?>")) {
         state.curMode = htmlMode;
         state.curState = state.html;
-        state.curClose = null;
-        if (isPHP) return "meta";
-        else return dispatch(stream, state);
+        return "meta";
       } else {
-        return state.curMode.token(stream, state.curState);
+        return phpMode.token(stream, state.curState);
       }
     }
 
     return {
       startState: function() {
-        var html = htmlMode.startState();
+        var html = CodeMirror.startState(htmlMode), php = CodeMirror.startState(phpMode);
         return {html: html,
-                php: phpMode.startState(),
+                php: php,
                 curMode: parserConfig.startOpen ? phpMode : htmlMode,
-                curState: parserConfig.startOpen ? phpMode.startState() : html,
-                curClose: parserConfig.startOpen ? /^\?>/ : null,
-		mode: parserConfig.startOpen ? "php" : "html",
+                curState: parserConfig.startOpen ? php : html,
                 pending: null};
       },
 
       copyState: function(state) {
         var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html),
             php = state.php, phpNew = CodeMirror.copyState(phpMode, php), cur;
-        if (state.curState == html) cur = htmlNew;
-        else if (state.curState == php) cur = phpNew;
-        else cur = CodeMirror.copyState(state.curMode, state.curState);
+        if (state.curMode == htmlMode) cur = htmlNew;
+        else cur = phpNew;
         return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur,
-                curClose: state.curClose, mode: state.mode,
                 pending: state.pending};
       },
 
@@ -141,7 +120,8 @@
 
       innerMode: function(state) { return {state: state.curState, mode: state.curMode}; }
     };
-  }, "xml", "clike", "javascript", "css");
+  }, "htmlmixed");
+
   CodeMirror.defineMIME("application/x-httpd-php", "php");
   CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
   CodeMirror.defineMIME("text/x-php", phpConfig);