Skip to content

Commit 5da487a

Browse files
committed
prettier could be run in parallel, this should add a layer of safety for those cases.
1 parent 0b5210c commit 5da487a

224 files changed

Lines changed: 637 additions & 504 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/slang-nodes/AbicoderPragma.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ import { SlangNode } from './SlangNode.js';
33
import { AbicoderVersion } from './AbicoderVersion.js';
44

55
import type * as ast from '@nomicfoundation/slang/ast';
6-
import type { AstPath, Doc } from 'prettier';
6+
import type { AstPath, Doc, ParserOptions } from 'prettier';
77
import type { PrintFunction } from '../types.d.ts';
8+
import type { AstNode } from './types.ts';
89

910
export class AbicoderPragma extends SlangNode {
1011
readonly kind = NonterminalKind.AbicoderPragma;
1112

1213
version: AbicoderVersion;
1314

14-
constructor(ast: ast.AbicoderPragma) {
15-
super(ast);
15+
constructor(ast: ast.AbicoderPragma, options: ParserOptions<AstNode>) {
16+
super(ast, options);
1617

17-
this.version = new AbicoderVersion(ast.version);
18+
this.version = new AbicoderVersion(ast.version, options);
1819
}
1920

2021
print(path: AstPath<AbicoderPragma>, print: PrintFunction): Doc {

src/slang-nodes/AbicoderVersion.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ import { NonterminalKind } from '@nomicfoundation/slang/cst';
22
import { SlangNode } from './SlangNode.js';
33

44
import type * as ast from '@nomicfoundation/slang/ast';
5-
import type { Doc } from 'prettier';
5+
import type { Doc, ParserOptions } from 'prettier';
6+
import type { AstNode } from './types.ts';
67

78
export class AbicoderVersion extends SlangNode {
89
readonly kind = NonterminalKind.AbicoderVersion;
910

1011
variant: string;
1112

12-
constructor(ast: ast.AbicoderVersion) {
13-
super(ast);
13+
constructor(ast: ast.AbicoderVersion, options: ParserOptions<AstNode>) {
14+
super(ast, options);
1415

1516
this.variant = ast.variant.unparse();
1617
}

src/slang-nodes/AdditiveExpression.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class AdditiveExpression extends SlangNode {
3636
rightOperand: Expression['variant'];
3737

3838
constructor(ast: ast.AdditiveExpression, options: ParserOptions<AstNode>) {
39-
super(ast);
39+
super(ast, options);
4040

4141
this.leftOperand = extractVariant(new Expression(ast.leftOperand, options));
4242
this.operator = ast.operator.unparse();

src/slang-nodes/AddressType.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ import { NonterminalKind } from '@nomicfoundation/slang/cst';
22
import { SlangNode } from './SlangNode.js';
33

44
import type * as ast from '@nomicfoundation/slang/ast';
5-
import type { Doc } from 'prettier';
5+
import type { Doc, ParserOptions } from 'prettier';
6+
import type { AstNode } from './types.ts';
67

78
export class AddressType extends SlangNode {
89
readonly kind = NonterminalKind.AddressType;
910

1011
payableKeyword?: string;
1112

12-
constructor(ast: ast.AddressType) {
13-
super(ast);
13+
constructor(ast: ast.AddressType, options: ParserOptions<AstNode>) {
14+
super(ast, options);
1415

1516
this.payableKeyword = ast.payableKeyword?.unparse();
1617
}

src/slang-nodes/AndExpression.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class AndExpression extends SlangNode {
1919
rightOperand: Expression['variant'];
2020

2121
constructor(ast: ast.AndExpression, options: ParserOptions<AstNode>) {
22-
super(ast);
22+
super(ast, options);
2323

2424
this.leftOperand = extractVariant(new Expression(ast.leftOperand, options));
2525
this.operator = ast.operator.unparse();

src/slang-nodes/ArgumentsDeclaration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class ArgumentsDeclaration extends SlangNode {
2727
variant: PositionalArgumentsDeclaration | NamedArgumentsDeclaration;
2828

2929
constructor(ast: ast.ArgumentsDeclaration, options: ParserOptions<AstNode>) {
30-
super(ast);
30+
super(ast, options);
3131

3232
this.variant = createNonterminalVariant(ast.variant, options);
3333

src/slang-nodes/ArrayExpression.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class ArrayExpression extends SlangNode {
1313
items: ArrayValues;
1414

1515
constructor(ast: ast.ArrayExpression, options: ParserOptions<AstNode>) {
16-
super(ast);
16+
super(ast, options);
1717

1818
this.items = new ArrayValues(ast.items, options);
1919
}

src/slang-nodes/ArrayTypeName.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class ArrayTypeName extends SlangNode {
1717
index?: Expression['variant'];
1818

1919
constructor(ast: ast.ArrayTypeName, options: ParserOptions<AstNode>) {
20-
super(ast);
20+
super(ast, options);
2121

2222
this.operand = extractVariant(new TypeName(ast.operand, options));
2323
if (ast.index) {

src/slang-nodes/ArrayValues.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class ArrayValues extends SlangNode {
1515
items: Expression['variant'][];
1616

1717
constructor(ast: ast.ArrayValues, options: ParserOptions<AstNode>) {
18-
super(ast, true);
18+
super(ast, options, true);
1919

2020
this.items = ast.items.map((item) =>
2121
extractVariant(new Expression(item, options))

src/slang-nodes/AssemblyFlags.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class AssemblyFlags extends SlangNode {
1414
items: StringLiteral[];
1515

1616
constructor(ast: ast.AssemblyFlags, options: ParserOptions<AstNode>) {
17-
super(ast, true);
17+
super(ast, options, true);
1818

1919
this.items = ast.items.map((item) => new StringLiteral(item, options));
2020
}

0 commit comments

Comments
 (0)