Skip to content

Parse with latest compatible solidity version #1225

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
merged 4 commits into from
Aug 7, 2025
Merged

Parse with latest compatible solidity version #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa8fd87
Parse with latest compatible solidity version
fvictorio Jul 30, 2025
1b9949e
Parse with latest compatible solidity version
fvictorio Jul 31, 2025
085fcf3
Fix tests
fvictorio Jul 31, 2025
857af30
using the expected resolution of the compiler instead of forcing it i…
Janther Aug 7, 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
9 changes: 6 additions & 3 deletions src/slang-utils/create-parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NonterminalKind } from '@nomicfoundation/slang/cst';
import { Parser } from '@nomicfoundation/slang/parser';
import { LanguageFacts } from '@nomicfoundation/slang/utils';
import { minSatisfying } from 'semver';
import { maxSatisfying } from 'semver';

import type { ParseOutput } from '@nomicfoundation/slang/parser';
import type { ParserOptions } from 'prettier';
Expand Down Expand Up @@ -34,7 +34,7 @@ export function createParser(
text: string,
options: ParserOptions<AstNode>
): { parser: Parser; parseOutput: ParseOutput } {
const compiler = minSatisfying(supportedVersions, options.compiler);
const compiler = maxSatisfying(supportedVersions, options.compiler);
if (compiler) {
const result = parserAndOutput(text, compiler);

Expand Down Expand Up @@ -68,7 +68,10 @@ export function createParser(
return result;
}

const result = parserAndOutput(text, inferredRanges[0]);
const result = parserAndOutput(
text,
inferredRanges[inferredRanges.length - 1]
);

if (!result.parseOutput.isValid())
throw createError(
Expand Down
3 changes: 1 addition & 2 deletions tests/format/MemberAccess/__snapshots__/format.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`MemberAccess.sol - {"compiler":"0.6.12"} format 1`] = `
exports[`MemberAccess.sol format 1`] = `
====================================options=====================================
compiler: "0.6.12"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down
2 changes: 1 addition & 1 deletion tests/format/MemberAccess/format.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
runFormatTest(import.meta, ['slang'], { compiler: '0.6.12' });
runFormatTest(import.meta, ['slang']);
3 changes: 1 addition & 2 deletions tests/format/Pragma/__snapshots__/format.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`Pragma.sol - {"compiler":"0.8.0"} format 1`] = `
exports[`Pragma.sol format 1`] = `
====================================options=====================================
compiler: "0.8.0"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down
2 changes: 1 addition & 1 deletion tests/format/Pragma/format.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
runFormatTest(import.meta, ['slang'], { compiler: '0.8.0' });
runFormatTest(import.meta, ['slang']);
3 changes: 1 addition & 2 deletions tests/format/SimpleStorage/__snapshots__/format.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`SimpleStorage.sol - {"compiler":"0.4.26"} format 1`] = `
exports[`SimpleStorage.sol format 1`] = `
====================================options=====================================
compiler: "0.4.26"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down
2 changes: 1 addition & 1 deletion tests/format/SimpleStorage/format.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
runFormatTest(import.meta, ['slang'], { compiler: '0.4.26' });
runFormatTest(import.meta, ['slang']);
24 changes: 8 additions & 16 deletions tests/format/StyleGuide/__snapshots__/format.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`BlankLines.sol - {"compiler":"0.5.17"} format 1`] = `
exports[`BlankLines.sol format 1`] = `
====================================options=====================================
compiler: "0.5.17"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down Expand Up @@ -47,9 +46,8 @@ contract A {
================================================================================
`;

exports[`ControlStructures.sol - {"compiler":"0.5.17"} format 1`] = `
exports[`ControlStructures.sol format 1`] = `
====================================options=====================================
compiler: "0.5.17"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down Expand Up @@ -169,9 +167,8 @@ contract ControlStructures {
================================================================================
`;

exports[`FunctionDeclaration.sol - {"compiler":"0.5.17"} format 1`] = `
exports[`FunctionDeclaration.sol format 1`] = `
====================================options=====================================
compiler: "0.5.17"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down Expand Up @@ -461,9 +458,8 @@ contract X is B, C, D {
================================================================================
`;

exports[`Mappings.sol - {"compiler":"0.5.17"} format 1`] = `
exports[`Mappings.sol format 1`] = `
====================================options=====================================
compiler: "0.5.17"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down Expand Up @@ -491,9 +487,8 @@ contract Mappings {
================================================================================
`;

exports[`MaximumLineLength.sol - {"compiler":"0.5.17"} format 1`] = `
exports[`MaximumLineLength.sol format 1`] = `
====================================options=====================================
compiler: "0.5.17"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down Expand Up @@ -647,9 +642,8 @@ contract EventDefinitionsAndEventEmitters {
================================================================================
`;

exports[`OtherRecommendations.sol - {"compiler":"0.5.17"} format 1`] = `
exports[`OtherRecommendations.sol format 1`] = `
====================================options=====================================
compiler: "0.5.17"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down Expand Up @@ -715,9 +709,8 @@ contract OtherRecommendations {
================================================================================
`;

exports[`VariableDeclarations.sol - {"compiler":"0.5.17"} format 1`] = `
exports[`VariableDeclarations.sol format 1`] = `
====================================options=====================================
compiler: "0.5.17"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand All @@ -739,9 +732,8 @@ contract VariableDeclarations {
================================================================================
`;

exports[`WhitespaceInExpressions.sol - {"compiler":"0.5.17"} format 1`] = `
exports[`WhitespaceInExpressions.sol format 1`] = `
====================================options=====================================
compiler: "0.5.17"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down
2 changes: 1 addition & 1 deletion tests/format/StyleGuide/format.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
runFormatTest(import.meta, ['slang'], { compiler: '0.5.17' });
runFormatTest(import.meta, ['slang']);
3 changes: 1 addition & 2 deletions tests/format/strings/__snapshots__/format.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`strings.sol - {"compiler":"0.4.26"} format 1`] = `
exports[`strings.sol format 1`] = `
====================================options=====================================
compiler: "0.4.26"
parsers: ["slang"]
printWidth: 80
| printWidth
Expand Down
2 changes: 1 addition & 1 deletion tests/format/strings/format.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
runFormatTest(import.meta, ['slang'], { compiler: '0.4.26' });
runFormatTest(import.meta, ['slang']);
6 changes: 3 additions & 3 deletions tests/unit/slang-utils/create-parser.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('inferLanguage', function () {
{
description: 'Caret range',
source: `pragma solidity ^0.7.0;`,
version: '0.7.0'
version: '0.7.6'
},
{
description: 'Pinned version',
Expand Down Expand Up @@ -106,8 +106,8 @@ describe('inferLanguage', function () {
}));
expect(parser.languageVersion).toEqual('0.8.2');

({ parser } = createParser(`pragma solidity ^0.8.0;`, {}));
expect(parser.languageVersion).toEqual('0.8.0');
({ parser } = createParser(`pragma solidity ^0.7.0;`, {}));
expect(parser.languageVersion).toEqual('0.7.6');
});

test('should throw if compiler option does not match the syntax', function () {
Expand Down
Loading