Add getter (getActiveHighlights) and remove unused api reference

pull/3094/head
ninabreznik 7 years ago committed by yann300
parent 815c07ec74
commit e785308384
  1. 1
      src/app.js
  2. 5
      src/app/editor/contextView.js
  3. 4
      src/app/editor/contextualListener.js

@ -349,7 +349,6 @@ function run () {
// ---------------- ContextView ----------------------- // ---------------- ContextView -----------------------
this._components.contextView = new ContextView({ this._components.contextView = new ContextView({
contextualListener: this._components.contextualListener, contextualListener: this._components.contextualListener,
editor: editor,
jumpTo: (position) => { jumpTo: (position) => {
if (compiler.lastCompilationResult && compiler.lastCompilationResult.data) { if (compiler.lastCompilationResult && compiler.lastCompilationResult.data) {
var lineColumn = offsetToLineColumnConverter.offsetToLineColumn(position, position.file, compiler.lastCompilationResult) var lineColumn = offsetToLineColumnConverter.offsetToLineColumn(position, position.file, compiler.lastCompilationResult)

@ -115,6 +115,7 @@ class ContextView {
} }
_render (node) { _render (node) {
console.log('rendering')
if (!node) return yo`<div></div>` if (!node) return yo`<div></div>`
var self = this var self = this
var references = this._api.contextualListener.referencesOf(node) var references = this._api.contextualListener.referencesOf(node)
@ -135,7 +136,7 @@ class ContextView {
if (currentName === this.refName) { if (currentName === this.refName) {
this.ref = this.ref === undefined ? 0 : this.ref this.ref = this.ref === undefined ? 0 : this.ref
} else { this.ref = 0 } } else { this.ref = 0 }
var nodes = self._api.contextualListener._activeHighlights var nodes = self._api.contextualListener.getActiveHighlights()
self._api.jumpTo(nodes[this.ref].position) self._api.jumpTo(nodes[this.ref].position)
this.ref = (this.ref + 1) % nodes.length this.ref = (this.ref + 1) % nodes.length
this.refName = currentName this.refName = currentName
@ -146,7 +147,7 @@ class ContextView {
if (currentName === this.refName) { if (currentName === this.refName) {
this.ref = this.ref === undefined ? 0 : this.ref this.ref = this.ref === undefined ? 0 : this.ref
} else { this.ref = 0 } // should be this.ref = ref of the selected node (loop through all nodes to find this one) } else { this.ref = 0 } // should be this.ref = ref of the selected node (loop through all nodes to find this one)
var nodes = self._api.contextualListener._activeHighlights var nodes = self._api.contextualListener.getActiveHighlights()
this.ref = this.ref === undefined ? 0 : this.ref this.ref = this.ref === undefined ? 0 : this.ref
self._api.jumpTo(nodes[nodes.length - 1 - this.ref].position) self._api.jumpTo(nodes[nodes.length - 1 - this.ref].position)
this.ref = (this.ref + 1) % nodes.length this.ref = (this.ref + 1) % nodes.length

@ -37,6 +37,10 @@ class ContextualListener {
}, 1000) }, 1000)
} }
getActiveHighlights () {
return [...this._activeHighlights]
}
declarationOf (node) { declarationOf (node) {
if (node.attributes && node.attributes.referencedDeclaration) { if (node.attributes && node.attributes.referencedDeclaration) {
return this._index['FlatReferences'][node.attributes.referencedDeclaration] return this._index['FlatReferences'][node.attributes.referencedDeclaration]

Loading…
Cancel
Save