Add support for virtual keyword and abstract contracts (#228)

prettier-solidity · Feb 19, 2020 · 9b39d17 · 9b39d17
1 parent 618a1b6
commit 9b39d17
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/src/nodes/ContractDefinition.js b/src/nodes/ContractDefinition.js
@@ -36,7 +36,7 @@ const ContractDefinition = {
     concat([
       group(
         concat([
-          node.kind,
+          node.kind === 'abstract' ? 'abstract contract' : node.kind,
           ' ',
           node.name,
           inheritance(node, path, print),

diff --git a/src/nodes/FunctionDefinition.js b/src/nodes/FunctionDefinition.js
@@ -34,6 +34,13 @@ const visibility = node => {
   return '';
 };
 
+const virtual = node => {
+  if (node.isVirtual) {
+    return concat([line, 'virtual']);
+  }
+  return '';
+};
+
 const stateMutability = node => {
   if (node.stateMutability && node.stateMutability !== 'default') {
     return concat([line, node.stateMutability]);
@@ -81,6 +88,7 @@ const FunctionDefinition = {
         group(
           concat([
             visibility(node),
+            virtual(node),
             stateMutability(node),
             modifiers(node, path, print),
             returnParameters(node, path, print),

diff --git a/tests/AllSolidityFeatures/AllSolidityFeatures.sol b/tests/AllSolidityFeatures/AllSolidityFeatures.sol
@@ -417,3 +417,13 @@ contract continueStatement {
     while (true) { continue; }
   }
 }
+
+abstract  contract  AbstractContract {
+
+}
+
+contract  ContractWithVirtual
+{
+  function   foo() public virtual  returns  ( uint ) {
+  }
+}
diff --git a/tests/AllSolidityFeatures/__snapshots__/jsfmt.spec.js.snap b/tests/AllSolidityFeatures/__snapshots__/jsfmt.spec.js.snap
@@ -420,6 +420,16 @@ contract continueStatement {
     while (true) { continue; }
   }
 }
+
+abstract  contract  AbstractContract {
+
+}
+
+contract  ContractWithVirtual
+{
+  function   foo() public virtual  returns  ( uint ) {
+  }
+}
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Examples taken from the Solidity documentation online.
 
@@ -889,4 +899,12 @@ contract continueStatement {
     }
 }
 
+
+abstract contract AbstractContract {}
+
+
+contract ContractWithVirtual {
+    function foo() public virtual returns (uint256) {}
+}
+
 `;