diff --git a/package-lock.json b/package-lock.json index f849d8ddd..94673e753 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,13 +29,13 @@ "eslint-plugin-import": "^2.32.0", "esm-utils": "^4.4.2", "globals": "^17.4.0", + "index-to-position": "^1.2.0", "jest": "^30.3.0", "jest-light-runner": "^0.7.11", "jest-snapshot-serializer-ansi": "^2.2.1", "jest-snapshot-serializer-raw": "^2.0.0", "jest-watch-typeahead": "^3.0.1", "knip": "^5.86.0", - "lines-and-columns": "^2.0.4", "prettier": "^3.8.1", "solc": "^0.8.34", "ts-loader": "^9.5.4", @@ -5352,6 +5352,19 @@ "node": ">=0.8.19" } }, + "node_modules/index-to-position": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.2.0.tgz", + "integrity": "sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -6944,16 +6957,6 @@ "node": ">= 0.8.0" } }, - "node_modules/lines-and-columns": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", - "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, "node_modules/loader-runner": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz", diff --git a/package.json b/package.json index 015db74b6..1977c513c 100644 --- a/package.json +++ b/package.json @@ -99,13 +99,13 @@ "eslint-plugin-import": "^2.32.0", "esm-utils": "^4.4.2", "globals": "^17.4.0", + "index-to-position": "^1.2.0", "jest": "^30.3.0", "jest-light-runner": "^0.7.11", "jest-snapshot-serializer-ansi": "^2.2.1", "jest-snapshot-serializer-raw": "^2.0.0", "jest-watch-typeahead": "^3.0.1", "knip": "^5.86.0", - "lines-and-columns": "^2.0.4", "prettier": "^3.8.1", "solc": "^0.8.34", "ts-loader": "^9.5.4", diff --git a/tests/config/run-format-test.js b/tests/config/run-format-test.js index 037b2584d..8cadbf577 100644 --- a/tests/config/run-format-test.js +++ b/tests/config/run-format-test.js @@ -9,7 +9,7 @@ import getPlugins from "./get-plugins.js"; import compileContract from "./utils/compile-contract.js"; import consistentEndOfLine from "./utils/consistent-end-of-line.js"; import createSnapshot from "./utils/create-snapshot.js"; -import stringifyOptionsForTitle from "./utils/stringify-options-for-title.js"; +import { stringifyOptionsForTitle } from "./utils/stringify-options-for-title.js"; import visualizeEndOfLine from "./utils/visualize-end-of-line.js"; const { __dirname } = createEsmUtils(import.meta); diff --git a/tests/config/utils/consistent-end-of-line.js b/tests/config/utils/consistent-end-of-line.js index ecedbf7b0..e618ab542 100644 --- a/tests/config/utils/consistent-end-of-line.js +++ b/tests/config/utils/consistent-end-of-line.js @@ -1,6 +1,6 @@ function consistentEndOfLine(text) { let firstEndOfLine; - return text.replace(/\r\n?|\n/gu, (endOfLine) => { + return text.replace(/\r\n?|\n/g, (endOfLine) => { firstEndOfLine = firstEndOfLine ?? endOfLine; return firstEndOfLine; }); diff --git a/tests/config/utils/create-snapshot.js b/tests/config/utils/create-snapshot.js index 7b0a79ef0..aa91625b7 100644 --- a/tests/config/utils/create-snapshot.js +++ b/tests/config/utils/create-snapshot.js @@ -2,7 +2,10 @@ import { wrap as raw } from "jest-snapshot-serializer-raw"; import visualizeEndOfLine from "./visualize-end-of-line.js"; import visualizeRange from "./visualize-range.js"; -const SEPARATOR_WIDTH = 80; +const CURSOR_PLACEHOLDER = "<|>"; + +const DEFAULT_PRINT_WIDTH = 80; +const SEPARATOR_WIDTH = DEFAULT_PRINT_WIDTH; function printSeparator(description = "") { const leftLength = Math.floor((SEPARATOR_WIDTH - description.length) / 2); const rightLength = SEPARATOR_WIDTH - leftLength - description.length; @@ -10,11 +13,15 @@ function printSeparator(description = "") { } function stringify(value) { - return value === Number.POSITIVE_INFINITY - ? "Infinity" - : Array.isArray(value) - ? `[${value.map((v) => JSON.stringify(v)).join(", ")}]` - : JSON.stringify(value); + if (value === Number.POSITIVE_INFINITY) { + return "Infinity"; + } + + if (Array.isArray(value)) { + return `[${value.map((v) => JSON.stringify(v)).join(", ")}]`; + } + + return JSON.stringify(value); } function printOptions(options) { @@ -33,23 +40,41 @@ function printOptions(options) { .join("\n"); } -function printWidthIndicator(printWidth, offset) { - if (!Number.isFinite(printWidth) || printWidth < 1) { - return ""; +function makeWidthIndicator(printWidth) { + const text = + printWidth === undefined + ? `printWidth: ${DEFAULT_PRINT_WIDTH} (default)` + : `printWidth: ${printWidth}`; + + if (printWidth === undefined) { + printWidth = DEFAULT_PRINT_WIDTH; } - let before = ""; - if (offset) { - before = " ".repeat(offset - 1) + "|"; + return printWidth >= text.length + 2 + ? (text + " |").padStart(printWidth, " ") + : " ".repeat(printWidth) + "| " + text; +} + +const defaultWidthIndicator = makeWidthIndicator(); +function printWidthIndicator(printWidth) { + if ( + !( + printWidth === undefined || + (Number.isSafeInteger(printWidth) && printWidth > 0) + ) + ) { + return ""; } - return `${before}${" ".repeat(printWidth)}| printWidth`; + const widthIndicator = + printWidth === undefined + ? defaultWidthIndicator + : makeWidthIndicator(printWidth); + + return widthIndicator; } -function createSnapshot( - formatResult, - { parsers, formatOptions, CURSOR_PLACEHOLDER }, -) { +function createSnapshot(formatResult, { parsers, formatOptions }) { let { inputWithCursor: input, outputWithCursor: output, @@ -69,7 +94,7 @@ function createSnapshot( } input = visualizeRange(input, { rangeStart, rangeEnd }); - codeOffset = input.match(/^>?\s+1 \|/u)[0].length + 1; + codeOffset = input.match(/^>?\s+1 \|/)[0].length + 1; } if ("endOfLine" in formatOptions) { @@ -81,16 +106,34 @@ function createSnapshot( return raw( [ - printSeparator("options"), - printOptions({ ...options, parsers }), - ...(widthIndicator ? [widthIndicator] : []), - printSeparator("input"), + addOffset( + [ + printSeparator("options"), + printOptions({ ...options, parsers }), + ...(widthIndicator ? [widthIndicator] : []), + printSeparator("input"), + ].join("\n"), + codeOffset, + ), input, - printSeparator("output"), - output, - printSeparator(), + addOffset( + [printSeparator("output"), output, printSeparator()].join("\n"), + codeOffset, + ), ].join("\n"), ); } +function addOffset(text, offset) { + if (!offset) { + return text; + } + + const prefix = " ".repeat(offset - 2) + ":"; + return text + .split("\n") + .map((line) => `${prefix}${line ? ` ${line}` : line}`) + .join("\n"); +} + export default createSnapshot; diff --git a/tests/config/utils/stringify-options-for-title.js b/tests/config/utils/stringify-options-for-title.js index d25c671d5..cae349ef7 100644 --- a/tests/config/utils/stringify-options-for-title.js +++ b/tests/config/utils/stringify-options-for-title.js @@ -1,13 +1,17 @@ -function stringifyOptions(options) { - const string = JSON.stringify(options || {}, (key, value) => - key === "plugins" || key === "errors" - ? undefined - : value === Number.POSITIVE_INFINITY - ? "Infinity" - : value, - ); +function stringifyOptionsForTitle(options) { + const string = JSON.stringify(options || {}, (key, value) => { + if (key === "plugins" || key === "errors") { + return; + } + + if (value === Number.POSITIVE_INFINITY) { + return "Infinity"; + } + + return value; + }); return string === "{}" ? "" : string; } -export default stringifyOptions; +export { stringifyOptionsForTitle }; diff --git a/tests/config/utils/visualize-end-of-line.js b/tests/config/utils/visualize-end-of-line.js index 1db619aeb..8b24ac1da 100644 --- a/tests/config/utils/visualize-end-of-line.js +++ b/tests/config/utils/visualize-end-of-line.js @@ -1,5 +1,8 @@ +/** +@param {string} text +*/ function visualizeEndOfLine(text) { - return text.replace(/\r\n?|\n/gu, (endOfLine) => { + return text.replace(/\r\n?|\n/g, (endOfLine) => { switch (endOfLine) { case "\n": return "\n"; diff --git a/tests/config/utils/visualize-range.js b/tests/config/utils/visualize-range.js index 222bc7a6f..372fcc28c 100644 --- a/tests/config/utils/visualize-range.js +++ b/tests/config/utils/visualize-range.js @@ -1,35 +1,26 @@ +import indexToPosition from "index-to-position"; import { codeFrameColumns } from "@babel/code-frame"; -import { LinesAndColumns } from "lines-and-columns"; const codeFrameColumnsOptions = { linesAbove: Number.POSITIVE_INFINITY, linesBelow: Number.POSITIVE_INFINITY, }; -const locationForRange = (text, rangeStart, rangeEnd) => { - if (rangeStart > rangeEnd) { - [rangeStart, rangeEnd] = [rangeEnd, rangeStart]; - } - const lines = new LinesAndColumns(text); - const start = lines.locationForIndex(rangeStart); - const end = lines.locationForIndex(rangeEnd); +const locationForRange = (text, range) => { + const [start, end] = [...range] + .sort((indexA, indexB) => indexA - indexB) + .map((index) => indexToPosition(text, index, { oneBased: true })); - start.line += 1; - start.column += 1; - end.line += 1; - if (start.line === end.line) { - end.column += 1; + if (start.line !== end.line) { + end.column -= 1; } - return { - start, - end, - }; + return { start, end }; }; const visualizeRange = (text, { rangeStart = 0, rangeEnd = text.length }) => codeFrameColumns( text, - locationForRange(text, rangeStart, rangeEnd), + locationForRange(text, [rangeStart, rangeEnd]), rangeStart > rangeEnd ? { ...codeFrameColumnsOptions, message: "[Reversed range]" } : codeFrameColumnsOptions, diff --git a/tests/format/AddressPayable/__snapshots__/format.test.js.snap b/tests/format/AddressPayable/__snapshots__/format.test.js.snap index 921c056ee..d43ba4fee 100644 --- a/tests/format/AddressPayable/__snapshots__/format.test.js.snap +++ b/tests/format/AddressPayable/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`AddressPayable.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.5.2; diff --git a/tests/format/AllSolidityFeatures/__snapshots__/format.test.js.snap b/tests/format/AllSolidityFeatures/__snapshots__/format.test.js.snap index 3bcde827c..fc2750aa3 100644 --- a/tests/format/AllSolidityFeatures/__snapshots__/format.test.js.snap +++ b/tests/format/AllSolidityFeatures/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`AllSolidityFeatures.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // Examples taken from the Solidity documentation online. pragma experimental ABIEncoderV2; diff --git a/tests/format/AllSolidityFeaturesV0.4.26/__snapshots__/format.test.js.snap b/tests/format/AllSolidityFeaturesV0.4.26/__snapshots__/format.test.js.snap index 2f08a1fbd..a390e881c 100644 --- a/tests/format/AllSolidityFeaturesV0.4.26/__snapshots__/format.test.js.snap +++ b/tests/format/AllSolidityFeaturesV0.4.26/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`AllSolidityFeatures.sol - {"compiler":"0.4.26"} format 1`] = ` compiler: "0.4.26" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract c { function c() diff --git a/tests/format/Arrays/__snapshots__/format.test.js.snap b/tests/format/Arrays/__snapshots__/format.test.js.snap index 86ee85a12..dd5abe7ef 100644 --- a/tests/format/Arrays/__snapshots__/format.test.js.snap +++ b/tests/format/Arrays/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Arrays.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.5.2; diff --git a/tests/format/Assembly/__snapshots__/format.test.js.snap b/tests/format/Assembly/__snapshots__/format.test.js.snap index 870439df6..a9aeeb64c 100644 --- a/tests/format/Assembly/__snapshots__/format.test.js.snap +++ b/tests/format/Assembly/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Assembly.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract Assembly { function ifAssembly() { diff --git a/tests/format/AssemblyV0.4.26/__snapshots__/format.test.js.snap b/tests/format/AssemblyV0.4.26/__snapshots__/format.test.js.snap index 66c66bdbd..3055de494 100644 --- a/tests/format/AssemblyV0.4.26/__snapshots__/format.test.js.snap +++ b/tests/format/AssemblyV0.4.26/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Assembly.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.26; diff --git a/tests/format/Assignments/__snapshots__/format.test.js.snap b/tests/format/Assignments/__snapshots__/format.test.js.snap index b6f8206b1..3a93ba3c0 100644 --- a/tests/format/Assignments/__snapshots__/format.test.js.snap +++ b/tests/format/Assignments/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Assignments.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract Assignments { address payable public inParentheses = (contractPointer.functionCall(data.data1,data.data2,IERC20(data.token).decimals(),currency)); diff --git a/tests/format/BasicIterator/__snapshots__/format.test.js.snap b/tests/format/BasicIterator/__snapshots__/format.test.js.snap index 1fdd5e387..29fb5dfe0 100644 --- a/tests/format/BasicIterator/__snapshots__/format.test.js.snap +++ b/tests/format/BasicIterator/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`BasicIterator.sol - {"compiler":"0.4.26"} format 1`] = ` compiler: "0.4.26" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== /* This is a very simple demonstration of a while loops. Same as JS/c. diff --git a/tests/format/BinaryOperationHierarchy/__snapshots__/format.test.js.snap b/tests/format/BinaryOperationHierarchy/__snapshots__/format.test.js.snap index bebb8b2dc..01f307f94 100644 --- a/tests/format/BinaryOperationHierarchy/__snapshots__/format.test.js.snap +++ b/tests/format/BinaryOperationHierarchy/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Group.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity "0.8.28"; @@ -1301,7 +1301,7 @@ exports[`Indent.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.28; diff --git a/tests/format/BinaryOperators/__snapshots__/format.test.js.snap b/tests/format/BinaryOperators/__snapshots__/format.test.js.snap index 7a527804f..b84810b3e 100644 --- a/tests/format/BinaryOperators/__snapshots__/format.test.js.snap +++ b/tests/format/BinaryOperators/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`BinaryOperators.sol - {"experimentalOperatorPosition":"start"} format 1 experimentalOperatorPosition: "start" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract ArithmeticOperators { // ['+', '-', '*', '/', '%'] @@ -688,7 +688,7 @@ exports[`BinaryOperators.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract ArithmeticOperators { // ['+', '-', '*', '/', '%'] @@ -1372,7 +1372,7 @@ exports[`Parentheses.sol - {"experimentalOperatorPosition":"start"} format 1`] = experimentalOperatorPosition: "start" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity 0.5.8; @@ -1647,7 +1647,7 @@ exports[`Parentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity 0.5.8; diff --git a/tests/format/BreakingChangesV0.7.4/__snapshots__/format.test.js.snap b/tests/format/BreakingChangesV0.7.4/__snapshots__/format.test.js.snap index 3dad639bd..9c401ba26 100644 --- a/tests/format/BreakingChangesV0.7.4/__snapshots__/format.test.js.snap +++ b/tests/format/BreakingChangesV0.7.4/__snapshots__/format.test.js.snap @@ -6,7 +6,7 @@ bracketSpacing: true compiler: "0.7.3" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.7.0; @@ -37,7 +37,7 @@ exports[`BreakingChangesV0.7.4.sol - {"compiler":"0.7.3"} format 1`] = ` compiler: "0.7.3" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.7.0; @@ -69,7 +69,7 @@ bracketSpacing: true compiler: "0.7.4" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.7.0; @@ -105,7 +105,7 @@ exports[`BreakingChangesV0.7.4.sol - {"compiler":"0.7.4"} format 1`] = ` compiler: "0.7.4" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.7.0; diff --git a/tests/format/BreakingChangesV0.8.0/__snapshots__/format.test.js.snap b/tests/format/BreakingChangesV0.8.0/__snapshots__/format.test.js.snap index 664729cbf..df792faa0 100644 --- a/tests/format/BreakingChangesV0.8.0/__snapshots__/format.test.js.snap +++ b/tests/format/BreakingChangesV0.8.0/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`BreakingChangesV0.8.0.sol - {"compiler":"0.7.0"} format 1`] = ` compiler: "0.7.0" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity >=0.7.0 <=0.8.5; @@ -93,7 +93,7 @@ exports[`BreakingChangesV0.8.0.sol - {"compiler":"0.8.0"} format 1`] = ` compiler: "0.8.0" parsers: ["antlr"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity >=0.7.0 <=0.8.5; @@ -180,7 +180,7 @@ exports[`BreakingChangesV0.8.0.sol format 1`] = ` ====================================options===================================== parsers: ["antlr"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity >=0.7.0 <=0.8.5; diff --git a/tests/format/Comments/__snapshots__/format.test.js.snap b/tests/format/Comments/__snapshots__/format.test.js.snap index a2b2474b0..1ea75d1d5 100644 --- a/tests/format/Comments/__snapshots__/format.test.js.snap +++ b/tests/format/Comments/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Comments.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract Comments1 { /* solhint-disable var-name-mixedcase */ diff --git a/tests/format/Conditional/__snapshots__/format.test.js.snap b/tests/format/Conditional/__snapshots__/format.test.js.snap index 3d7e486c1..e2aa8f101 100644 --- a/tests/format/Conditional/__snapshots__/format.test.js.snap +++ b/tests/format/Conditional/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Conditional.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.24; diff --git a/tests/format/Constructors/__snapshots__/format.test.js.snap b/tests/format/Constructors/__snapshots__/format.test.js.snap index 26a554ff9..380acdd4a 100644 --- a/tests/format/Constructors/__snapshots__/format.test.js.snap +++ b/tests/format/Constructors/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Constructors.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.5.2; diff --git a/tests/format/ConstructorsV0.4.26/__snapshots__/format.test.js.snap b/tests/format/ConstructorsV0.4.26/__snapshots__/format.test.js.snap index 6012f73a7..5f7987d73 100644 --- a/tests/format/ConstructorsV0.4.26/__snapshots__/format.test.js.snap +++ b/tests/format/ConstructorsV0.4.26/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Constructors.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.26; diff --git a/tests/format/ContractDefinitions/__snapshots__/format.test.js.snap b/tests/format/ContractDefinitions/__snapshots__/format.test.js.snap index fa747a5cb..1e5b6c78d 100644 --- a/tests/format/ContractDefinitions/__snapshots__/format.test.js.snap +++ b/tests/format/ContractDefinitions/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`ContractDefinitions.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract ContractDefinition is Contract1, Contract2, Contract3, Contract4, Contract5 { } diff --git a/tests/format/CustomErrors/__snapshots__/format.test.js.snap b/tests/format/CustomErrors/__snapshots__/format.test.js.snap index a29b00db7..fb2ceab37 100644 --- a/tests/format/CustomErrors/__snapshots__/format.test.js.snap +++ b/tests/format/CustomErrors/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`CustomErrors.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.8.4; diff --git a/tests/format/Empty/__snapshots__/format.test.js.snap b/tests/format/Empty/__snapshots__/format.test.js.snap index 7b6677462..0d1b911dd 100644 --- a/tests/format/Empty/__snapshots__/format.test.js.snap +++ b/tests/format/Empty/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`EmptyFile.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== =====================================output===================================== @@ -16,7 +16,7 @@ exports[`EmptyFileWithComments.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT diff --git a/tests/format/EnumDefinitions/__snapshots__/format.test.js.snap b/tests/format/EnumDefinitions/__snapshots__/format.test.js.snap index b0e1ff9d0..b6ae4f685 100644 --- a/tests/format/EnumDefinitions/__snapshots__/format.test.js.snap +++ b/tests/format/EnumDefinitions/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`EnumDefinitions.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract EnumDefinitions { enum ActionChoices { GoLeft, GoRight, GoStraight, SitStill } diff --git a/tests/format/Etc/__snapshots__/format.test.js.snap b/tests/format/Etc/__snapshots__/format.test.js.snap index 025837b1e..89806ac97 100644 --- a/tests/format/Etc/__snapshots__/format.test.js.snap +++ b/tests/format/Etc/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Etc.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.24; diff --git a/tests/format/ExperimentalTernaries/__snapshots__/format.test.js.snap b/tests/format/ExperimentalTernaries/__snapshots__/format.test.js.snap index 27de54357..c3d34c710 100644 --- a/tests/format/ExperimentalTernaries/__snapshots__/format.test.js.snap +++ b/tests/format/ExperimentalTernaries/__snapshots__/format.test.js.snap @@ -6,7 +6,7 @@ experimentalTernaries: true parsers: ["slang"] printWidth: 80 tabWidth: 1 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.24; @@ -517,7 +517,7 @@ experimentalTernaries: true parsers: ["slang"] printWidth: 80 useTabs: true - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.24; @@ -1031,7 +1031,7 @@ exports[`ExperimentalTernaries.sol - {"experimentalTernaries":true} format 1`] = experimentalTernaries: true parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.24; @@ -1544,7 +1544,7 @@ exports[`ExperimentalTernaries.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.24; diff --git a/tests/format/ForStatements/__snapshots__/format.test.js.snap b/tests/format/ForStatements/__snapshots__/format.test.js.snap index 11a1049a9..081434086 100644 --- a/tests/format/ForStatements/__snapshots__/format.test.js.snap +++ b/tests/format/ForStatements/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`ForStatements.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract ForStatements { uint constant LONG_VARIABLE = 1; diff --git a/tests/format/FunctionCalls/__snapshots__/format.test.js.snap b/tests/format/FunctionCalls/__snapshots__/format.test.js.snap index 2075aafb0..bc60febca 100644 --- a/tests/format/FunctionCalls/__snapshots__/format.test.js.snap +++ b/tests/format/FunctionCalls/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`FunctionCalls.sol - {"bracketSpacing":true} format 1`] = ` bracketSpacing: true parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract FunctionCalls { function foo() { @@ -157,7 +157,7 @@ exports[`FunctionCalls.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract FunctionCalls { function foo() { diff --git a/tests/format/FunctionDefinitions/__snapshots__/format.test.js.snap b/tests/format/FunctionDefinitions/__snapshots__/format.test.js.snap index f292ccab3..392b9ac29 100644 --- a/tests/format/FunctionDefinitions/__snapshots__/format.test.js.snap +++ b/tests/format/FunctionDefinitions/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`FunctionDefinitions.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== interface FunctionInterfaces { function noParamsNoModifiersNoReturns(); diff --git a/tests/format/FunctionDefinitionsV0.5.0/__snapshots__/format.test.js.snap b/tests/format/FunctionDefinitionsV0.5.0/__snapshots__/format.test.js.snap index adcbfd864..dd5da88e6 100644 --- a/tests/format/FunctionDefinitionsV0.5.0/__snapshots__/format.test.js.snap +++ b/tests/format/FunctionDefinitionsV0.5.0/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`FunctionDefinitions.sol - {"compiler":"0.5.17"} format 1`] = ` compiler: "0.5.17" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract FunctionDefinitions { function () external {} diff --git a/tests/format/HexLiteral/__snapshots__/format.test.js.snap b/tests/format/HexLiteral/__snapshots__/format.test.js.snap index ec4d3cfb5..beb607527 100644 --- a/tests/format/HexLiteral/__snapshots__/format.test.js.snap +++ b/tests/format/HexLiteral/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`HexLiteral.sol - {"singleQuote":false} format 1`] = ` parsers: ["slang"] printWidth: 80 singleQuote: false - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -32,7 +32,7 @@ exports[`HexLiteral.sol - {"singleQuote":true} format 1`] = ` parsers: ["slang"] printWidth: 80 singleQuote: true - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; diff --git a/tests/format/IfStatements/__snapshots__/format.test.js.snap b/tests/format/IfStatements/__snapshots__/format.test.js.snap index 5165287c5..57e3fac17 100644 --- a/tests/format/IfStatements/__snapshots__/format.test.js.snap +++ b/tests/format/IfStatements/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`IfStatements.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract IfStatements { function hi() public { diff --git a/tests/format/Immutable/__snapshots__/format.test.js.snap b/tests/format/Immutable/__snapshots__/format.test.js.snap index 151e55bd9..dfd46f5a5 100644 --- a/tests/format/Immutable/__snapshots__/format.test.js.snap +++ b/tests/format/Immutable/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Immutable.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >0.6.4 <0.7.0; diff --git a/tests/format/ImportDirective/__snapshots__/format.test.js.snap b/tests/format/ImportDirective/__snapshots__/format.test.js.snap index b4a7dbbfd..448739bb6 100644 --- a/tests/format/ImportDirective/__snapshots__/format.test.js.snap +++ b/tests/format/ImportDirective/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`ImportDirectives.sol - {"bracketSpacing":true} format 1`] = ` bracketSpacing: true parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== import "SomeFile.sol"; import "SomeFile.sol" as SomeOtherFile; @@ -60,7 +60,7 @@ exports[`ImportDirectives.sol - {"compiler":"0.7.3"} format 1`] = ` compiler: "0.7.3" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== import "SomeFile.sol"; import "SomeFile.sol" as SomeOtherFile; @@ -100,7 +100,7 @@ exports[`ImportDirectives.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== import "SomeFile.sol"; import "SomeFile.sol" as SomeOtherFile; diff --git a/tests/format/Inbox/__snapshots__/format.test.js.snap b/tests/format/Inbox/__snapshots__/format.test.js.snap index 5da115480..dbbfcb4df 100644 --- a/tests/format/Inbox/__snapshots__/format.test.js.snap +++ b/tests/format/Inbox/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Inbox.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // This comment spans one line diff --git a/tests/format/IndexOf/__snapshots__/format.test.js.snap b/tests/format/IndexOf/__snapshots__/format.test.js.snap index 01afcc0b0..ea8d090e9 100644 --- a/tests/format/IndexOf/__snapshots__/format.test.js.snap +++ b/tests/format/IndexOf/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`IndexOf.sol - {"compiler":"0.4.26"} format 1`] = ` compiler: "0.4.26" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract IndexOf { diff --git a/tests/format/IndexRangeAccess/__snapshots__/format.test.js.snap b/tests/format/IndexRangeAccess/__snapshots__/format.test.js.snap index 0d58450a4..a26113840 100644 --- a/tests/format/IndexRangeAccess/__snapshots__/format.test.js.snap +++ b/tests/format/IndexRangeAccess/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`IndexRangeAccess.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.6.4; diff --git a/tests/format/Issues/__snapshots__/format.test.js.snap b/tests/format/Issues/__snapshots__/format.test.js.snap index c1cf9cf0d..2edcfdff3 100644 --- a/tests/format/Issues/__snapshots__/format.test.js.snap +++ b/tests/format/Issues/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Issue205.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract Example { using SafeMath for uint256; @@ -42,7 +42,7 @@ exports[`Issue289.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract Issue289 { function f() { @@ -67,7 +67,7 @@ exports[`Issue355.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity 0.6.12; @@ -103,7 +103,7 @@ exports[`Issue385.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract Issue385 { function emptyTryCatch() { @@ -141,7 +141,7 @@ exports[`Issue564.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract Issue564 { function isAuthorized( @@ -174,7 +174,7 @@ exports[`Issue799.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== struct EmptyStruct {} @@ -188,7 +188,7 @@ exports[`Issue843.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.8.0; diff --git a/tests/format/Libraries/__snapshots__/format.test.js.snap b/tests/format/Libraries/__snapshots__/format.test.js.snap index f3e2f9701..e8f7cda26 100644 --- a/tests/format/Libraries/__snapshots__/format.test.js.snap +++ b/tests/format/Libraries/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`Libraries.sol - {"bracketSpacing":true} format 1`] = ` bracketSpacing: true parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== using Lib for uint; using Lib for @@ -57,7 +57,7 @@ exports[`Libraries.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== using Lib for uint; using Lib for diff --git a/tests/format/Markdown/__snapshots__/format.test.js.snap b/tests/format/Markdown/__snapshots__/format.test.js.snap index 5a80bd722..868ecf560 100644 --- a/tests/format/Markdown/__snapshots__/format.test.js.snap +++ b/tests/format/Markdown/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Markdown.md format 1`] = ` ====================================options===================================== parsers: ["markdown"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== # Embedded Solidity Code diff --git a/tests/format/MemberAccess/__snapshots__/format.test.js.snap b/tests/format/MemberAccess/__snapshots__/format.test.js.snap index a3c80c392..cb5d69af3 100644 --- a/tests/format/MemberAccess/__snapshots__/format.test.js.snap +++ b/tests/format/MemberAccess/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`MemberAccess.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.6.0; diff --git a/tests/format/ModifierDefinitions/__snapshots__/format.test.js.snap b/tests/format/ModifierDefinitions/__snapshots__/format.test.js.snap index 3977589d8..2712cda4b 100644 --- a/tests/format/ModifierDefinitions/__snapshots__/format.test.js.snap +++ b/tests/format/ModifierDefinitions/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`ModifierDefinitions.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract ModifierDefinitions { modifier noParams() {} diff --git a/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap b/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap index b83141fd4..8d43e27b5 100644 --- a/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap +++ b/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`ModifierInvocations.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; diff --git a/tests/format/ModifierInvocationsV0.4.26/__snapshots__/format.test.js.snap b/tests/format/ModifierInvocationsV0.4.26/__snapshots__/format.test.js.snap index 0eec60d9b..9386e89ee 100644 --- a/tests/format/ModifierInvocationsV0.4.26/__snapshots__/format.test.js.snap +++ b/tests/format/ModifierInvocationsV0.4.26/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`ModifierInvocations.sol - {"compiler":"0.4.26"} format 1`] = ` compiler: "0.4.26" parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.4.26; diff --git a/tests/format/MultipartStrings/__snapshots__/format.test.js.snap b/tests/format/MultipartStrings/__snapshots__/format.test.js.snap index 95308947e..e228b2213 100644 --- a/tests/format/MultipartStrings/__snapshots__/format.test.js.snap +++ b/tests/format/MultipartStrings/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`MultipartStrings.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract MultipartStrings { bytes h1 = hex'beef'; diff --git a/tests/format/NameValueExpression/__snapshots__/format.test.js.snap b/tests/format/NameValueExpression/__snapshots__/format.test.js.snap index 7d186437b..e73cf2058 100644 --- a/tests/format/NameValueExpression/__snapshots__/format.test.js.snap +++ b/tests/format/NameValueExpression/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`NameValueExpression.sol - {"bracketSpacing":true} format 1`] = ` bracketSpacing: true parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.6.2 <0.7.0; @@ -37,7 +37,7 @@ exports[`NameValueExpression.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.6.2 <0.7.0; diff --git a/tests/format/NumberLiteral/__snapshots__/format.test.js.snap b/tests/format/NumberLiteral/__snapshots__/format.test.js.snap index 1d6e78c76..55a935f67 100644 --- a/tests/format/NumberLiteral/__snapshots__/format.test.js.snap +++ b/tests/format/NumberLiteral/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`NumberLiteral.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; diff --git a/tests/format/Ownable/__snapshots__/format.test.js.snap b/tests/format/Ownable/__snapshots__/format.test.js.snap index ea6106d6e..d5b5daa85 100644 --- a/tests/format/Ownable/__snapshots__/format.test.js.snap +++ b/tests/format/Ownable/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Ownable.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.24; diff --git a/tests/format/Parentheses/__snapshots__/format.test.js.snap b/tests/format/Parentheses/__snapshots__/format.test.js.snap index 2c0064efc..adff608bc 100644 --- a/tests/format/Parentheses/__snapshots__/format.test.js.snap +++ b/tests/format/Parentheses/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`AddNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -200,7 +200,7 @@ exports[`BitAndNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -396,7 +396,7 @@ exports[`BitOrNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -592,7 +592,7 @@ exports[`BitXorNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -788,7 +788,7 @@ exports[`DivNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -984,7 +984,7 @@ exports[`EqualParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.28; @@ -1207,7 +1207,7 @@ exports[`ExpNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -1403,7 +1403,7 @@ exports[`LogicNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -1491,7 +1491,7 @@ exports[`ModNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -1687,7 +1687,7 @@ exports[`MulNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -1883,7 +1883,7 @@ exports[`NotEqualParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.28; @@ -2106,7 +2106,7 @@ exports[`ShiftLNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -2302,7 +2302,7 @@ exports[`ShiftRNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; @@ -2498,7 +2498,7 @@ exports[`SubNoParentheses.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== // SPDX-License-Identifier: MIT pragma solidity 0.8.34; diff --git a/tests/format/Pragma/__snapshots__/format.test.js.snap b/tests/format/Pragma/__snapshots__/format.test.js.snap index 3802eb5bc..f3b9ea2e1 100644 --- a/tests/format/Pragma/__snapshots__/format.test.js.snap +++ b/tests/format/Pragma/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Pragma.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.4.21 <0.6.0; pragma solidity >=0.4.21 <=0.6.0 ; diff --git a/tests/format/PrettierIgnore/__snapshots__/format.test.js.snap b/tests/format/PrettierIgnore/__snapshots__/format.test.js.snap index 9c1c00964..cd83d757d 100644 --- a/tests/format/PrettierIgnore/__snapshots__/format.test.js.snap +++ b/tests/format/PrettierIgnore/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`PrettierIgnore.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.6.0; diff --git a/tests/format/Proxy/__snapshots__/format.test.js.snap b/tests/format/Proxy/__snapshots__/format.test.js.snap index e820b203e..e02939abc 100644 --- a/tests/format/Proxy/__snapshots__/format.test.js.snap +++ b/tests/format/Proxy/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Proxy.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.24; diff --git a/tests/format/RespectDefaultOptions/__snapshots__/format.test.js.snap b/tests/format/RespectDefaultOptions/__snapshots__/format.test.js.snap index f838c4f26..a4a1b7ce6 100644 --- a/tests/format/RespectDefaultOptions/__snapshots__/format.test.js.snap +++ b/tests/format/RespectDefaultOptions/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`respect-default-options.js format 1`] = ` ====================================options===================================== parsers: ["babel"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== function a() { return {key:value}; diff --git a/tests/format/SampleCrowdsale/__snapshots__/format.test.js.snap b/tests/format/SampleCrowdsale/__snapshots__/format.test.js.snap index c78d1e70a..42dfa0811 100644 --- a/tests/format/SampleCrowdsale/__snapshots__/format.test.js.snap +++ b/tests/format/SampleCrowdsale/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`SampleCrowdsale.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.18; diff --git a/tests/format/SimpleAuction/__snapshots__/format.test.js.snap b/tests/format/SimpleAuction/__snapshots__/format.test.js.snap index 5502dd80c..ce64316a9 100644 --- a/tests/format/SimpleAuction/__snapshots__/format.test.js.snap +++ b/tests/format/SimpleAuction/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`SimpleAuction.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.22; diff --git a/tests/format/SimpleStorage/__snapshots__/format.test.js.snap b/tests/format/SimpleStorage/__snapshots__/format.test.js.snap index fd37d2458..c7cb6671f 100644 --- a/tests/format/SimpleStorage/__snapshots__/format.test.js.snap +++ b/tests/format/SimpleStorage/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`SimpleStorage.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.0; diff --git a/tests/format/SplittableCommodity/__snapshots__/format.test.js.snap b/tests/format/SplittableCommodity/__snapshots__/format.test.js.snap index 5e834731b..3a1cf0b4e 100644 --- a/tests/format/SplittableCommodity/__snapshots__/format.test.js.snap +++ b/tests/format/SplittableCommodity/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`SplittableCommodity.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.4.24; diff --git a/tests/format/StateVariableDeclarations/__snapshots__/format.test.js.snap b/tests/format/StateVariableDeclarations/__snapshots__/format.test.js.snap index d82c373bd..3a6337104 100644 --- a/tests/format/StateVariableDeclarations/__snapshots__/format.test.js.snap +++ b/tests/format/StateVariableDeclarations/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`StateVariableDeclarations.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract Contract { bytes32 private constant DOMAIN_SEPARATOR_TYPEHASH = 0x035aff83d86937d35b32e04f0ddc6ff469290eef2f1b692d8a815c89404d4749; diff --git a/tests/format/StringLiteral/__snapshots__/format.test.js.snap b/tests/format/StringLiteral/__snapshots__/format.test.js.snap index 2488218d9..ed7b3f18b 100644 --- a/tests/format/StringLiteral/__snapshots__/format.test.js.snap +++ b/tests/format/StringLiteral/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`StringLiteral.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract StringLiteral { bytes32 public constant PERMIT_TYPEHASH = keccak256( diff --git a/tests/format/StyleGuide/__snapshots__/format.test.js.snap b/tests/format/StyleGuide/__snapshots__/format.test.js.snap index 8aac6d324..506f2cf7c 100644 --- a/tests/format/StyleGuide/__snapshots__/format.test.js.snap +++ b/tests/format/StyleGuide/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`BlankLines.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.4.0 <0.7.0; @@ -50,7 +50,7 @@ exports[`ControlStructures.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.4.0 <0.6.0; @@ -171,7 +171,7 @@ exports[`FunctionDeclaration.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.4.0 <0.7.0; @@ -462,7 +462,7 @@ exports[`Mappings.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.4.0 <0.7.0; @@ -493,7 +493,7 @@ exports[`MaximumLineLength.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.4.0 <0.6.0; @@ -648,7 +648,7 @@ exports[`OtherRecommendations.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.4.0 <0.6.0; @@ -715,7 +715,7 @@ exports[`VariableDeclarations.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.4.0 <0.7.0; @@ -738,7 +738,7 @@ exports[`WhitespaceInExpressions.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >=0.4.0 <0.6.0; diff --git a/tests/format/TryCatch/__snapshots__/format.test.js.snap b/tests/format/TryCatch/__snapshots__/format.test.js.snap index 685c9ffab..99859fea5 100644 --- a/tests/format/TryCatch/__snapshots__/format.test.js.snap +++ b/tests/format/TryCatch/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`TryCatch.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.6.0; diff --git a/tests/format/Tuples/__snapshots__/format.test.js.snap b/tests/format/Tuples/__snapshots__/format.test.js.snap index 0df0e1807..8104a38bb 100644 --- a/tests/format/Tuples/__snapshots__/format.test.js.snap +++ b/tests/format/Tuples/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`Tuples.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.5.0; diff --git a/tests/format/TypeDefinition/__snapshots__/format.test.js.snap b/tests/format/TypeDefinition/__snapshots__/format.test.js.snap index b8b333141..ba7c9bd26 100644 --- a/tests/format/TypeDefinition/__snapshots__/format.test.js.snap +++ b/tests/format/TypeDefinition/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`TypeDefinition.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity ^0.8.8; diff --git a/tests/format/WhileStatements/__snapshots__/format.test.js.snap b/tests/format/WhileStatements/__snapshots__/format.test.js.snap index b9470fb6e..54b7c0507 100644 --- a/tests/format/WhileStatements/__snapshots__/format.test.js.snap +++ b/tests/format/WhileStatements/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`WhileStatements.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== contract WhileStatements { uint constant LONG_VARIABLE = 1; diff --git a/tests/format/WrongCompiler/__snapshots__/format.test.js.snap b/tests/format/WrongCompiler/__snapshots__/format.test.js.snap index 32ad6d8ab..a0cabe27c 100644 --- a/tests/format/WrongCompiler/__snapshots__/format.test.js.snap +++ b/tests/format/WrongCompiler/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`WrongCompiler.sol - {"compiler":"0.8.4"} format 1`] = ` compiler: "0.8.4" parsers: ["antlr"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >= 0.7.0; pragma solidity >0.7.2 <= 0.7.5; @@ -23,7 +23,7 @@ exports[`WrongCompiler.sol - {"compiler":"v0.7.3+commit.9bfce1f6"} format 1`] = compiler: "v0.7.3+commit.9bfce1f6" parsers: ["antlr"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >= 0.7.0; pragma solidity >0.7.2 <= 0.7.5; @@ -41,7 +41,7 @@ exports[`WrongCompiler.sol - {"compiler":"v0.7.5-nightly.2020.11.9+commit.41f503 compiler: "v0.7.5-nightly.2020.11.9+commit.41f50365" parsers: ["antlr"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== pragma solidity >= 0.7.0; pragma solidity >0.7.2 <= 0.7.5; diff --git a/tests/format/quotes/__snapshots__/format.test.js.snap b/tests/format/quotes/__snapshots__/format.test.js.snap index ec1b33383..c9acbab68 100644 --- a/tests/format/quotes/__snapshots__/format.test.js.snap +++ b/tests/format/quotes/__snapshots__/format.test.js.snap @@ -5,7 +5,7 @@ exports[`Quotes.sol - {"singleQuote":false} format 1`] = ` parsers: ["slang"] printWidth: 80 singleQuote: false - | printWidth + printWidth: 80 | =====================================input====================================== import 'someContract.sol'; import "someOtherContract.sol"; @@ -64,7 +64,7 @@ exports[`Quotes.sol - {"singleQuote":true} format 1`] = ` parsers: ["slang"] printWidth: 80 singleQuote: true - | printWidth + printWidth: 80 | =====================================input====================================== import 'someContract.sol'; import "someOtherContract.sol"; diff --git a/tests/format/strings/__snapshots__/format.test.js.snap b/tests/format/strings/__snapshots__/format.test.js.snap index 5d368a54f..c8ec4abbf 100644 --- a/tests/format/strings/__snapshots__/format.test.js.snap +++ b/tests/format/strings/__snapshots__/format.test.js.snap @@ -4,7 +4,7 @@ exports[`strings.sol format 1`] = ` ====================================options===================================== parsers: ["slang"] printWidth: 80 - | printWidth + printWidth: 80 | =====================================input====================================== /* * @title String & slice utility library for Solidity contracts.