Merge pull request #11071 from adobe/marcel/cm-update

prafulVaishnav · prafulVaishnav · commit 463547e03d38 · 2015-05-13T11:43:01.000+05:30
Update CodeMirror
diff --git a/src/editor/Editor.js b/src/editor/Editor.js
@@ -318,12 +318,13 @@ define(function (require, exports, module) {
             highlightSelectionMatches   : currentOptions[HIGHLIGHT_MATCHES],
             indentUnit                  : currentOptions[USE_TAB_CHAR] ? currentOptions[TAB_SIZE] : currentOptions[SPACE_UNITS],
             indentWithTabs              : currentOptions[USE_TAB_CHAR],
+            inputStyle                  : "textarea", // the "contenteditable" mode used on mobiles could cause issues
             lineNumbers                 : currentOptions[SHOW_LINE_NUMBERS],
             lineWrapping                : currentOptions[WORD_WRAP],
             matchBrackets               : { maxScanLineLength: 50000, maxScanLines: 1000 },
             matchTags                   : { bothTags: true },
-            showCursorWhenSelecting     : currentOptions[SHOW_CURSOR_SELECT],
             scrollPastEnd               : !range && currentOptions[SCROLL_PAST_END],
+            showCursorWhenSelecting     : currentOptions[SHOW_CURSOR_SELECT],
             smartIndent                 : currentOptions[SMART_INDENT],
             styleActiveLine             : currentOptions[STYLE_ACTIVE_LINE],
             tabSize                     : currentOptions[TAB_SIZE]
diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
@@ -864,7 +864,7 @@ define(function (require, exports, module) {
             var prevToken = "";
             while (token !== ";") {
                 // Skip tokens until the closing brace if we find an interpolated variable.
-                if (/#\{$/.test(token) || (token === "{" && /[#@]$/.test(prevToken))) {
+                if (/[#@]\{$/.test(token) || (token === "{" && /[#@]$/.test(prevToken))) {
                     _skipToClosingBracket("{");
                     if (token === "}") {
                         _nextToken();   // Skip the closing brace
@@ -911,9 +911,9 @@ define(function (require, exports, module) {
                     currentSelector += _skipToClosingBracket("{");
                     _nextToken();  // skip the closing brace
                 } else if (token === "}" &&
-                        (!currentSelector || /:\s*\S/.test(currentSelector) || !/#\{.+/.test(currentSelector))) {
+                        (!currentSelector || /:\s*\S/.test(currentSelector) || !/[#@]\{.+/.test(currentSelector))) {
                     // Either empty currentSelector or currentSelector is a CSS property
-                    // but not a selector that is in the form of #{$class}
+                    // but not a selector that is in the form of #{$class} or @{class}
                     return false;
                 }
                 // Clear currentSelector if we're in a property, but make sure we don't treat
diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2
@@ -1 +1 @@
-Subproject commit 6d8de27e7cf987015b52c44c6b5df97993ef3307
+Subproject commit d47bc479c8848e59049d50d95a9d89b29988be59
