Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show specificity in a css selector hover. #129

Merged
merged 7 commits into from
Oct 29, 2018
Merged

Show specificity in a css selector hover. #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4be7312
WIP: First attempt at showing specificity in a css selector hover.
Ragnoroct Oct 25, 2018
4c4f873
Move specificity code into selectorPrinting and remove the first score
Ragnoroct Oct 25, 2018
9288b68
Implement custom function to calculate specificity
Ragnoroct Oct 27, 2018
c0ebd40
Fix tests
Ragnoroct Oct 27, 2018
892b389
Add tests for selector hover specificities
Ragnoroct Oct 27, 2018
fe392de
Fix typo
kumarharsh Oct 28, 2018
488d76b
Fix typo
kumarharsh Oct 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/services/cssHover.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class CSSHover {

constructor() {
}

public doHover(document: TextDocument, position: Position, stylesheet: nodes.Stylesheet): Hover {

function getRange(node: nodes.Node) {
Expand Down
50 changes: 48 additions & 2 deletions src/services/selectorPrinting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,14 +310,60 @@ function unescape(content: string) {
return content;
}

function selectorToSpecifityMarkedString(node: nodes.Node): MarkedString {
//https://www.w3.org/TR/selectors-3/#specificity
function calculateScore(node: nodes.Node) {
node.getChildren().forEach(element => {
switch(element.type) {
case nodes.NodeType.IdentifierSelector:
specificity[0] += 1; //a
break;
case nodes.NodeType.ClassSelector:
case nodes.NodeType.AttributeSelector:
specificity[1] += 1; //b
break;
case nodes.NodeType.ElementNameSelector:
//ignore universal selector
if (element.getText() === "*") {
break;
}
specificity[2] += 1; //c
break;
case nodes.NodeType.PseudoSelector:
if (element.getText().match(/^::/)) {
specificity[2] += 1; //c (pseudo element)
} else {
//ignore psuedo class NOT
if (element.getText().match(/^:not/i)) {
break;
}
specificity[1] += 1; //b (pseudo class)
}
break;
}
if (element.getChildren().length > 0) {
calculateScore(element);
}
});
}

let specificity = [0, 0, 0]; //a,b,c
calculateScore(node);
return { language: 'text', value: "Specificity: " + specificity.join(",") };
}

export function selectorToMarkedString(node: nodes.Selector): MarkedString[] {
let root = selectorToElement(node);
return new MarkedStringPrinter('"').print(root);
let markedStrings = new MarkedStringPrinter('"').print(root);
markedStrings.push(selectorToSpecifityMarkedString(node));
return markedStrings;
}

export function simpleSelectorToMarkedString(node: nodes.SimpleSelector): MarkedString[] {
let element = toElement(node);
return new MarkedStringPrinter('"').print(element);
let markedStrings = new MarkedStringPrinter('"').print(element);
markedStrings.push(selectorToSpecifityMarkedString(node));
return markedStrings;
}

class SelectorElementBuilder {
Expand Down
48 changes: 41 additions & 7 deletions src/test/css/selectorPrinting.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,56 @@ suite('CSS - MarkedStringPrinter selectors', () => {

test('descendant selector', function () {
let p = new Parser();
parseSelectorToMarkedString(p, 'e1 e2 { }', 'e1', [{ language: 'html', value: '<e1>\n …\n <e2>' }]);
parseSelectorToMarkedString(p, 'e1 .div { }', 'e1', [{ language: 'html', value: '<e1>\n …\n <element class="div">' }]);
parseSelectorToMarkedString(p, 'e1 e2 { }', 'e1', [{ language: 'html', value: '<e1>\n …\n <e2>' }, { language: 'text', value: 'Specificity: 0,0,2'}]);
parseSelectorToMarkedString(p, 'e1 .div { }', 'e1', [{ language: 'html', value: '<e1>\n …\n <element class="div">' }, { language: 'text', value: 'Specificity: 0,1,1'}]);
});
test('child selector', function () {
let p = new Parser();
parseSelectorToMarkedString(p, 'e1 > e2 { }', 'e2', [{ language: 'html', value: '<e1>\n <e2>' }]);
parseSelectorToMarkedString(p, 'e1 > e2 { }', 'e2', [{ language: 'html', value: '<e1>\n <e2>' }, { language: 'text', value: 'Specificity: 0,0,2'}]);
});
test('group selector', function () {
let p = new Parser();
parseSelectorToMarkedString(p, 'e1, e2 { }', 'e1', [{ language: 'html', value: '<e1>' }]);
parseSelectorToMarkedString(p, 'e1, e2 { }', 'e2', [{ language: 'html', value: '<e2>' }]);
parseSelectorToMarkedString(p, 'e1, e2 { }', 'e1', [{ language: 'html', value: '<e1>' }, { language: 'text', value: 'Specificity: 0,0,1'}]);
parseSelectorToMarkedString(p, 'e1, e2 { }', 'e2', [{ language: 'html', value: '<e2>' }, { language: 'text', value: 'Specificity: 0,0,1'}]);
});
test('sibling selector', function () {
let p = new Parser();
parseSelectorToMarkedString(p, 'e1 + e2 { }', 'e2', [{ language: 'html', value: '<e1>\n<e2>' }]);
parseSelectorToMarkedString(p, 'e1 ~ e2 { }', 'e2', [{ language: 'html', value: '<e1>\n<e2>\n⋮\n<e2>' }]);
parseSelectorToMarkedString(p, 'e1 + e2 { }', 'e2', [{ language: 'html', value: '<e1>\n<e2>' }, { language: 'text', value: 'Specificity: 0,0,2'}]);
parseSelectorToMarkedString(p, 'e1 ~ e2 { }', 'e2', [{ language: 'html', value: '<e1>\n<e2>\n⋮\n<e2>' }, { language: 'text', value: 'Specificity: 0,0,2'}]);
});
});

suite('CSS - MarkedStringPrinter selectors specificities', () => {
let p = new Parser();
test('attribute selector', function() {
parseSelectorToMarkedString(p, 'h1 + *[rel=up]', 'h1', [{ language: 'html', value: '<h1>\n<element rel="up">' }, { language: 'text', value: 'Specificity: 0,1,1' }]);
});

test('class selector', function() {
parseSelectorToMarkedString(p, 'ul ol li.red', 'ul', [{ language: 'html', value: '<ul>\n …\n <ol>\n …\n <li class="red">' }, { language: 'text', value: 'Specificity: 0,1,3' }]);
parseSelectorToMarkedString(p, 'li.red.level', 'li', [{ language: 'html', value: '<li class="red level">' }, { language: 'text', value: 'Specificity: 0,2,1' }]);
});

test('pseudo class selector', function() {
parseSelectorToMarkedString(p, 'p:focus', 'p', [{ language: 'html', value: '<p :focus>' }, { language: 'text', value: 'Specificity: 0,1,1' }]);
});

test('element selector', function() {
parseSelectorToMarkedString(p, 'li', 'li', [{ language: 'html', value: '<li>' }, { language: 'text', value: 'Specificity: 0,0,1' }]);
parseSelectorToMarkedString(p, 'ul li', 'ul', [{ language: 'html', value: '<ul>\n …\n <li>' }, { language: 'text', value: 'Specificity: 0,0,2' }]);
parseSelectorToMarkedString(p, 'ul ol+li', 'ul', [{ language: 'html', value: '<ul>\n …\n <ol>\n <li>' }, { language: 'text', value: 'Specificity: 0,0,3' }]);
});

test('pseudo element selector', function() {
parseSelectorToMarkedString(p, 'p::after', 'p', [{ language: 'html', value: '<p ::after>' }, { language: 'text', value: 'Specificity: 0,0,2' }]);
});

test('identifier selector', function() {
parseSelectorToMarkedString(p, '#x34y', '#x34y', [{ language: 'html', value: '<element id="x34y">' }, { language: 'text', value: 'Specificity: 1,0,0' }]);
});

test('ignore universal and not selector', function() {
parseSelectorToMarkedString(p, '*', '*', [{ language: 'html', value: '<element>' }, { language: 'text', value: 'Specificity: 0,0,0' }]);
parseSelectorToMarkedString(p, '#s12:not(foo)', '#s12', [{ language: 'html', value: '<element id="s12" :not>' }, { language: 'text', value: 'Specificity: 1,0,1' }]);
});
});