Unverified Commit fa123d73 authored by yann300's avatar yann300 Committed by GitHub

Merge pull request #1583 from ethereum/addCompilerToTerminal

Add compiler to terminal
parents 281b15f5 4c059194
...@@ -26,7 +26,8 @@ class EditorPanel { ...@@ -26,7 +26,8 @@ class EditorPanel {
config: self._components.registry.get('config').api, config: self._components.registry.get('config').api,
txListener: self._components.registry.get('txlistener').api, txListener: self._components.registry.get('txlistener').api,
fileManager: self._components.registry.get('filemanager').api, fileManager: self._components.registry.get('filemanager').api,
udapp: self._components.registry.get('udapp').api udapp: self._components.registry.get('udapp').api,
compiler: self._components.registry.get('compiler').api
} }
self.data = { self.data = {
_FILE_SCROLL_DELTA: 200, _FILE_SCROLL_DELTA: 200,
...@@ -46,7 +47,10 @@ class EditorPanel { ...@@ -46,7 +47,10 @@ class EditorPanel {
contextualListener: contextualListener, contextualListener: contextualListener,
contextView: new ContextView({contextualListener: contextualListener, editor: editor}), contextView: new ContextView({contextualListener: contextualListener, editor: editor}),
terminal: new Terminal({ terminal: new Terminal({
udapp: self._deps.udapp udapp: self._deps.udapp,
compilers: {
'solidity': self._deps.compiler
}
}, },
{ {
getPosition: (event) => { getPosition: (event) => {
......
...@@ -378,6 +378,7 @@ class Terminal { ...@@ -378,6 +378,7 @@ class Terminal {
<li><a target="_blank" href="https://web3js.readthedocs.io/en/1.0/">web3 version 1.0.0</a></li> <li><a target="_blank" href="https://web3js.readthedocs.io/en/1.0/">web3 version 1.0.0</a></li>
<li><a target="_blank" href="https://docs.ethers.io/ethers.js/html/">ethers.js</a> </li> <li><a target="_blank" href="https://docs.ethers.io/ethers.js/html/">ethers.js</a> </li>
<li><a target="_blank" href="https://www.npmjs.com/package/swarmgw">swarmgw</a> </li> <li><a target="_blank" href="https://www.npmjs.com/package/swarmgw">swarmgw</a> </li>
<li>compilers - contains currently loaded compiler</li>
</ul> </ul>
</li> </li>
<li>Executing common command to interact with the Remix interface (see list of commands above). Note that these commands can also be included and run from a JavaScript script.</li> <li>Executing common command to interact with the Remix interface (see list of commands above). Note that these commands can also be included and run from a JavaScript script.</li>
...@@ -614,6 +615,7 @@ class Terminal { ...@@ -614,6 +615,7 @@ class Terminal {
function domTerminalFeatures (self, scopedCommands) { function domTerminalFeatures (self, scopedCommands) {
return { return {
compilers: self._opts.compilers,
swarmgw, swarmgw,
ethers, ethers,
remix: self._components.cmdInterpreter, remix: self._components.cmdInterpreter,
......
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