don't calculate leading and trailing offsets for hub nodes

Janther · Janther · commit 09b913f25aac · 2024-08-15T20:16:33.000+12:00
diff --git a/src/slang-nodes/ArrayValues.ts b/src/slang-nodes/ArrayValues.ts
@@ -24,7 +24,7 @@ export class ArrayValues implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/AssemblyFlags.ts b/src/slang-nodes/AssemblyFlags.ts
@@ -24,7 +24,7 @@ export class AssemblyFlags implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/CallOptions.ts b/src/slang-nodes/CallOptions.ts
@@ -27,7 +27,7 @@ export class CallOptions implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/CatchClauses.ts b/src/slang-nodes/CatchClauses.ts
@@ -24,7 +24,7 @@ export class CatchClauses implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/ConstructorAttributes.ts b/src/slang-nodes/ConstructorAttributes.ts
@@ -25,7 +25,7 @@ export class ConstructorAttributes implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/ContractMembers.ts b/src/slang-nodes/ContractMembers.ts
@@ -27,7 +27,7 @@ export class ContractMembers implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/EnumMembers.ts b/src/slang-nodes/EnumMembers.ts
@@ -22,7 +22,7 @@ export class EnumMembers implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.EnumMembers, offset: number) {
-    const metadata = getNodeMetadata(ast, offset);
+    const metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/ErrorParameters.ts b/src/slang-nodes/ErrorParameters.ts
@@ -24,7 +24,7 @@ export class ErrorParameters implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/EventParameters.ts b/src/slang-nodes/EventParameters.ts
@@ -24,7 +24,7 @@ export class EventParameters implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/FallbackFunctionAttributes.ts b/src/slang-nodes/FallbackFunctionAttributes.ts
@@ -25,7 +25,7 @@ export class FallbackFunctionAttributes implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/FunctionAttributes.ts b/src/slang-nodes/FunctionAttributes.ts
@@ -25,7 +25,7 @@ export class FunctionAttributes implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/FunctionTypeAttributes.ts b/src/slang-nodes/FunctionTypeAttributes.ts
@@ -20,7 +20,7 @@ export class FunctionTypeAttributes implements SlangNode {
   items: FunctionTypeAttribute[];
 
   constructor(ast: ast.FunctionTypeAttributes, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/HexStringLiterals.ts b/src/slang-nodes/HexStringLiterals.ts
@@ -24,7 +24,7 @@ export class HexStringLiterals implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/IdentifierPath.ts b/src/slang-nodes/IdentifierPath.ts
@@ -18,7 +18,7 @@ export class IdentifierPath implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.IdentifierPath, offset: number) {
-    const metadata = getNodeMetadata(ast, offset);
+    const metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/ImportDeconstructionSymbols.ts b/src/slang-nodes/ImportDeconstructionSymbols.ts
@@ -25,7 +25,7 @@ export class ImportDeconstructionSymbols implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.ImportDeconstructionSymbols, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/InheritanceTypes.ts b/src/slang-nodes/InheritanceTypes.ts
@@ -27,7 +27,7 @@ export class InheritanceTypes implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/InterfaceMembers.ts b/src/slang-nodes/InterfaceMembers.ts
@@ -26,7 +26,7 @@ export class InterfaceMembers implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/LibraryMembers.ts b/src/slang-nodes/LibraryMembers.ts
@@ -26,7 +26,7 @@ export class LibraryMembers implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/ModifierAttributes.ts b/src/slang-nodes/ModifierAttributes.ts
@@ -20,7 +20,7 @@ export class ModifierAttributes implements SlangNode {
   items: ModifierAttribute[];
 
   constructor(ast: ast.ModifierAttributes, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/NamedArguments.ts b/src/slang-nodes/NamedArguments.ts
@@ -27,7 +27,7 @@ export class NamedArguments implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/OverridePaths.ts b/src/slang-nodes/OverridePaths.ts
@@ -19,7 +19,7 @@ export class OverridePaths implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.OverridePaths, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/Parameters.ts b/src/slang-nodes/Parameters.ts
@@ -26,7 +26,7 @@ export class Parameters implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/PositionalArguments.ts b/src/slang-nodes/PositionalArguments.ts
@@ -26,7 +26,7 @@ export class PositionalArguments implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/ReceiveFunctionAttributes.ts b/src/slang-nodes/ReceiveFunctionAttributes.ts
@@ -25,7 +25,7 @@ export class ReceiveFunctionAttributes implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/SourceUnitMembers.ts b/src/slang-nodes/SourceUnitMembers.ts
@@ -22,7 +22,7 @@ export class SourceUnitMembers implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/StateVariableAttributes.ts b/src/slang-nodes/StateVariableAttributes.ts
@@ -20,7 +20,7 @@ export class StateVariableAttributes implements SlangNode {
   items: StateVariableAttribute[];
 
   constructor(ast: ast.StateVariableAttributes, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/Statements.ts b/src/slang-nodes/Statements.ts
@@ -27,7 +27,7 @@ export class Statements implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/StringLiterals.ts b/src/slang-nodes/StringLiterals.ts
@@ -24,7 +24,7 @@ export class StringLiterals implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/StructMembers.ts b/src/slang-nodes/StructMembers.ts
@@ -25,7 +25,7 @@ export class StructMembers implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/TupleDeconstructionElements.ts b/src/slang-nodes/TupleDeconstructionElements.ts
@@ -24,7 +24,7 @@ export class TupleDeconstructionElements implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/TupleValues.ts b/src/slang-nodes/TupleValues.ts
@@ -25,7 +25,7 @@ export class TupleValues implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/UnicodeStringLiterals.ts b/src/slang-nodes/UnicodeStringLiterals.ts
@@ -24,7 +24,7 @@ export class UnicodeStringLiterals implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/UnnamedFunctionAttributes.ts b/src/slang-nodes/UnnamedFunctionAttributes.ts
@@ -25,7 +25,7 @@ export class UnnamedFunctionAttributes implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/UsingDeconstructionSymbols.ts b/src/slang-nodes/UsingDeconstructionSymbols.ts
@@ -23,7 +23,7 @@ export class UsingDeconstructionSymbols implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.UsingDeconstructionSymbols, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/VersionExpressionSet.ts b/src/slang-nodes/VersionExpressionSet.ts
@@ -19,7 +19,7 @@ export class VersionExpressionSet implements SlangNode {
   items: VersionExpression[];
 
   constructor(ast: ast.VersionExpressionSet, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/VersionExpressionSets.ts b/src/slang-nodes/VersionExpressionSets.ts
@@ -18,7 +18,7 @@ export class VersionExpressionSets implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.VersionExpressionSets, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/VersionSpecifiers.ts b/src/slang-nodes/VersionSpecifiers.ts
@@ -17,7 +17,7 @@ export class VersionSpecifiers implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.VersionSpecifiers, offset: number) {
-    const metadata = getNodeMetadata(ast, offset);
+    const metadata = getNodeMetadata(ast, offset, true);
 
     this.items = ast.items.map((item) => item.text);
     this.separators = ast.separators.map((separator) => separator.text);
diff --git a/src/slang-nodes/YulArguments.ts b/src/slang-nodes/YulArguments.ts
@@ -24,7 +24,7 @@ export class YulArguments implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/YulParameters.ts b/src/slang-nodes/YulParameters.ts
@@ -19,7 +19,7 @@ export class YulParameters implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.YulParameters, offset: number) {
-    const metadata = getNodeMetadata(ast, offset);
+    const metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/YulPath.ts b/src/slang-nodes/YulPath.ts
@@ -18,7 +18,7 @@ export class YulPath implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.YulPath, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/YulPaths.ts b/src/slang-nodes/YulPaths.ts
@@ -18,7 +18,7 @@ export class YulPaths implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.YulPaths, offset: number) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/YulStatements.ts b/src/slang-nodes/YulStatements.ts
@@ -27,7 +27,7 @@ export class YulStatements implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/YulSwitchCases.ts b/src/slang-nodes/YulSwitchCases.ts
@@ -24,7 +24,7 @@ export class YulSwitchCases implements SlangNode {
     offset: number,
     options: ParserOptions<AstNode>
   ) {
-    let metadata = getNodeMetadata(ast, offset);
+    let metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-nodes/YulVariableNames.ts b/src/slang-nodes/YulVariableNames.ts
@@ -22,7 +22,7 @@ export class YulVariableNames implements SlangNode {
   separators: string[];
 
   constructor(ast: ast.YulVariableNames, offset: number) {
-    const metadata = getNodeMetadata(ast, offset);
+    const metadata = getNodeMetadata(ast, offset, true);
     const { offsets } = metadata;
 
     this.items = ast.items.map(
diff --git a/src/slang-utils/metadata.ts b/src/slang-utils/metadata.ts
diff --git a/tests/format/EnumDefinitions/EnumDefinitions.sol b/tests/format/EnumDefinitions/EnumDefinitions.sol
diff --git a/tests/format/EnumDefinitions/__snapshots__/format.test.js.snap b/tests/format/EnumDefinitions/__snapshots__/format.test.js.snap
diff --git a/tests/format/Tuples/Tuples.sol b/tests/format/Tuples/Tuples.sol
diff --git a/tests/format/Tuples/__snapshots__/format.test.js.snap b/tests/format/Tuples/__snapshots__/format.test.js.snap
