From 366675a7a74ed341b9313b52e6b12f19aa0be510 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 31 Oct 2014 15:08:44 +0400
Subject: [PATCH] fix inline php mode

---
 lib/ace/mode/php.js      | 10 ++++---
 lib/ace/mode/php_test.js | 65 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 lib/ace/mode/php_test.js

diff --git a/lib/ace/mode/php.js b/lib/ace/mode/php.js
index 101cc3c0..a44e79c6 100644
--- a/lib/ace/mode/php.js
+++ b/lib/ace/mode/php.js
@@ -46,9 +46,7 @@ var JavaScriptMode = require("./javascript").Mode;
 var CssMode = require("./css").Mode;
 
 var PhpMode = function(opts) {
-    this.inlinePhp = opts && opts.inline;
-    var HighlightRules = this.inlinePhp ? PhpLangHighlightRules : PhpHighlightRules;
-    this.HighlightRules = HighlightRules;
+    this.HighlightRules = PhpLangHighlightRules;
     this.$outdent = new MatchingBraceOutdent();
     this.$behaviour = new CstyleBehaviour();
     this.foldingRules = new CStyleFoldMode();
@@ -100,7 +98,11 @@ oop.inherits(PhpMode, TextMode);
     this.$id = "ace/mode/php-inline";
 }).call(PhpMode.prototype);
 
-var Mode = function() {
+var Mode = function(opts) {
+    if (opts && opts.inline) {
+        PhpMode.call(this);
+        return;
+    }
     HtmlMode.call(this);
     this.HighlightRules = PhpHighlightRules;
     this.createModeDelegates({
diff --git a/lib/ace/mode/php_test.js b/lib/ace/mode/php_test.js
new file mode 100644
index 00000000..9e86a304
--- /dev/null
+++ b/lib/ace/mode/php_test.js
@@ -0,0 +1,65 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+if (typeof process !== "undefined") {
+    require("amd-loader");
+}
+
+define(function(require, exports, module) {
+"use strict";
+
+var EditSession = require("../edit_session").EditSession;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var Mode = require("./php").Mode;
+var assert = require("../test/assertions");
+
+module.exports = {
+    "test: inline mode" : function() {
+        var mode = new Mode();
+        var tokenizer = mode.getTokenizer();
+        var tokens = tokenizer.getLineTokens("'juhu kinners' ?> html  <? 'php'", "start").tokens;
+        assert.equal("string", tokens[tokens.length - 1].type);
+        assert.notEqual("string", tokens[0].type);
+        assert.equal(tokens.length, 4);
+        
+        mode = new Mode({inline: true});
+        tokenizer = mode.getTokenizer();
+        tokens = tokenizer.getLineTokens("'juhu kinners' ?> html  <? 'php'", "start").tokens;
+        assert.equal("string", tokens[0].type);
+        assert.equal("string", tokens[tokens.length - 1].type);
+        assert.equal(tokens.length, 9);
+    }
+};
+
+});
+
+if (typeof module !== "undefined" && module === require.main) {
+    require("asyncjs").test.testcase(module.exports).exec()
+}