选择器的name和class分开

army8735 · May 17, 2015 · 606cd09 · 606cd09
1 parent 30616a3
commit 606cd09
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homunculus",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "A lexer&parser by Javascript",
   "maintainers": [
     {

diff --git a/src/lexer/CssLexer.js b/src/lexer/CssLexer.js
@@ -287,6 +287,10 @@ var CssLexer = Lexer.extend(function(rule) {
               this.doc = false;
               break;
             case Token.SELECTOR:
+              if(this.value) {
+                token.cancel();
+                continue;
+              }
               this.sel = true;
               this.kw = false;
               this.number = false;

diff --git a/src/lexer/rule/CssRule.js b/src/lexer/rule/CssRule.js
diff --git a/tests/csslexer.js b/tests/csslexer.js
@@ -437,9 +437,8 @@ describe('csslexer', function() {
       it('filter', function() {
         var lexer = homunculus.getLexer('css');
         var tokens = lexer.parse('.a{filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);}');
-        expect(join(tokens)).to.eql(['.a', '{', 'filter', ':', ' ', 'progid', ':', 'DXImageTransform.Microsoft.gradient',
-          '(', 'enabled', ' ', '=', ' ', 'false', ')', ';', '}' ]);
-        expect(type(tokens)).to.eql([21, 8, 10, 8, 1, 5, 8, 5, 8, 15, 1, 8, 1, 15, 8, 8, 8]);
+        expect(join(tokens)).to.eql(['.a', '{', 'filter', ':', ' ', 'progid', ':', 'DXImageTransform', '.', 'Microsoft', '.', 'gradient', '(', 'enabled', ' ', '=', ' ', 'false', ')', ';', '}' ]);
+        expect(type(tokens)).to.eql([21, 8, 10, 8, 1, 5, 8, 5, 8, 5, 8, 5, 8, 15, 1, 8, 1, 15, 8, 8, 8]);
       });
       it('!ie like', function() {
         var lexer = homunculus.getLexer('css');

diff --git a/tests/cssparser.js b/tests/cssparser.js
@@ -596,6 +596,11 @@ describe('cssparser', function() {
       var node = parser.parse('_:-ms-fullscreen,:root input[type="date"],_:-ms-fullscreen{}');
       expect(tree(node)).to.eql([CssNode.SHEET,["_",CssNode.STYLESET,[CssNode.SELECTORS,[CssNode.SELECTOR,[":-ms-fullscreen"],",",CssNode.SELECTOR,[":root","input","[","type","=","\"date\"","]"],",",CssNode.SELECTOR,["_",":-ms-fullscreen"]],CssNode.BLOCK,["{","}"]]]]);
     });
+    it('selector both name and class', function() {
+      var parser = homunculus.getParser('css');
+      var node = parser.parse('a.a{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}');
+      expect(tree(node)).to.eql([CssNode.SHEET,[CssNode.STYLESET,[CssNode.SELECTORS,[CssNode.SELECTOR,["a",".a"]],CssNode.BLOCK,["{",CssNode.STYLE,[CssNode.KEY,["filter"],":",CssNode.VALUE,["progid",":","DXImageTransform",".","Microsoft",".",CssNode.BRACKET,["gradient","(","enabled","=","false",")"]]],"}"]]]]);
+    });
     it('pseudo first', function() {
       var parser = homunculus.getParser('css');
       var node = parser.parse(':hover{margin:0}');

diff --git a/web/lexer/CssLexer.js b/web/lexer/CssLexer.js
@@ -287,6 +287,10 @@ var CssLexer = Lexer.extend(function(rule) {
               this.doc = false;
               break;
             case Token.SELECTOR:
+              if(this.value) {
+                token.cancel();
+                continue;
+              }
               this.sel = true;
               this.kw = false;
               this.number = false;