Merge branch 'master' into remixd_terminal

pull/5370/head
David Zagi 3 years ago committed by GitHub
commit 02c025a392
  1. 17
      apps/remix-ide/src/app/tabs/compile-tab.js
  2. 2
      libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
  3. 2
      package-lock.json
  4. 4
      package.json

@ -33,7 +33,7 @@ const profile = {
location: 'sidePanel',
documentation: 'https://remix-ide.readthedocs.io/en/latest/solidity_editor.html',
version: packageJson.version,
methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig']
methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile']
}
@ -508,6 +508,21 @@ class CompileTab extends ViewPlugin {
onActivation () {
this.call('manager', 'activatePlugin', 'solidity-logic')
this.listenToEvents()
this.call('filePanel', 'registerContextMenuItem', {
id: 'solidity',
name: 'compileFile',
label: 'Compile',
type: [],
extension: ['.sol'],
path: [],
pattern: []
})
}
compileFile (event) {
if (event.path.length > 0) {
this.compileTabLogic.compileFile(event.path[0])
}
}
onDeactivation () {

@ -130,7 +130,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
row = location.start.line
column = location.start.column
locationString = row + 1 + ':' + column + ':'
fileName = Object.keys(lastCompilationResult.contracts)[file]
fileName = Object.keys(lastCompilationResult.sources)[file]
}
warningCount++
const msg = message(item.name, item.warning, item.more, fileName, locationString)

2
package-lock.json generated

@ -1,6 +1,6 @@
{
"name": "remix-project",
"version": "0.14.0-dev",
"version": "0.15.0-dev",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

@ -1,6 +1,6 @@
{
"name": "remix-project",
"version": "0.14.0-dev",
"version": "0.15.0-dev",
"license": "MIT",
"description": "Ethereum Remix Monorepo",
"keywords": [
@ -177,7 +177,7 @@
"web3": "1.2.4",
"winston": "^3.3.3",
"ws": "^7.3.0"
},
},
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/plugin-transform-modules-amd": "^7.10.4",

Loading…
Cancel
Save