Merge pull request #883 from ethereum/fixAnalysis

src/app/staticanalysis/modules/similarVariableNames.js

@@ -29,11 +29,11 @@ function report (contracts, multipleContractsWithSameName) {
       var funcName = common.getFullQuallyfiedFuncDefinitionIdent(contract.node, func.node, func.parameters)
       var hasModifiersComments = ''
       if (hasModifiers) {
-        hasModifiersComments = yo`<span><br/><i>Note:</i> Modifiers are currently not considered by this static analysis.</span>`
+        hasModifiersComments = yo`<span><br><i>Note:</i> Modifiers are currently not considered by this static analysis.</span>`
       }
       var multipleContractsWithSameNameComments = ''
       if (multipleContractsWithSameName) {
-        multipleContractsWithSameNameComments = yo`<span><br/><i>Note:</i> Import aliases are currently not supported by this static analysis.</span>`
+        multipleContractsWithSameNameComments = yo`<span><br><i>Note:</i> Import aliases are currently not supported by this static analysis.</span>`
       }
 
       var vars = getFunctionVariables(contract, func).map(common.getDeclaredVariableName)

test-browser/tests/staticanalysis.js

@@ -11,7 +11,11 @@ contract test1 { address test = tx.origin; }
 contract test2 {}
 contract TooMuchGas {
   uint x;
-  function() { x++; }
+  function() { 
+      x++;
+    uint test;
+    uint test1;
+  }
 }`}
 ]
 
@@ -38,7 +42,8 @@ function runTests (browser) {
       .click('#staticanalysisView button')
       .waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () {
         dom.listSelectorContains(['browser/Untitled.sol:2:33: Use of tx.origin',
-          'Fallback function of contract browser/Untitled.sol:TooMuchGas requires too much gas'],
+          'Fallback function of contract browser/Untitled.sol:TooMuchGas requires too much gas',
+          'TooMuchGas.(): Variables have very similar names test and test1.'],
           '#staticanalysisresult .warning',
           browser, function () {
             browser.end()