Skip to content

Fix for #513 - _ParseBinaryExpr builds a node whose range excludes it's children #514

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

Merged
Martin Aeschlimann (aeschli) merged 2 commits into from
Sep 8, 2026
Merged

Fix for #513 - _ParseBinaryExpr builds a node whose range excludes it's children #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
881562b
fixed parser overshoot because the scan marker set's the current loca…
vibbix Sep 4, 2026
25b4b49
- cleaned up newline
vibbix Sep 4, 2026
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
6 changes: 6 additions & 0 deletions src/parser/cssParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2012,6 +2012,12 @@ export class Parser {
public _parseBinaryExpr(preparsedLeft?: nodes.BinaryExpression, preparsedOper?: nodes.Node): nodes.BinaryExpression | null {
let node = this.create(nodes.BinaryExpression);

// fixes a overshoot later, where the operand token starts at current spot
// instead of backtracking to the beginning of the previous
if (preparsedLeft) {
node.offset = preparsedLeft.offset;
}

if (!node.setLeft((<nodes.Node>preparsedLeft || this._parseTerm()))) {
return null;
}
Expand Down
20 changes: 20 additions & 0 deletions src/test/css/parser.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ export function assertError(text: string, parser: Parser, f: () => nodes.Node |

}

export function assertType(text: string, parser: Parser, nodeType: nodes.NodeType, f: () => nodes.Node | null) {
const node = parser.internalParse(text, f)!;
assert.ok(node !== null, 'no node returned');
const targetNode = node.findChildAtOffset(text.indexOf("--x") + 1, true)!;
assert.equal(nodes.NodeType[targetNode.type], nodes.NodeType[nodes.NodeType.Identifier]);
}

suite('CSS - Parser', () => {

test('stylesheet', function () {
Expand Down Expand Up @@ -701,4 +708,17 @@ suite('CSS - Parser', () => {
assertError('url(http://msft.com\')', parser, parser._parseURILiteral.bind(parser), ParseError.RightParenthesisExpected);
});

test('nested identifier', function() {
const parser = new Parser();
assertType("calc(100% - var(--x))", parser, nodes.NodeType.Identifier, parser._parseExpr.bind(parser));;
assertType("calc(100% - 2 * var(--x))", parser, nodes.NodeType.Identifier, parser._parseExpr.bind(parser));;
assertType("calc(1 + 2 + var(--x))", parser, nodes.NodeType.Identifier, parser._parseExpr.bind(parser));;
assertType("calc((100% - var(--x)) * 2)", parser, nodes.NodeType.Identifier, parser._parseExpr.bind(parser));;
// no longer fail
assertType("calc(2 * var(--x) + 1)", parser, nodes.NodeType.Identifier, parser._parseExpr.bind(parser));;
assertType("calc(var(--x) * 2 / 3)", parser, nodes.NodeType.Identifier, parser._parseExpr.bind(parser));;
assertType("calc(-1 * var(--x) + 1 * 2)", parser, nodes.NodeType.Identifier, parser._parseExpr.bind(parser));;
assertType("calc((100% - var(--x)) * 2 / 3)", parser, nodes.NodeType.Identifier, parser._parseExpr.bind(parser));;
});

});