Merge pull request #1932 from ethereum/fixVyperPlugin

Fix vyper plugin
pull/1/head
yann300 6 years ago committed by GitHub
commit 63c6ec446b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      package.json
  2. 6
      src/app/components/plugin-manager-proxy.js
  3. 3
      src/app/editor/SourceHighlighters.js
  4. 10
      src/app/editor/sourceHighlighter.js

@ -67,7 +67,7 @@
}, },
"dependencies": { "dependencies": {
"http-server-legacy": "latest", "http-server-legacy": "latest",
"remix-plugin": "0.0.2-alpha.3", "remix-plugin": "0.0.2-alpha.5",
"remixd": "0.1.8-alpha.6" "remixd": "0.1.8-alpha.6"
}, },
"repository": { "repository": {

@ -9,9 +9,9 @@ class PluginManagerProxy {
constructor () { constructor () {
this.event = new EventManager() this.event = new EventManager()
this._listeners = {} this._listeners = {}
this._listeners['vyper'] = (data) => { this._listeners['vyper'] = (file, source, languageVersion, data) => {
registry.get('compilersartefacts').api['__last'] = new CompilerAbstract(data.language, data.result, data.content) registry.get('compilersartefacts').api['__last'] = new CompilerAbstract(languageVersion, data, source)
this.event.trigger('sendCompilationResult', [data.title, data.content, data.language, data.result]) this.event.trigger('sendCompilationResult', [file, source, languageVersion, data])
} }
this._listeners['solidity'] = (file, source, languageVersion, data) => { this._listeners['solidity'] = (file, source, languageVersion, data) => {
registry.get('compilersartefacts').api['__last'] = new CompilerAbstract(languageVersion, data, source) registry.get('compilersartefacts').api['__last'] = new CompilerAbstract(languageVersion, data, source)

@ -19,10 +19,9 @@ class SourceHighlighters extends EditorApi {
this.highlighters = {} this.highlighters = {}
} }
highlight (lineColumnPos, filePath, hexColor) { highlight (position, filePath, hexColor) {
const { from } = this.currentRequest const { from } = this.currentRequest
try { try {
const position = JSON.parse(lineColumnPos)
if (!this.highlighters[from]) this.highlighters[from] = new SourceHighlighter() if (!this.highlighters[from]) this.highlighters[from] = new SourceHighlighter()
this.highlighters[from].currentSourceLocation(null) this.highlighters[from].currentSourceLocation(null)
this.highlighters[from].currentSourceLocationFromfileName(position, filePath, hexColor) this.highlighters[from].currentSourceLocationFromfileName(position, filePath, hexColor)

@ -42,20 +42,24 @@ class SourceHighlighter {
this._deps.fileManager.switchFile(this.source) this._deps.fileManager.switchFile(this.source)
} }
const backgoundClass = style || 'alert-info'
const css = csjs` const css = csjs`
.highlightcode { .highlightcode {
position:absolute; position:absolute;
z-index:20; z-index:20;
background-color: ${style || 'var(--info)'};
} }
.highlightcode_fullLine { .highlightcode_fullLine {
position:absolute; position:absolute;
z-index:20; z-index:20;
opacity: 0.5; opacity: 0.5;
background-color: ${style || 'var(--info)'};
}
.customBackgroundColor {
background-color: ${style || 'var(--info)'};
} }
` `
this.statementMarker = this._deps.editor.addMarker(lineColumnPos, this.source, css.highlightcode + ' ' + backgoundClass) this.statementMarker = this._deps.editor.addMarker(lineColumnPos, this.source, css.highlightcode.className + ' ' + css.customBackgroundColor.className)
this._deps.editor.scrollToLine(lineColumnPos.start.line, true, true, function () {}) this._deps.editor.scrollToLine(lineColumnPos.start.line, true, true, function () {})
if (lineColumnPos.start.line === lineColumnPos.end.line) { if (lineColumnPos.start.line === lineColumnPos.end.line) {
@ -68,7 +72,7 @@ class SourceHighlighter {
line: lineColumnPos.start.line + 1, line: lineColumnPos.start.line + 1,
column: 0 column: 0
} }
}, this.source, css.highlightcode_fullLine) }, this.source, css.highlightcode_fullLine.className)
} }
} }
} }

Loading…
Cancel
Save