Merge pull request #164 from adobe/randy/issue-163

Update for recent CodeMirror change for Sprint 36

Author: redmunds

cssModeSupport.js

@@ -35,20 +35,19 @@ define(function (require, exports, module) {
     }
 
     function isFontNameToken(t) {
-        return t.className === "variable-2" || t.className === "string-2";
+        return t.className === "variable" || t.className === "variable-2" || t.className === "string-2";
     }
 
     function isFontNameStringToken(t) {
         return t.className === "string";
     }
 
     function inRuleBody(t) {
-        var stateStack = t.state.stack || t.state.localState.stack;
+        var context = t.state.context || t.state.localState.context;
 
         return t.className !== "property" &&
             t.className !== "property error" &&
-            stateStack.length > 0 &&
-            stateStack[stateStack.length - 1] === "propertyValue";
+            context.type === "prop";
     }
 
     exports.isFontFamilyToken = isFontFamilyToken;

lessModeSupport.js

@@ -32,7 +32,6 @@ define(function (require, exports, module) {
     var webfont                 = require("webfont"),
         FontParser              = require("fontParser"),
         cssModeSupport          = require("cssModeSupport"),
-        lessModeSupport         = require("lessModeSupport"),
         ewfBrowseDialogHtml     = require("text!htmlContent/ewf-browse-dialog.html"),
         ewfIncludeDialogHtml    = require("text!htmlContent/ewf-include-dialog.html"),
         ewfHowtoDialogHtml      = require("text!htmlContent/ewf-howto-dialog.html"),
@@ -64,9 +63,8 @@ define(function (require, exports, module) {
     var PREFERENCES_CLIENT_ID = "com.adobe.edgewebfonts";
     var PREFERENCES_FONT_HISTORY_KEY = "ewf-font-history";
 
-    // Font parsers    
-    var cssParser   = new FontParser(cssModeSupport),
-        lessParser  = new FontParser(lessModeSupport);
+    // Font parser
+    var cssParser   = new FontParser(cssModeSupport);
 
     // Local variables
     var lastFontSelected = null;
@@ -92,7 +90,7 @@ define(function (require, exports, module) {
     function _supportedLanguage(language) {
         var name = language.getName();
 
-        return (name === "CSS" || name === "LESS");
+        return (name === "CSS" || name === "LESS" || name === "SCSS");
     }
 
     function _supportedDocument(doc) {
@@ -109,9 +107,9 @@ define(function (require, exports, module) {
 
         switch (name) {
         case "CSS":
-            return cssParser;
         case "LESS":
-            return lessParser;
+        case "SCSS":
+            return cssParser;
         default:
             throw new Error("Unsupported language: " + name);
         }
@@ -123,9 +121,9 @@ define(function (require, exports, module) {
 
         switch (name) {
         case "CSS":
-            return cssModeSupport;
         case "LESS":
-            return lessModeSupport;
+        case "SCSS":
+            return cssModeSupport;
         default:
             throw new Error("Unsupported language: " + name);
         }
@@ -507,7 +505,7 @@ define(function (require, exports, module) {
 
         // install autocomplete handler
         var fontHints = new FontHints();
-        CodeHintManager.registerHintProvider(fontHints, ["css", "less"], 1);
+        CodeHintManager.registerHintProvider(fontHints, ["css", "less", "scss"], 1);
 
         // load blank font
         ExtensionUtils.loadStyleSheet(module, "styles/adobe-blank.css");

main.js

@@ -2,7 +2,7 @@
     "name": "edge-code-web-fonts",
     "title": "Adobe Edge Web Fonts",
     "description": "Adobe Edge Web Fonts gives you access to a free, high-quality web font library made possible by contributions from Adobe, Google, and designers around the world. The fonts are served by Typekit, so you can be sure of high performance and stability.",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "keywords": [".css", ".html"],
     "homepage": "http://html.adobe.com/edge/webfonts/",
     "bugs": "https://github.com/adobe/brackets-edge-web-fonts/issues",
@@ -11,7 +11,7 @@
         "url" : "https://github.com/adobe/brackets-edge-web-fonts.git"
     },
     "engines": {
-        "brackets": ">=0.30.0"
+        "brackets": ">=0.36.0"
     },
     "keywords": [
         "css",