Merge pull request #4931 from adobe/rlim/hints-for-scss

redmunds · redmunds · commit 3ce6ae29fca6 · 2013-09-04T09:41:16.000-07:00
Show CSS code hints in SCSS mode.
diff --git a/src/extensions/default/CSSCodeHints/main.js b/src/extensions/default/CSSCodeHints/main.js
@@ -373,7 +373,7 @@ define(function (require, exports, module) {
     
     AppInit.appReady(function () {
         var cssPropHints = new CssPropHints();
-        CodeHintManager.registerHintProvider(cssPropHints, ["css"], 0);
+        CodeHintManager.registerHintProvider(cssPropHints, ["css", "scss"], 0);
         
         // For unit testing
         exports.cssPropHintProvider = cssPropHints;
diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
@@ -73,7 +73,7 @@ define(function (require, exports, module) {
         }
         
         lastToken = state.stack[state.stack.length - 1];
-        return (lastToken === "{" || lastToken === "rule");
+        return (lastToken === "{" || lastToken === "rule" || lastToken === "block");
     }
     
     /**
@@ -94,7 +94,9 @@ define(function (require, exports, module) {
         if (!state.stack || state.stack.length < 2) {
             return false;
         }
-        return (state.stack[state.stack.length - 1] === "propertyValue" && state.stack[state.stack.length - 2] === "rule");
+        return ((state.stack[state.stack.length - 1] === "propertyValue" &&
+                    (state.stack[state.stack.length - 2] === "rule" || state.stack[state.stack.length - 2] === "block")) ||
+                    (state.stack[state.stack.length - 1] === "(" && (state.stack[state.stack.length - 2] === "propertyValue")));
     }
     
     /**
@@ -450,7 +452,7 @@ define(function (require, exports, module) {
             mode = editor.getModeForSelection();
         
         // Check if this is inside a style block or in a css/less document.
-        if (mode !== "css" && mode !== "less") {
+        if (mode !== "css" && mode !== "text/x-scss" && mode !== "less") {
             return createInfo();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ define(function (require, exports, module) {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`lastToken = state.stack[state.stack.length - 1];`
`76`		`- return (lastToken === "{" \|\| lastToken === "rule");`
	`76`	`+ return (lastToken === "{" \|\| lastToken === "rule" \|\| lastToken === "block");`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/**`
`@@ -94,7 +94,9 @@ define(function (require, exports, module) {`
`94`	`94`	`if (!state.stack \|\| state.stack.length < 2) {`
`95`	`95`	`return false;`
`96`	`96`	`}`
`97`		`- return (state.stack[state.stack.length - 1] === "propertyValue" && state.stack[state.stack.length - 2] === "rule");`
	`97`	`+ return ((state.stack[state.stack.length - 1] === "propertyValue" &&`
	`98`	`+ (state.stack[state.stack.length - 2] === "rule" \|\| state.stack[state.stack.length - 2] === "block")) \|\|`
	`99`	`+ (state.stack[state.stack.length - 1] === "(" && (state.stack[state.stack.length - 2] === "propertyValue")));`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`/**`
`@@ -450,7 +452,7 @@ define(function (require, exports, module) {`
`450`	`452`	`mode = editor.getModeForSelection();`
`451`	`453`
`452`	`454`	`// Check if this is inside a style block or in a css/less document.`
`453`		`- if (mode !== "css" && mode !== "less") {`
	`455`	`+ if (mode !== "css" && mode !== "text/x-scss" && mode !== "less") {`
`454`	`456`	`return createInfo();`
`455`	`457`	`}`
`456`	`458`