At Address
${atAddressButtonInput}
@@ -335,17 +356,17 @@ function contractDropdown (events, self) {
`
function setInputParamsPlaceHolder () {
- createPanel.innerHTML = ''
+ self._view.createPanel.innerHTML = ''
if (self._deps.compiler.getContract && selectContractNames.selectedIndex >= 0 && selectContractNames.children.length > 0) {
var ctrabi = txHelper.getConstructorInterface(getSelectedContract().contract.object.abi)
var ctrEVMbc = getSelectedContract().contract.object.evm.bytecode.object
var createConstructorInstance = new MultiParamManager(0, ctrabi, (valArray, inputsValues) => {
createInstance(inputsValues)
}, txHelper.inputParametersDeclarationToString(ctrabi.inputs), 'Deploy', ctrEVMbc)
- createPanel.appendChild(createConstructorInstance.render())
+ self._view.createPanel.appendChild(createConstructorInstance.render())
return
} else {
- createPanel.innerHTML = 'No compiled contracts'
+ self._view.createPanel.innerHTML = 'No compiled contracts'
}
}
@@ -624,7 +645,6 @@ function settings (container, self) {
function newAccount () {
self._deps.udapp.newAccount('', (error, address) => {
if (!error) {
- container.querySelector('#txorigin').appendChild(yo`
`)
addTooltip(`account ${address} created`)
} else {
addTooltip('Cannot create an account: ' + error)
diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js
index 02493e9926..1850cd9454 100644
--- a/src/app/tabs/styles/run-tab-styles.js
+++ b/src/app/tabs/styles/run-tab-styles.js
@@ -124,7 +124,7 @@ var css = csjs`
.button {
display: flex;
align-items: center;
- margin-top: 2%;
+ margin-top: 13px;
}
.transaction {
${styles.rightPanel.runTab.button_transaction}
@@ -140,6 +140,9 @@ var css = csjs`
border-bottom-right-radius: 0;
border-right: 0;
}
+ .atAddressSect {
+ margin-top: 6px;
+ }
.atAddressSect input {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
@@ -148,7 +151,8 @@ var css = csjs`
${styles.rightPanel.runTab.button_Create}
}
.input {
- ${styles.rightPanel.runTab.input_RunTab}
+ ${styles.rightPanel.runTab.input_RunTab};
+ font-size: 10px;
}
.noInstancesText {
${styles.rightPanel.runTab.box_Instance}
@@ -233,7 +237,14 @@ var css = csjs`
justify-content: space-evenly;
${styles.rightPanel.runTab.box_Info_RunTab};
width: 145px;
-}
+ }
+ .orLabel {
+ margin-left: 44px;
+ }
+ .infoDeployAction {
+ margin-left: 5px;
+ font-size: 13px;
+ }
`
module.exports = css
diff --git a/src/lib/cmdInterpreterAPI.js b/src/lib/cmdInterpreterAPI.js
index cef5a05579..5f6d8bbe8f 100644
--- a/src/lib/cmdInterpreterAPI.js
+++ b/src/lib/cmdInterpreterAPI.js
@@ -28,6 +28,7 @@ class CmdInterpreterAPI {
offsetToLineColumnConverter: self._components.registry.get('offsettolinecolumnconverter').api
}
self.commandHelp = {
+ 'remix.getFile(path)': 'Returns te content of the file located at the given path',
'remix.debug(hash)': 'Start debugging a transaction.',
'remix.loadgist(id)': 'Load a gist in the file explorer.',
'remix.loadurl(url)': 'Load the given url in the file explorer. The url can be of type github, swarm, ipfs or raw http',
@@ -45,7 +46,7 @@ class CmdInterpreterAPI {
self._components.sourceHighlighter.currentSourceLocation(null)
return
}
- var lineColumnPos = self._deps.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, self._deps.compiler.lastCompilationResult.source.sources)
+ var lineColumnPos = self._deps.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources)
self._components.sourceHighlighter.currentSourceLocation(lineColumnPos, rawLocation)
}
debug (hash, cb) {
@@ -106,7 +107,7 @@ class CmdInterpreterAPI {
self.d.goTo = (row) => {
if (self._deps.editor.current()) {
var breakPoint = new remixLib.code.BreakpointManager(self.d, (sourceLocation) => {
- return self._deps.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, self._deps.compiler.lastCompilationResult.source.sources)
+ return self._deps.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources)
})
breakPoint.event.register('breakpointHit', (sourceLocation, currentStep) => {
self.log(null, 'step index ' + currentStep)
@@ -163,6 +164,14 @@ class CmdInterpreterAPI {
exeCurrent (cb) {
return this.execute(undefined, cb)
}
+ getFile (path, cb) {
+ var provider = this._deps.fileManager.fileProviderOf(path)
+ if (provider) {
+ provider.get(path, cb)
+ } else {
+ cb('file not found')
+ }
+ }
execute (file, cb) {
const self = this
diff --git a/src/lib/offsetToLineColumnConverter.js b/src/lib/offsetToLineColumnConverter.js
index 2a73dfbe6f..d85d443f89 100644
--- a/src/lib/offsetToLineColumnConverter.js
+++ b/src/lib/offsetToLineColumnConverter.js
@@ -10,10 +10,15 @@ function offsetToColumnConverter (compilerEvent) {
})
}
-offsetToColumnConverter.prototype.offsetToLineColumn = function (rawLocation, file, sources) {
+offsetToColumnConverter.prototype.offsetToLineColumn = function (rawLocation, file, sources, asts) {
if (!this.lineBreakPositionsByContent[file]) {
- var filename = Object.keys(sources)[file]
- this.lineBreakPositionsByContent[file] = this.sourceMappingDecoder.getLinebreakPositions(sources[filename].content)
+ for (var filename in asts) {
+ var source = asts[filename]
+ if (source.id === file) {
+ this.lineBreakPositionsByContent[file] = this.sourceMappingDecoder.getLinebreakPositions(sources[filename].content)
+ break
+ }
+ }
}
return this.sourceMappingDecoder.convertOffsetToLineColumn(rawLocation, this.lineBreakPositionsByContent[file])
}
diff --git a/src/multiParamManager.js b/src/multiParamManager.js
index dd4e55559d..6600b78381 100644
--- a/src/multiParamManager.js
+++ b/src/multiParamManager.js
@@ -122,7 +122,6 @@ class MultiParamManager {
var onClick = (domEl) => {
this.clickCallBack(this.funABI.inputs, this.basicInputField.value)
- this.emptyInputs()
}
this.contractActionsContainerSingle = yo`
@@ -138,7 +137,6 @@ class MultiParamManager {
} else {
this.clickCallBack(this.funABI.inputs, '')
}
- this.emptyInputs()
}
var button = yo``