highlight entire line if contains children

pull/1/head
yann300 7 years ago
parent 6e83b2a46d
commit 8be16b1fa0
  1. 14
      assets/css/browser-solidity.css
  2. 16
      src/app.js
  3. 15
      src/app/editor/contextualListener.js

@ -297,20 +297,6 @@ input[type="file"] {
opacity: 0.7
}
.highlightdeclaration{
position:absolute;
z-index:20;
background-color: lightgrey;
opacity: 0.4
}
.highlightcurrent {
position:absolute;
z-index:20;
background-color: lightgrey;
opacity: 0.4
}
.highlightcode {
position:absolute;
z-index:20;

@ -394,10 +394,22 @@ function run () {
getCompilationResult: () => {
return compiler.lastCompilationResult
},
highlight: (position, node, type) => {
highlight: (position, node) => {
if (compiler.lastCompilationResult && compiler.lastCompilationResult.source && compiler.lastCompilationResult.source.target === config.get('currentFile')) {
position = offsetToLineColumnConverter.offsetToLineColumn(position, position.file, compiler.lastCompilationResult)
return editor.addMarker(position, config.get('currentFile'), 'highlight' + type)
if (node.children && node.children.length) {
position = {
start: {
line: position.start.line,
column: 0
},
end: {
line: position.start.line + 1,
column: 0
}
}
}
return editor.addMarker(position, config.get('currentFile'), 'highlightreference')
}
return null
},

@ -62,9 +62,10 @@ class ContextualListener {
}
}
_highlight (node, compilationResult, type) {
var position = this.sourceMappingDecoder.decode(node.src)
var eventId = this._api.highlight(position, node, type)
_highlight (node, compilationResult) {
var src = node.src
var position = this.sourceMappingDecoder.decode(src)
var eventId = this._api.highlight(position, node)
if (eventId) {
this._events.push({ eventId, position, fileTarget: compilationResult.source.target })
}
@ -77,16 +78,16 @@ class ContextualListener {
var calls = self._index['Declarations'][id]
for (var call in calls) {
var node = calls[call]
self._highlight(node, compilationResult, 'reference')
self._highlight(node, compilationResult)
}
}
}
if (node.attributes && node.attributes.referencedDeclaration) {
highlights(node.attributes.referencedDeclaration)
var current = this._index['FlatReferences'][node.attributes.referencedDeclaration]
this._highlight(current, compilationResult, 'declaration')
} else {
highlights(node.id, 'current')
this._highlight(current, compilationResult)
} else if (node && node.name && node.name !== 'FunctionDefinition' && node.name !== 'ContractDefinition' && node.name !== 'Block') {
highlights(node.id)
}
}

Loading…
Cancel
Save