Merge pull request #7046 from adobe/rlim/php-inside-css

redmunds · redmunds · commit 528ef385a5b7 · 2014-03-24T13:37:46.000-07:00
Skip all embedded php code when parsing the style blocks in php documents.
diff --git a/src/language/HTMLUtils.js b/src/language/HTMLUtils.js
@@ -485,7 +485,8 @@ define(function (require, exports, module) {
             currentBlock = null,
             inBlock = false,
             outerMode = editor._codeMirror.getMode(),
-            tokenModeName;
+            tokenModeName,
+            previousMode;
         
         while (TokenUtils.moveNextToken(ctx, false)) {
             tokenModeName = CodeMirror.innerMode(outerMode, ctx.token.state).mode.name;
@@ -495,7 +496,7 @@ define(function (require, exports, module) {
                     currentBlock.end = currentBlock.start;
                 }
                 // Check for end of this block
-                if (tokenModeName !== modeName) {
+                if (tokenModeName === previousMode) {
                     // currentBlock.end is already set to pos of the last token by now
                     currentBlock.text = editor.document.getRange(currentBlock.start, currentBlock.end);
                     inBlock = false;
@@ -510,6 +511,8 @@ define(function (require, exports, module) {
                     };
                     blocks.push(currentBlock);
                     inBlock = true;
+                } else {
+                    previousMode = tokenModeName;
                 }
                 // else, random token: ignore
             }
diff --git a/test/spec/InlineEditorProviders-test-files/test1.php b/test/spec/InlineEditorProviders-test-files/test1.php
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <style type="text/css">
+{{0}}   body {
+            background: url("<?php echo $img; ?>") no-repeat;
+            background-size: 100% 100%;
+            color: white;
+        }
+    </style>
+  </head>
+
+  <bo{{1}}dy onclick="goHome()"></body>
+</html>
diff --git a/test/spec/InlineEditorProviders-test.js b/test/spec/InlineEditorProviders-test.js
@@ -297,6 +297,21 @@ define(function (require, exports, module) {
             });
 
 
+            it("should open a type selector and show correct range including the embedded php", function () {
+                initInlineTest("test1.php", 1);
+                
+                runs(function () {
+                    var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0];
+                    var inlinePos = inlineWidget.editor.getCursorPos();
+                    
+                    // verify cursor position and displayed range in inline editor
+                    expect(inlinePos).toEqual(infos["test1.php"].offsets[0]);
+                    expect(inlineWidget.editor).toHaveInlineEditorRange(toRange(4, 8));
+                    
+                    inlineWidget = null;
+                });
+            });
+            
             it("should open a type selector on opening tag", function () {
                 initInlineTest("test1.html", 0);
                 
