Skip to content

using Slang API to ignore trivia nodes #1217

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

Closed
Janther wants to merge 2 commits into from
Closed

using Slang API to ignore trivia nodes #1217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4e3f1a
using Slang API to ignore trivia nodes
Janther Jul 24, 2025
07e74d3
`Edge[]` is already `Iterable<Edge>`
Janther Aug 12, 2025
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
31 changes: 12 additions & 19 deletions src/slang-nodes/SlangNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
import {
TerminalKind,
TerminalNode,
TerminalKindExtensions
TerminalKindExtensions,
TerminalNode
} from '@nomicfoundation/slang/cst';
import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js';
import { MultiLineComment } from '../slang-nodes/MultiLineComment.js';
import { MultiLineNatSpecComment } from '../slang-nodes/MultiLineNatSpecComment.js';
import { SingleLineComment } from '../slang-nodes/SingleLineComment.js';
import { SingleLineNatSpecComment } from '../slang-nodes/SingleLineNatSpecComment.js';

import type { Edge } from '@nomicfoundation/slang/cst';
import type { Edge, Node } from '@nomicfoundation/slang/cst';
import type { Comment, StrictAstNode } from '../slang-nodes/types.d.ts';
import type { AstLocation, SlangAstNode } from '../types.d.ts';

const isCommentOrWhiteSpace = createKindCheckFunction([
TerminalKind.MultiLineComment,
TerminalKind.MultiLineNatSpecComment,
TerminalKind.SingleLineComment,
TerminalKind.SingleLineNatSpecComment,
TerminalKind.EndOfLine,
TerminalKind.Whitespace
]);

const offsets = new Map<number, number>();
export function clearOffsets(): void {
offsets.clear();
Expand All @@ -41,10 +31,16 @@ function reversedIterator<T>(children: T[]): Iterable<T> {
};
}

function getOffset(children: Edge[] | Iterable<Edge>): number {
function isNonTriviaNode(node: Node): boolean {
return (
node.isNonterminalNode() || !TerminalKindExtensions.isTrivia(node.kind)
);
}

function getOffset(children: Iterable<Edge>): number {
let offset = 0;
for (const { node } of children) {
if (node.isNonterminalNode() || !isCommentOrWhiteSpace(node)) {
if (isNonTriviaNode(node)) {
// The node's content starts when we find the first non-terminal token,
// or if we find a non-comment, non-whitespace token.
return offset;
Expand Down Expand Up @@ -95,10 +91,7 @@ export class SlangNode {
let offset = initialOffset;

for (const { node } of children) {
if (
node.isNonterminalNode() ||
!TerminalKindExtensions.isTrivia(node.kind)
) {
if (isNonTriviaNode(node)) {
// Also tracking TerminalNodes since some variants that were not
// Identifier or YulIdentifier but were upgraded to TerminalNode
offsets.set(node.id, offset);
Expand Down
Loading