Merge remote-tracking branch 'origin/main' into v2

Janther · Janther · commit 3f803caac018 · 2025-03-15T14:14:06.000+13:00
# Conflicts:
#	package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -86,31 +86,31 @@
     "@babel/code-frame": "^7.26.2",
     "@types/jest": "^29.5.14",
     "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^8.22.0",
-    "@typescript-eslint/parser": "^8.22.0",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "c8": "^10.1.3",
     "cross-env": "^7.0.3",
-    "eslint": "^9.19.0",
-    "eslint-config-prettier": "10.0.1",
+    "eslint": "^9.22.0",
+    "eslint-config-prettier": "10.1.1",
     "esm-utils": "^4.3.0",
     "jest": "^29.7.0",
     "jest-light-runner": "^0.6.0",
-    "jest-snapshot-serializer-ansi": "^2.1.0",
+    "jest-snapshot-serializer-ansi": "^2.2.1",
     "jest-snapshot-serializer-raw": "^2.0.0",
     "jest-watch-typeahead": "^2.2.2",
     "lines-and-columns": "^2.0.4",
-    "prettier": "^3.4.2",
-    "solc": "^0.8.28",
+    "prettier": "^3.5.3",
+    "solc": "^0.8.29",
     "ts-loader": "^9.5.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.3",
-    "webpack": "^5.97.1",
+    "typescript": "^5.8.2",
+    "webpack": "^5.98.0",
     "webpack-cli": "^6.0.1"
   },
   "dependencies": {
     "@nomicfoundation/slang": "0.19.0",
     "@solidity-parser/parser": "^0.19.0",
-    "semver": "^7.7.0"
+    "semver": "^7.7.1"
   },
   "peerDependencies": {
     "prettier": ">=3.0.0"
diff --git a/tests/format/BinaryOperationHierarchy/Group.sol b/tests/format/BinaryOperationHierarchy/Group.sol
diff --git a/tests/format/BinaryOperationHierarchy/Indent.sol b/tests/format/BinaryOperationHierarchy/Indent.sol
diff --git a/tests/format/BinaryOperationHierarchy/__snapshots__/format.test.js.snap b/tests/format/BinaryOperationHierarchy/__snapshots__/format.test.js.snap
diff --git a/tests/format/BinaryOperationHierarchy/format.test.js b/tests/format/BinaryOperationHierarchy/format.test.js
@@ -0,0 +1 @@
+runFormatTest(import.meta, ['slang-solidity']);
diff --git a/tests/format/HexLiteral/HexLiteral.sol b/tests/format/HexLiteral/HexLiteral.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract HexLiteral {
   bytes8 hex1 = hex'DeadBeef';
diff --git a/tests/format/HexLiteral/__snapshots__/format.test.js.snap b/tests/format/HexLiteral/__snapshots__/format.test.js.snap
@@ -8,7 +8,7 @@ singleQuote: false
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract HexLiteral {
   bytes8 hex1 = hex'DeadBeef';
@@ -17,7 +17,7 @@ contract HexLiteral {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract HexLiteral {
     bytes8 hex1 = hex"DeadBeef";
@@ -35,7 +35,7 @@ singleQuote: true
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract HexLiteral {
   bytes8 hex1 = hex'DeadBeef';
@@ -44,7 +44,7 @@ contract HexLiteral {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract HexLiteral {
     bytes8 hex1 = hex'DeadBeef';
diff --git a/tests/format/ModifierInvocations/ModifierInvocations.sol b/tests/format/ModifierInvocations/ModifierInvocations.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract ModifierDefinitions {
   // We enforce the use of parentheses in modifiers without parameters.
diff --git a/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap b/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap
@@ -7,7 +7,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract ModifierDefinitions {
   // We enforce the use of parentheses in modifiers without parameters.
@@ -26,7 +26,7 @@ contract ModifierInvocations is ModifierDefinitions {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract ModifierDefinitions {
     // We enforce the use of parentheses in modifiers without parameters.
diff --git a/tests/format/NumberLiteral/NumberLiteral.sol b/tests/format/NumberLiteral/NumberLiteral.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract NumberLiteral {
   function numbers()public {
diff --git a/tests/format/NumberLiteral/__snapshots__/format.test.js.snap b/tests/format/NumberLiteral/__snapshots__/format.test.js.snap
@@ -7,7 +7,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract NumberLiteral {
   function numbers()public {
@@ -22,7 +22,7 @@ contract NumberLiteral {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract NumberLiteral {
     function numbers() public {
diff --git a/tests/format/Parentheses/AddNoParentheses.sol b/tests/format/Parentheses/AddNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract AddNoParentheses {
     function addAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/BitAndNoParentheses.sol b/tests/format/Parentheses/BitAndNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract BitAndNoParentheses {
     function bitAndAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/BitOrNoParentheses.sol b/tests/format/Parentheses/BitOrNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract BitOrNoParentheses {
     function bitOrAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/BitXorNoParentheses.sol b/tests/format/Parentheses/BitXorNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract BitXorNoParentheses {
     function bitXorAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/DivNoParentheses.sol b/tests/format/Parentheses/DivNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract DivNoParentheses {
     function divAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/ExpNoParentheses.sol b/tests/format/Parentheses/ExpNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract ExpNoParentheses {
     function expAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/LogicNoParentheses.sol b/tests/format/Parentheses/LogicNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract LogicNoParentheses {
     function orOr(bool a, bool b, bool c) public pure returns (bool) {
diff --git a/tests/format/Parentheses/ModNoParentheses.sol b/tests/format/Parentheses/ModNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract ModNoParentheses {
     function modAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/MulNoParentheses.sol b/tests/format/Parentheses/MulNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract MulNoParentheses {
     function mulAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/ShiftLNoParentheses.sol b/tests/format/Parentheses/ShiftLNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract ShiftLNoParentheses {
     function shiftLAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/ShiftRNoParentheses.sol b/tests/format/Parentheses/ShiftRNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract ShiftRNoParentheses {
     function shiftRAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/SubNoParentheses.sol b/tests/format/Parentheses/SubNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
+pragma solidity 0.8.29;
 
 contract SubNoParentheses {
     function subAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/__snapshots__/format.test.js.snap b/tests/format/Parentheses/__snapshots__/format.test.js.snap

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+runFormatTest(import.meta, ['slang-solidity']);`