Merge pull request #1126 from prettier-solidity/rename-parsers

Rename parsers

Author: fvictorio

README.md

@@ -18,10 +18,10 @@ import type {
 } from 'prettier';
 import type { AstNode } from './slang-nodes/types.d.ts';
 
-const slangParserId = 'slang-solidity';
-const antlrParserId = 'solidity-parse';
+const slangParserId = 'slang';
+const antlrParserId = 'antlr';
 const slangAstId = 'slang-ast';
-const antlrAstId = 'solidity-ast';
+const antlrAstId = 'antlr-ast';
 
 // https://prettier.io/docs/en/plugins.html#languages
 // https://github.com/github-linguist/linguist/blob/master/lib/linguist/languages.yml

src/index.ts

@@ -18,7 +18,7 @@ function once(factory) {
 
 const warnDeprecation = once(() => {
   printWarning(
-    `'solidity-parse' has been deprecated, please use 'slang-solidity'.`
+    `The 'antlr' parser has been deprecated, please use 'slang' instead.`
   );
   return true;
 });

src/printer.js

@@ -322,7 +322,7 @@ async function runTest({
   }
 
   if (
-    formatOptions.parser === "slang-solidity" &&
+    formatOptions.parser === "slang" &&
     !isAntlrMismatch(filename, formatOptions)
   ) {
     // Compare with ANTLR's format
@@ -335,7 +335,7 @@ async function runTest({
       compiler:
         formatOptions.compiler ||
         createParser(code, formatOptions)[0].languageVersion,
-      parser: "solidity-parse",
+      parser: "antlr",
       plugins: await getPlugins(),
     });
     expect(antlrOutput).toEqual(formatResult.output);

tests/config/run-format-test.js

@@ -2,7 +2,7 @@
 
 exports[`AddressPayable.sol format 1`] = `
 ====================================options=====================================
-parsers: ["slang-solidity"]
+parsers: ["slang"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================

tests/format/AddressPayable/__snapshots__/format.test.js.snap

@@ -1 +1 @@
-runFormatTest(import.meta, ['slang-solidity']);
+runFormatTest(import.meta, ['slang']);

tests/format/AddressPayable/format.test.js

@@ -2,7 +2,7 @@
 
 exports[`AllSolidityFeatures.sol format 1`] = `
 ====================================options=====================================
-parsers: ["slang-solidity"]
+parsers: ["slang"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================

tests/format/AllSolidityFeatures/__snapshots__/format.test.js.snap

@@ -1 +1 @@
-runFormatTest(import.meta, ['slang-solidity']);
+runFormatTest(import.meta, ['slang']);

tests/format/AllSolidityFeatures/format.test.js

@@ -2,7 +2,7 @@
 
 exports[`AllSolidityFeatures.sol format 1`] = `
 ====================================options=====================================
-parsers: ["slang-solidity"]
+parsers: ["slang"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================

tests/format/AllSolidityFeaturesV0.4.26/__snapshots__/format.test.js.snap

@@ -1 +1 @@
-runFormatTest(import.meta, ['slang-solidity']);
+runFormatTest(import.meta, ['slang']);