Merge branch 'master' into m10

pull/1635/head
Rob 3 years ago committed by GitHub
commit 23f9bb570a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      apps/remix-ide/src/app/tabs/analysis-tab.js
  2. 10
      apps/remix-ide/src/app/tabs/test-tab.js
  3. 2
      apps/remix-ide/src/remixAppManager.js
  4. 2
      libs/remix-tests/src/run.ts
  5. 3
      libs/remixd/src/bin/remixd.ts

@ -39,7 +39,11 @@ class AnalysisTab extends ViewPlugin {
} }
} }
onActivation () { async onActivation () {
const isSolidityActive = await this.call('manager', 'isActive', 'solidity')
if (!isSolidityActive) {
await this.call('manager', 'activatePlugin', 'solidity')
}
this.renderComponent() this.renderComponent()
} }

@ -48,6 +48,7 @@ module.exports = class TestTab extends ViewPlugin {
appManager.event.on('activate', (name) => { appManager.event.on('activate', (name) => {
if (name === 'solidity') this.updateRunAction() if (name === 'solidity') this.updateRunAction()
console.log('solidity is activated')
}) })
appManager.event.on('deactivate', (name) => { appManager.event.on('deactivate', (name) => {
if (name === 'solidity') this.updateRunAction() if (name === 'solidity') this.updateRunAction()
@ -74,6 +75,14 @@ module.exports = class TestTab extends ViewPlugin {
} }
} }
async onActivation () {
const isSolidityActive = await this.call('manager', 'isActive', 'solidity')
if (!isSolidityActive) {
await this.call('manager', 'activatePlugin', 'solidity')
}
this.updateRunAction()
}
onDeactivation () { onDeactivation () {
this.off('filePanel', 'newTestFileCreated') this.off('filePanel', 'newTestFileCreated')
this.off('filePanel', 'setWorkspace') this.off('filePanel', 'setWorkspace')
@ -637,7 +646,6 @@ module.exports = class TestTab extends ViewPlugin {
el.setAttribute('title', 'No solidity file selected') el.setAttribute('title', 'No solidity file selected')
} else { } else {
el.setAttribute('title', 'The "Solidity Plugin" should be activated') el.setAttribute('title', 'The "Solidity Plugin" should be activated')
// @todo(#2747) we can activate the plugin here
} }
} }
if (!this.runActionElement) { if (!this.runActionElement) {

@ -14,7 +14,7 @@ const requiredModules = [ // services + layout views + system views
const dependentModules = ['git', 'hardhat'] // module which shouldn't be manually activated (e.g git is activated by remixd) const dependentModules = ['git', 'hardhat'] // module which shouldn't be manually activated (e.g git is activated by remixd)
export function isNative (name) { export function isNative (name) {
const nativePlugins = ['vyper', 'workshops', 'debugger', 'remixd', 'menuicons', 'solidity', 'hardhat-provider'] const nativePlugins = ['vyper', 'workshops', 'debugger', 'remixd', 'menuicons', 'solidity', 'hardhat-provider', 'solidityStaticAnalysis', 'solidityUnitTesting']
return nativePlugins.includes(name) || requiredModules.includes(name) return nativePlugins.includes(name) || requiredModules.includes(name)
} }

@ -82,7 +82,7 @@ commander
const baseURL = 'https://binaries.soliditylang.org/wasm/' const baseURL = 'https://binaries.soliditylang.org/wasm/'
const response: AxiosResponse = await axios.get(baseURL + 'list.json') const response: AxiosResponse = await axios.get(baseURL + 'list.json')
const { releases, latestRelease } = response.data const { releases, latestRelease } = response.data
const compString = releases[compVersion] const compString = releases ? releases[compVersion] : null
if (!compString) { if (!compString) {
log.error(`No compiler found in releases with version ${compVersion}`) log.error(`No compiler found in releases with version ${compVersion}`)
process.exit() process.exit()

@ -156,7 +156,8 @@ function errorHandler (error: any, service: string) {
console.error(e) console.error(e)
} }
return data.includes(origin) ? data.includes(origin) : data.includes(domain) const dataArray:string[] = data
return dataArray.includes(origin) ? dataArray.includes(origin) : dataArray.includes(domain)
} catch (e) { } catch (e) {
try { try {
// eslint-disable-next-line // eslint-disable-next-line

Loading…
Cancel
Save