Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier-plugin-solidity",
"version": "2.3.0",
"version": "2.3.1",
"description": "A Prettier Plugin for automatically formatting your Solidity code.",
"type": "module",
"main": "./dist/index.js",
Expand Down
1 change: 1 addition & 0 deletions src/slang-printers/print-assignment-right-side.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export function printAssignmentRightSide(
return printIndentedGroupOrSpacedDocument(
document,
value.kind !== NonterminalKind.ArrayExpression &&
value.kind !== NonterminalKind.TupleExpression &&
!isChainableExpression(value)
);
}
2 changes: 2 additions & 0 deletions tests/config/run-format-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ const antlrMismatchTests = new Map(
// ANTLR doesn't support UntypedTupleMember with a storage location, which
// is valid Slang, but not in Solidity.
"AllSolidityFeaturesV0.4.26/AllSolidityFeatures.sol",
// TODO Review how ANTLR is formatting chained assignments
"Assignments/Assignments.sol",
].map((fixture) => {
const [file, compareBytecode = () => true] = Array.isArray(fixture)
? fixture
Expand Down
8 changes: 8 additions & 0 deletions tests/format/Assignments/Assignments.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
contract Assignments {
address payable public inParentheses = (contractPointer.functionCall(data.data1,data.data2,IERC20(data.token).decimals(),currency));
uint[] internal longArray = [item1,item2,item3,item4,item5,item6,item7,item8,item9,itema,itemb,itemc,itemd,iteme];
// TODO research what we want to do with chained assignments
function chainedAssignments() returns (bytes32 variableA, bytes32 variableB) {
variableA = variableB = 0x1234567890abcdef1234567890abcdef ^ 0x1234567890abcdef1234567890abcdef;
}
}
56 changes: 56 additions & 0 deletions tests/format/Assignments/__snapshots__/format.test.js.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`Assignments.sol format 1`] = `
====================================options=====================================
parsers: ["slang"]
printWidth: 80
| printWidth
=====================================input======================================
contract Assignments {
address payable public inParentheses = (contractPointer.functionCall(data.data1,data.data2,IERC20(data.token).decimals(),currency));
uint[] internal longArray = [item1,item2,item3,item4,item5,item6,item7,item8,item9,itema,itemb,itemc,itemd,iteme];
// TODO research what we want to do with chained assignments
function chainedAssignments() returns (bytes32 variableA, bytes32 variableB) {
variableA = variableB = 0x1234567890abcdef1234567890abcdef ^ 0x1234567890abcdef1234567890abcdef;
}
}

=====================================output=====================================
contract Assignments {
address payable public inParentheses = (
contractPointer.functionCall(
data.data1,
data.data2,
IERC20(data.token).decimals(),
currency
)
);
uint[] internal longArray = [
item1,
item2,
item3,
item4,
item5,
item6,
item7,
item8,
item9,
itema,
itemb,
itemc,
itemd,
iteme
];
// TODO research what we want to do with chained assignments
function chainedAssignments()
returns (bytes32 variableA, bytes32 variableB)
{
variableA =
variableB =
0x1234567890abcdef1234567890abcdef ^
0x1234567890abcdef1234567890abcdef;
}
}

================================================================================
`;
1 change: 1 addition & 0 deletions tests/format/Assignments/format.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
runFormatTest(import.meta, ['slang']);