[css-hint addon] Integrate

Author: marijnh

addon/hint/css-hint.js

@@ -4,7 +4,7 @@
   function getHints(cm) {
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
-    if (inner.mode.name != "css-base") return;
+    if (inner.mode.name != "css") return;
 
     // If it's not a 'word-style' token, ignore the token.
     if (!/^[\w$_-]*$/.test(token.string)) {

doc/compress.html

@@ -157,6 +157,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/fold/comment-fold.js">comment-fold.js</option>
           <option value="http://codemirror.net/addon/comment/continuecomment.js">continuecomment.js</option>
           <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>
+          <option value="http://codemirror.net/addon/hint/css-hint.js">css-hint.js</option>
           <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
           <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
           <option value="http://codemirror.net/addon/display/fullscreen.js">fullscreen.js</option>

doc/manual.html

@@ -2049,6 +2049,10 @@ <h2>Addons</h2>
       schema data. See
       the <a href="../demo/html5complete.html">demo</a>.</dd>
 
+      <dt id="addon_css-hint"><a href="../addon/hint/css-hint.js"><code>hint/css-hint.js</code></a></dt>
+      <dd>A minimal hinting function for CSS code.
+      Defines <code>CodeMirror.hint.css</code>.</dd>
+
       <dt id="addon_python-hint"><a href="../addon/hint/python-hint.js"><code>hint/python-hint.js</code></a></dt>
       <dd>A very simple hinting function for Python code.
       Defines <code>CodeMirror.hint.python</code>.</dd>

mode/css/css.js

@@ -1,10 +1,8 @@
-CodeMirror.defineMode("css", function(config) {
-  return CodeMirror.getMode(config, "text/css");
-});
-
-CodeMirror.defineMode("css-base", function(config, parserConfig) {
+CodeMirror.defineMode("css", function(config, parserConfig) {
   "use strict";
 
+  if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
+
   var indentUnit = config.indentUnit,
       hooks = parserConfig.hooks || {},
       atMediaTypes = parserConfig.atMediaTypes || {},
@@ -580,7 +578,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
         return false;
       }
     },
-    name: "css-base"
+    name: "css"
   });
 
   CodeMirror.defineMIME("text/x-scss", {
@@ -624,6 +622,6 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
         }
       }
     },
-    name: "css-base"
+    name: "css"
   });
 })();