Merge pull request #1582 from ethereum/yann300-patch-32

Fixes: Error count in badge in solidity compiler & current file & autocompile in URL params

apps/remix-ide-e2e/src/tests/url.spec.ts

@@ -19,10 +19,16 @@ module.exports = {
 
   'Should load the code from URL params (code param)': function (browser: NightwatchBrowser) {
     browser
+      .waitForElementVisible('[for="autoCompile"]')
+      .click('[for="autoCompile"]') // we set it too false in the local storage
       .pause(5000)
-      .url('http://127.0.0.1:8080/#optimize=true&runs=300&evmVersion=istanbul&version=soljson-v0.7.4+commit.3f05b770.js&code=cHJhZ21hIHNvbGlkaXR5ID49MC42LjAgPDAuNy4wOwoKaW1wb3J0ICJodHRwczovL2dpdGh1Yi5jb20vT3BlblplcHBlbGluL29wZW56ZXBwZWxpbi1jb250cmFjdHMvYmxvYi9tYXN0ZXIvY29udHJhY3RzL2FjY2Vzcy9Pd25hYmxlLnNvbCI7Cgpjb250cmFjdCBHZXRQYWlkIGlzIE93bmFibGUgewogIGZ1bmN0aW9uIHdpdGhkcmF3KCkgZXh0ZXJuYWwgb25seU93bmVyIHsKICB9Cn0')
+      .url('http://127.0.0.1:8080/#autoCompile=true&optimize=true&runs=300&evmVersion=istanbul&version=soljson-v0.7.4+commit.3f05b770.js&code=cHJhZ21hIHNvbGlkaXR5ID49MC42LjAgPDAuNy4wOwoKaW1wb3J0ICJodHRwczovL2dpdGh1Yi5jb20vT3BlblplcHBlbGluL29wZW56ZXBwZWxpbi1jb250cmFjdHMvYmxvYi9tYXN0ZXIvY29udHJhY3RzL2FjY2Vzcy9Pd25hYmxlLnNvbCI7Cgpjb250cmFjdCBHZXRQYWlkIGlzIE93bmFibGUgewogIGZ1bmN0aW9uIHdpdGhkcmF3KCkgZXh0ZXJuYWwgb25seU93bmVyIHsKICB9Cn0')
       .refresh() // we do one reload for making sure we already have the default workspace
       .pause(5000)
+      .verify.elementPresent('[data-id="compilerContainerAutoCompile"]:checked')
+      .click('[for="autoCompile"]') // we set it too false again
+      .click('[for="autoCompile"]') // back to True in the local storage
+      .assert.containsText('*[data-id="compilerContainerCompileBtn"]', 'contract-76747f6e19.sol')
       .currentWorkspaceIs('code-sample')
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(

apps/remix-ide/src/app/tabs/compile-tab.js

@@ -113,7 +113,7 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
     return super.compileFile(event)
   }
 
-  onActivation () {
+  async onActivation () {
     super.onActivation()
     this.call('filePanel', 'registerContextMenuItem', {
       id: 'solidity',
@@ -124,6 +124,7 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
       path: [],
       pattern: []
     })
+    this.currentFile = await this.call('fileManager', 'file')
   }
 
   getCompilerParameters () {
@@ -138,7 +139,9 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
   }
 
   getAppParameter (name) {
-    const param = this.config.get(name)
+    // first look in the URL params then in the local storage
+    const params = this.queryParams.get()
+    const param = params[name] ? params[name] : this.config.get(name)
     if (param === 'true') return true
     if (param === 'false') return false
     return param

apps/solidity-compiler/src/app/compiler-api.ts

@@ -264,7 +264,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
           )
         })
       } else {
-        const count = (data.errors ? data.errors.filter(error => error.severity === 'error').length : 0) + data.error ? 1 : 0
+        const count = (data.errors ? data.errors.filter(error => error.severity === 'error').length : 0 + (data.error ? 1 : 0))
         this.emit('statusChanged', { key: count, title: `compilation failed with ${count} error${count > 1 ? 's' : ''}`, type: 'error' })
       }
       // Update contract Selection