Skip to content

Commit cfe9bf7

Browse files
fvictoriofvictorio
authored
Merge pull request #1126 from prettier-solidity/rename-parsers
Rename parsers
2 parents 91cbfc5 + 81ef86e commit cfe9bf7

File tree

123 files changed

+188
-188
lines changed

Some content is hidden

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

123 files changed

+188
-188
lines changed

‎README.md

Lines changed: 5 additions & 5 deletions

‎src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import type {
1818
} from 'prettier';
1919
import type { AstNode } from './slang-nodes/types.d.ts';
2020

21-
const slangParserId = 'slang-solidity';
22-
const antlrParserId = 'solidity-parse';
21+
const slangParserId = 'slang';
22+
const antlrParserId = 'antlr';
2323
const slangAstId = 'slang-ast';
24-
const antlrAstId = 'solidity-ast';
24+
const antlrAstId = 'antlr-ast';
2525

2626
// https://prettier.io/docs/en/plugins.html#languages
2727
// https://github.com/github-linguist/linguist/blob/master/lib/linguist/languages.yml

‎src/printer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function once(factory) {
1818

1919
const warnDeprecation = once(() => {
2020
printWarning(
21-
`'solidity-parse' has been deprecated, please use 'slang-solidity'.`
21+
`The 'antlr' parser has been deprecated, please use 'slang' instead.`
2222
);
2323
return true;
2424
});

‎tests/config/run-format-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ async function runTest({
322322
}
323323

324324
if (
325-
formatOptions.parser === "slang-solidity" &&
325+
formatOptions.parser === "slang" &&
326326
!isAntlrMismatch(filename, formatOptions)
327327
) {
328328
// Compare with ANTLR's format
@@ -335,7 +335,7 @@ async function runTest({
335335
compiler:
336336
formatOptions.compiler ||
337337
createParser(code, formatOptions)[0].languageVersion,
338-
parser: "solidity-parse",
338+
parser: "antlr",
339339
plugins: await getPlugins(),
340340
});
341341
expect(antlrOutput).toEqual(formatResult.output);

‎tests/format/AddressPayable/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`AddressPayable.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/AddressPayable/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/AllSolidityFeatures/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`AllSolidityFeatures.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/AllSolidityFeatures/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/AllSolidityFeaturesV0.4.26/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`AllSolidityFeatures.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/AllSolidityFeaturesV0.4.26/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/Arrays/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Arrays.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/Arrays/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/Assembly/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Assembly.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/Assembly/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/AssemblyV0.4.26/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Assembly.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/AssemblyV0.4.26/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/BasicIterator/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`BasicIterator.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/BasicIterator/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/BinaryOperationHierarchy/__snapshots__/format.test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Group.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================
@@ -1317,7 +1317,7 @@ contract Group {
13171317
13181318
exports[`Indent.sol format 1`] = `
13191319
====================================options=====================================
1320-
parsers: ["slang-solidity"]
1320+
parsers: ["slang"]
13211321
printWidth: 80
13221322
| printWidth
13231323
=====================================input======================================

‎tests/format/BinaryOperationHierarchy/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/BinaryOperators/__snapshots__/format.test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`BinaryOperators.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================
@@ -687,7 +687,7 @@ contract LogicalOperators {
687687

688688
exports[`Parentheses.sol format 1`] = `
689689
====================================options=====================================
690-
parsers: ["slang-solidity"]
690+
parsers: ["slang"]
691691
printWidth: 80
692692
| printWidth
693693
=====================================input======================================

‎tests/format/BinaryOperators/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/BreakingChangesV0.7.4/__snapshots__/format.test.js.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ exports[`BreakingChangesV0.7.4.sol - {"compiler":"0.7.3","bracketSpacing":true}
44
====================================options=====================================
55
bracketSpacing: true
66
compiler: "0.7.3"
7-
parsers: ["slang-solidity"]
7+
parsers: ["slang"]
88
printWidth: 80
99
| printWidth
1010
=====================================input======================================
@@ -35,7 +35,7 @@ import { symbol1 as alias1, symbol2 as alias2, symbol3 as alias3, symbol4 } from
3535
exports[`BreakingChangesV0.7.4.sol - {"compiler":"0.7.3"} format 1`] = `
3636
====================================options=====================================
3737
compiler: "0.7.3"
38-
parsers: ["slang-solidity"]
38+
parsers: ["slang"]
3939
printWidth: 80
4040
| printWidth
4141
=====================================input======================================
@@ -67,7 +67,7 @@ exports[`BreakingChangesV0.7.4.sol - {"compiler":"0.7.4","bracketSpacing":true}
6767
====================================options=====================================
6868
bracketSpacing: true
6969
compiler: "0.7.4"
70-
parsers: ["slang-solidity"]
70+
parsers: ["slang"]
7171
printWidth: 80
7272
| printWidth
7373
=====================================input======================================
@@ -103,7 +103,7 @@ import {
103103
exports[`BreakingChangesV0.7.4.sol - {"compiler":"0.7.4"} format 1`] = `
104104
====================================options=====================================
105105
compiler: "0.7.4"
106-
parsers: ["slang-solidity"]
106+
parsers: ["slang"]
107107
printWidth: 80
108108
| printWidth
109109
=====================================input======================================

‎tests/format/BreakingChangesV0.7.4/format.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
runFormatTest(import.meta, ['slang-solidity'], { compiler: '0.7.4' });
2-
runFormatTest(import.meta, ['slang-solidity'], {
1+
runFormatTest(import.meta, ['slang'], { compiler: '0.7.4' });
2+
runFormatTest(import.meta, ['slang'], {
33
compiler: '0.7.4',
44
bracketSpacing: true
55
});
6-
runFormatTest(import.meta, ['slang-solidity'], { compiler: '0.7.3' });
7-
runFormatTest(import.meta, ['slang-solidity'], {
6+
runFormatTest(import.meta, ['slang'], { compiler: '0.7.3' });
7+
runFormatTest(import.meta, ['slang'], {
88
compiler: '0.7.3',
99
bracketSpacing: true
1010
});

‎tests/format/BreakingChangesV0.8.0/__snapshots__/format.test.js.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`BreakingChangesV0.8.0.sol - {"compiler":"0.7.0"} format 1`] = `
44
====================================options=====================================
55
compiler: "0.7.0"
6-
parsers: ["slang-solidity"]
6+
parsers: ["slang"]
77
printWidth: 80
88
| printWidth
99
=====================================input======================================
@@ -91,7 +91,7 @@ contract BreakingChangesV080 {
9191
exports[`BreakingChangesV0.8.0.sol - {"compiler":"0.8.0"} format 1`] = `
9292
====================================options=====================================
9393
compiler: "0.8.0"
94-
parsers: ["solidity-parse"]
94+
parsers: ["antlr"]
9595
printWidth: 80
9696
| printWidth
9797
=====================================input======================================
@@ -178,7 +178,7 @@ contract BreakingChangesV080 {
178178

179179
exports[`BreakingChangesV0.8.0.sol format 1`] = `
180180
====================================options=====================================
181-
parsers: ["solidity-parse"]
181+
parsers: ["antlr"]
182182
printWidth: 80
183183
| printWidth
184184
=====================================input======================================

‎tests/format/BreakingChangesV0.8.0/format.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
runFormatTest(import.meta, ['solidity-parse']);
2-
runFormatTest(import.meta, ['solidity-parse'], { compiler: '0.8.0' });
3-
runFormatTest(import.meta, ['slang-solidity'], { compiler: '0.7.0' });
1+
runFormatTest(import.meta, ['antlr']);
2+
runFormatTest(import.meta, ['antlr'], { compiler: '0.8.0' });
3+
runFormatTest(import.meta, ['slang'], { compiler: '0.7.0' });

‎tests/format/Comments/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Comments.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/Comments/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/Conditional/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Conditional.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/Conditional/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/Constructors/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Constructors.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/Constructors/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/ConstructorsV0.4.26/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Constructors.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/ConstructorsV0.4.26/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/ContractDefinitions/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`ContractDefinitions.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/ContractDefinitions/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/CustomErrors/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`CustomErrors.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/CustomErrors/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/EnumDefinitions/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`EnumDefinitions.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/EnumDefinitions/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

‎tests/format/Etc/__snapshots__/format.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Etc.sol format 1`] = `
44
====================================options=====================================
5-
parsers: ["slang-solidity"]
5+
parsers: ["slang"]
66
printWidth: 80
77
| printWidth
88
=====================================input======================================

‎tests/format/Etc/format.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
runFormatTest(import.meta, ['slang-solidity']);
1+
runFormatTest(import.meta, ['slang']);

0 commit comments

Comments
 (0)