Remove file level functions and variable from namespace rewrite

packages/core/contracts/test/NamespacedToModify.sol

@@ -83,6 +83,8 @@ library Lib {
 }
 
 contract Consumer {
+  bytes4 public variableFromConstant = CONSTANT_USING_SELECTOR;
+
   function usingFreeFunction() pure public returns (bytes4) {
     return FreeFunctionUsingSelector();
   }
@@ -100,6 +102,14 @@ function plusTwo(uint x) pure returns (uint) {
   return x + 2;
 }
 
+function plusThree(uint x) pure returns (uint) {
+  return x + 3;
+}
+
+function plusThree(uint x, uint y) pure returns (uint) {
+  return x + y + 3;
+}
+
 using {plusTwo} for uint;
 
 contract UsingForDirectives {

packages/core/src/utils/make-namespaced.test.ts.md

@@ -82,9 +82,9 @@ Generated by [AVA](https://avajs.dev).
             ␊
           }␊
           ␊
-          uint256 constant FreeFunctionUsingSelector = 0;␊
           ␊
-          uint256 constant CONSTANT_USING_SELECTOR = 0;␊
+          ␊
+          ␊
           ␊
           library Lib {␊
             ␊
@@ -98,9 +98,15 @@ Generated by [AVA](https://avajs.dev).
             ␊
           ␊
             ␊
+          ␊
+            ␊
           }␊
           ␊
-          uint256 constant plusTwo = 0;␊
+          ␊
+          ␊
+          ␊
+          ␊
+          ␊
           ␊
           ␊
           ␊

packages/core/src/utils/make-namespaced.ts

@@ -44,52 +44,69 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
     const modifications: Modification[] = [];
 
     for (const node of output.sources[sourcePath].ast.nodes) {
-      if (isNodeType('ContractDefinition', node)) {
-        const contractDef = node;
-
-        // Remove any calls to parent constructors from the inheritance list
-        const inherits = contractDef.baseContracts;
-        for (const inherit of inherits) {
-          if (Array.isArray(inherit.arguments)) {
-            assert(inherit.baseName.name !== undefined);
-            modifications.push(makeReplace(inherit, orig, inherit.baseName.name));
-          }
-        }
-
-        const contractNodes = contractDef.nodes;
-        for (const contractNode of contractNodes) {
-          if (
-            isNodeType('FunctionDefinition', contractNode) ||
-            isNodeType('ModifierDefinition', contractNode) ||
-            isNodeType('VariableDeclaration', contractNode)
-          ) {
-            if (contractNode.documentation) {
-              modifications.push(makeDelete(contractNode.documentation, orig));
+      switch (node.nodeType) {
+        case 'ContractDefinition':
+          const contractDef = node;
+
+          // Remove any calls to parent constructors from the inheritance list
+          const inherits = contractDef.baseContracts;
+          for (const inherit of inherits) {
+            if (Array.isArray(inherit.arguments)) {
+              assert(inherit.baseName.name !== undefined);
+              modifications.push(makeReplace(inherit, orig, inherit.baseName.name));
             }
-            modifications.push(makeDelete(contractNode, orig));
-          } else if (isNodeType('UsingForDirective', contractNode)) {
-            modifications.push(makeDelete(contractNode, orig));
-          } else if (isNodeType('StructDefinition', contractNode)) {
-            const storageLocation = getStorageLocationAnnotation(contractNode);
-            if (storageLocation !== undefined) {
-              const structName = contractNode.name;
-              const variableName = `$${structName}_${(Math.random() * 1e6).toFixed(0)}`;
-              const insertText = ` ${structName} ${variableName};`;
-
-              modifications.push(makeInsertAfter(contractNode, insertText));
+          }
+
+          const contractNodes = contractDef.nodes;
+          for (const contractNode of contractNodes) {
+            switch(contractNode.nodeType) {
+              case 'FunctionDefinition':
+              case 'ModifierDefinition':
+              case 'VariableDeclaration':
+                if (contractNode.documentation) {
+                  modifications.push(makeDelete(contractNode.documentation, orig));
+                }
+                modifications.push(makeDelete(contractNode, orig));
+                break;
+
+              case 'UsingForDirective':
+                modifications.push(makeDelete(contractNode, orig));
+                break;
+
+              case 'StructDefinition':
+                const storageLocation = getStorageLocationAnnotation(contractNode);
+                if (storageLocation !== undefined) {
+                  const structName = contractNode.name;
+                  const variableName = `$${structName}_${(Math.random() * 1e6).toFixed(0)}`;
+                  const insertText = ` ${structName} ${variableName};`;
+
+                  modifications.push(makeInsertAfter(contractNode, insertText));
+                }
+                break;
+
+              case 'EnumDefinition':
+              case 'ErrorDefinition':
+              case 'EventDefinition':
+              case 'UserDefinedValueTypeDefinition':
+                // nothing
+                break;
             }
           }
-        }
-      } else if (isNodeType('FunctionDefinition', node) || isNodeType('VariableDeclaration', node)) {
-        if (node.documentation) {
-          modifications.push(makeDelete(node.documentation, orig));
-        }
-        // Replace with a dummy variable of arbitrary type
-        const name = node.name;
-        const insertText = `uint256 constant ${name} = 0;`;
-        modifications.push(makeReplace(node, orig, insertText));
-      } else if (isNodeType('UsingForDirective', node)) {
-        modifications.push(makeDelete(node, orig));
+          break;
+
+        case 'FunctionDefinition':
+        case 'UsingForDirective':
+        case 'VariableDeclaration':
+          modifications.push(makeDelete(node, orig));
+          break;
+
+        case 'EnumDefinition':
+        case 'ErrorDefinition':
+        case 'ImportDirective':
+        case 'PragmaDirective':
+        case 'StructDefinition':
+        case 'UserDefinedValueTypeDefinition':
+          break;
       }
     }