Merge pull request adobe#3947 from adobe/nj/issue-3726-new

jasonsanjose · jasonsanjose · commit ec2b3de3da4f · 2013-05-21T13:56:53.000-07:00
Add correct definition for SCSS mode. Remove check that mime mode is defined by given mode file.
diff --git a/src/language/LanguageManager.js b/src/language/LanguageManager.js
@@ -410,12 +410,6 @@ define(function (require, exports, module) {
                     result.reject("CodeMirror MIME mode \"" + mimeMode + "\" not found");
                     return;
                 }
-                
-                // modeConfig can be a string or mode object
-                if (modeConfig !== mode && modeConfig.name !== mode) {
-                    result.reject("CodeMirror MIME mode \"" + mimeMode + "\" does not belong to mode \"" + mode + "\"");
-                    return;
-                }
             }
             
             // This mode is now only about what to tell CodeMirror
diff --git a/src/language/languages.json b/src/language/languages.json
@@ -11,6 +11,14 @@
         "blockComment": ["/*", "*/"]
     },
     
+    "scss": {
+        "name": "SCSS",
+        "mode": ["css", "text/x-scss"],
+        "fileExtensions": ["scss"],
+        "blockComment": ["/*", "*/"],
+        "lineComment": ["//"]
+    },
+    
     "html": {
         "name": "HTML",
         "mode": ["htmlmixed", "text/x-brackets-html"],
@@ -118,7 +126,7 @@
     "sass": {
         "name": "SASS",
         "mode": "sass",
-        "fileExtensions": ["sass", "scss"]
+        "fileExtensions": ["sass"]
     },
 
     "lua": {

Original file line number	Diff line number	Diff line change
`@@ -410,12 +410,6 @@ define(function (require, exports, module) {`
`410`	`410`	`result.reject("CodeMirror MIME mode \"" + mimeMode + "\" not found");`
`411`	`411`	`return;`
`412`	`412`	`}`
`413`		`-`
`414`		`- // modeConfig can be a string or mode object`
`415`		`- if (modeConfig !== mode && modeConfig.name !== mode) {`
`416`		`- result.reject("CodeMirror MIME mode \"" + mimeMode + "\" does not belong to mode \"" + mode + "\"");`
`417`		`- return;`
`418`		`- }`
`419`	`413`	`}`
`420`	`414`
`421`	`415`	`// This mode is now only about what to tell CodeMirror`