removing the logic that added issues for maintainance

Janther · Janther · commit 71682dccdbcd · 2025-06-16T19:01:45.000+01:00
diff --git a/src/slang-utils/create-parser.ts b/src/slang-utils/create-parser.ts
@@ -9,50 +9,6 @@ import type { AstNode } from '../slang-nodes/types.js';
 
 const supportedVersions = LanguageFacts.allVersions();
 
-// This list was retrieved from Slang's documentation.
-// https://nomicfoundation.github.io/slang/latest/solidity-grammar/supported-versions/
-// TODO: use the run-time functionality if NomicFoundation decides to expose
-// this information directly.
-const milestoneVersions = [
-  '0.4.14',
-  '0.4.16',
-  '0.4.21',
-  '0.4.22',
-  '0.4.25',
-  '0.5.0',
-  '0.5.3',
-  '0.5.5',
-  '0.5.8',
-  '0.5.10',
-  '0.5.14',
-  '0.6.0',
-  '0.6.2',
-  '0.6.5',
-  '0.6.7',
-  '0.6.8',
-  '0.6.11',
-  '0.7.0',
-  '0.7.1',
-  '0.7.4',
-  '0.8.0',
-  '0.8.4',
-  '0.8.8',
-  '0.8.13',
-  '0.8.18',
-  '0.8.19',
-  '0.8.22',
-  '0.8.27',
-  '0.8.29'
-].map(
-  // Since we are aiming to find the highest compatible Language version, we
-  // define a milestone as the highest possible supported version that is
-  // smaller than the original milestone taken from the documentation.
-  // This has an extra cost in execution time and the actual list could be
-  // hardcoded, but the calculation is done only once and it's easier to
-  // maintain.
-  (milestone) => maxSatisfying(supportedVersions, `<${milestone}`)!
-);
-
 function parserAndOutput(
   text: string,
   version: string
@@ -73,17 +29,16 @@ export function createParser(
 
   const inferredRanges: string[] = LanguageFacts.inferLanguageVersions(text);
 
-  let result = parserAndOutput(text, inferredRanges[inferredRanges.length - 1]);
-  if (result.parseOutput.isValid()) return result;
-
-  const inferredMilestones = milestoneVersions.filter((milestone) =>
-    inferredRanges.includes(milestone)
+  const result = parserAndOutput(
+    text,
+    inferredRanges[inferredRanges.length - 1]
   );
-
-  for (let i = inferredMilestones.length - 1; i >= 0; i -= 1) {
-    result = parserAndOutput(text, inferredMilestones[i]);
-    if (result.parseOutput.isValid()) break;
-  }
+  if (!result.parseOutput.isValid())
+    throw new Error(
+      `Based on the pragma statements, we inferred your code to be using Solidity version ${
+        result.parser.languageVersion
+      }. If you would like to change that, update the pragmas in your source file, or specify a version in \`.prettierrc\` or VSCode's \`settings.json\`.`
+    );
 
   return result;
 }
diff --git a/tests/format/AllSolidityFeaturesV0.4.26/__snapshots__/format.test.js.snap b/tests/format/AllSolidityFeaturesV0.4.26/__snapshots__/format.test.js.snap
@@ -1,7 +1,8 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`AllSolidityFeatures.sol format 1`] = `
+exports[`AllSolidityFeatures.sol - {"compiler":"0.4.26"} format 1`] = `
 ====================================options=====================================
+compiler: "0.4.26"
 parsers: ["slang"]
 printWidth: 80
                                                                                 | printWidth
diff --git a/tests/format/AllSolidityFeaturesV0.4.26/format.test.js b/tests/format/AllSolidityFeaturesV0.4.26/format.test.js
@@ -1 +1 @@
-runFormatTest(import.meta, ['slang']);
+runFormatTest(import.meta, ['slang'], { compiler: '0.4.26' });
diff --git a/tests/format/BasicIterator/__snapshots__/format.test.js.snap b/tests/format/BasicIterator/__snapshots__/format.test.js.snap
@@ -1,7 +1,8 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`BasicIterator.sol format 1`] = `
+exports[`BasicIterator.sol - {"compiler":"0.4.26"} format 1`] = `
 ====================================options=====================================
