Merge branch 'master' into fixTabSwitch

apps/remix-ide/ci/publishIpfs

@@ -5,8 +5,8 @@ const { globSource } = IpfsHttpClient
 const folder = process.cwd() + '/dist/apps/remix-ide';
 
 (async () => {
-  const host = 'ipfs.remixproject.org'
-  const ipfs = IpfsHttpClient({ host, port: 443, protocol: 'https' })
+  const host = 'ipfs.infura.io'
+  const ipfs = IpfsHttpClient({ host, port: 5001, protocol: 'https' })
   try {
     let result = await ipfs.add(globSource(folder, { recursive: true}), { pin: false })
     const hash = result.cid.toString()

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

@@ -304,14 +304,15 @@ export const CompilerApiMixin = (Base) => class extends Base {
       if (data.errors) {
         for (const error of data.errors) {
           let pos = helper.getPositionDetails(error.formattedMessage)
-          if (pos.errFile) {
+          const file = pos.errFile
+          if (file) {
             pos = {
               row: pos.errLine,
               column: pos.errCol,
               text: error.formattedMessage,
               type: error.severity
             }
-            await this.call('editor', 'addAnnotation', pos, pos.errFile)
+            await this.call('editor', 'addAnnotation', pos, file)
           }
         }
       }