Unverified Commit 23f9bb57 authored by Rob's avatar Rob Committed by GitHub

Merge branch 'master' into m10

parents 5de3aa4f 21fe63a7
......@@ -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()
}
......
......@@ -48,6 +48,7 @@ module.exports = class TestTab extends ViewPlugin {
appManager.event.on('activate', (name) => {
if (name === 'solidity') this.updateRunAction()
console.log('solidity is activated')
})
appManager.event.on('deactivate', (name) => {
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 () {
this.off('filePanel', 'newTestFileCreated')
this.off('filePanel', 'setWorkspace')
......@@ -637,7 +646,6 @@ module.exports = class TestTab extends ViewPlugin {
el.setAttribute('title', 'No solidity file selected')
} else {
el.setAttribute('title', 'The "Solidity Plugin" should be activated')
// @todo(#2747) we can activate the plugin here
}
}
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)
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)
}
......
......@@ -82,7 +82,7 @@ commander
const baseURL = 'https://binaries.soliditylang.org/wasm/'
const response: AxiosResponse = await axios.get(baseURL + 'list.json')
const { releases, latestRelease } = response.data
const compString = releases[compVersion]
const compString = releases ? releases[compVersion] : null
if (!compString) {
log.error(`No compiler found in releases with version ${compVersion}`)
process.exit()
......
......@@ -156,7 +156,8 @@ function errorHandler (error: any, service: string) {
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) {
try {
// eslint-disable-next-line
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment