fix(FileAnalyzer): update regex to find top level keywords

relates: rkalis/truffle-plugin-verify#13
RyuuGan · Sep 10, 2019 · 10d1e60 · 10d1e60
1 parent 1bcd6ea
commit 10d1e60
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/fileAnalyzer.ts b/lib/fileAnalyzer.ts
@@ -129,7 +129,7 @@ export class FileAnalyzer {
    *
    */
   analyzeExports(contents: string): FileAnalyzerExportsResult[] {
-    const exportRegex = /(contract|library|interface)\s+([a-zA-Z_$][a-zA-Z_$0-9]*)\s*([\s\S]*?)\{/g;
+    const exportRegex = /(contract|library|interface)\s+([a-zA-Z_$][a-zA-Z_$0-9]*)\s*([^"]*?)\{/g;
     const results = [];
     let group: RegExpExecArray;
     while ((group = exportRegex.exec(contents))) {

diff --git a/test/index.spec.ts b/test/index.spec.ts
@@ -47,4 +47,8 @@ describe('Solidity Merger', () => {
     const result = await merge(file);
     assertWithFile(result, 'LocalImports.sol');
   });
+
+  it('should not find keywords in strings', async () => {
+    await testFile('ReservedWordsInString');
+  });
 });
diff --git a/tsconfig.json b/tsconfig.json
@@ -8,7 +8,7 @@
     "esModuleInterop": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "importHelpers": true,
+    "importHelpers": false,
     "target": "es6",
     "module": "commonjs",
     "typeRoots": ["node_modules/@types"],