+compiler: "0.4.26"
 parsers: ["slang"]
 printWidth: 80
                                                                                 | printWidth
diff --git a/tests/format/BasicIterator/format.test.js b/tests/format/BasicIterator/format.test.js
@@ -1 +1 @@
-runFormatTest(import.meta, ['slang']);
+runFormatTest(import.meta, ['slang'], { compiler: '0.4.26' });
diff --git a/tests/format/FunctionDefinitionsV0.5.0/__snapshots__/format.test.js.snap b/tests/format/FunctionDefinitionsV0.5.0/__snapshots__/format.test.js.snap
@@ -1,7 +1,8 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`FunctionDefinitions.sol format 1`] = `
+exports[`FunctionDefinitions.sol - {"compiler":"0.5.17"} format 1`] = `
 ====================================options=====================================
+compiler: "0.5.17"
 parsers: ["slang"]
 printWidth: 80
                                                                                 | printWidth
diff --git a/tests/format/FunctionDefinitionsV0.5.0/format.test.js b/tests/format/FunctionDefinitionsV0.5.0/format.test.js
@@ -1 +1 @@
-runFormatTest(import.meta, ['slang']);
+runFormatTest(import.meta, ['slang'], { compiler: '0.5.17' });
diff --git a/tests/format/FunctionDefinitionsv0.5.0/__snapshots__/format.test.js.snap b/tests/format/FunctionDefinitionsv0.5.0/__snapshots__/format.test.js.snap
@@ -1,7 +1,8 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`FunctionDefinitions.sol format 1`] = `
+exports[`FunctionDefinitions.sol - {"compiler":"0.5.17"} format 1`] = `
 ====================================options=====================================
+compiler: "0.5.17"
 parsers: ["slang"]
 printWidth: 80
                                                                                 | printWidth
diff --git a/tests/format/FunctionDefinitionsv0.5.0/format.test.js b/tests/format/FunctionDefinitionsv0.5.0/format.test.js
@@ -1 +1 @@
-runFormatTest(import.meta, ['slang']);
+runFormatTest(import.meta, ['slang'], { compiler: '0.5.17' });
diff --git a/tests/format/IndexOf/__snapshots__/format.test.js.snap b/tests/format/IndexOf/__snapshots__/format.test.js.snap
@@ -1,7 +1,8 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`IndexOf.sol format 1`] = `
+exports[`IndexOf.sol - {"compiler":"0.4.26"} format 1`] = `
 ====================================options=====================================
+compiler: "0.4.26"
 parsers: ["slang"]
 printWidth: 80
                                                                                 | printWidth
diff --git a/tests/format/IndexOf/format.test.js b/tests/format/IndexOf/format.test.js
@@ -1 +1 @@
-runFormatTest(import.meta, ['slang']);
+runFormatTest(import.meta, ['slang'], { compiler: '0.4.26' });
diff --git a/tests/unit/slang-utils/create-parser.test.js b/tests/unit/slang-utils/create-parser.test.js
@@ -102,8 +102,8 @@ describe('inferLanguage', function () {
     ({ parser } = createParser(`contract Foo {}`, options));
     expect(parser.languageVersion).toEqual(latestSupportedVersion);
 
-    ({ parser } = createParser(`contract Foo {byte bar;}`, options));
-    expect(parser.languageVersion).toEqual('0.7.6');
+    // ({ parser } = createParser(`contract Foo {byte bar;}`, options));
+    // expect(parser.languageVersion).toEqual('0.7.6');
   });
 
   test('should use compiler option if given', function () {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-runFormatTest(import.meta, ['slang']);`
	`1`	`+runFormatTest(import.meta, ['slang'], { compiler: '0.4.26' });`