Commit 9ad7ba32 authored by yann300's avatar yann300 Committed by Aniket

use remix-astwalker

parent 1030ea58
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
"npm-run-all": "^4.0.2", "npm-run-all": "^4.0.2",
"onchange": "^3.2.1", "onchange": "^3.2.1",
"remix-analyzer": "0.5.3", "remix-analyzer": "0.5.3",
"remix-astwalker": "0.0.25",
"remix-debug": "0.4.5", "remix-debug": "0.4.5",
"remix-lib": "0.4.30", "remix-lib": "0.4.30",
"remix-simulator": "0.1.9-beta.6", "remix-simulator": "0.1.9-beta.6",
......
'use strict' 'use strict'
const remixdebug = require('@remix-project/remix-debug') const remixdebug = require('@remix-project/remix-debug')
const { AstWalker } = require('@remix-project/remix-astwalker')
const csjs = require('csjs-inject') const csjs = require('csjs-inject')
const SourceMappingDecoder = remixdebug.SourceMappingDecoder const SourceMappingDecoder = remixdebug.SourceMappingDecoder
const AstWalker = remixdebug.AstWalker
const EventManager = require('../../lib/events') const EventManager = require('../../lib/events')
const globalRegistry = require('../../global/registry') const globalRegistry = require('../../global/registry')
import { Plugin } from '@remixproject/engine' import { Plugin } from '@remixproject/engine'
...@@ -97,8 +97,7 @@ class ContextualListener extends Plugin { ...@@ -97,8 +97,7 @@ class ContextualListener extends Plugin {
_buildIndex (compilationResult, source) { _buildIndex (compilationResult, source) {
if (compilationResult && compilationResult.sources) { if (compilationResult && compilationResult.sources) {
const callback = {} const callback = (node) => {
callback['*'] = (node) => {
if (node && node.referencedDeclaration) { if (node && node.referencedDeclaration) {
if (!this._index['Declarations'][node.referencedDeclaration]) { if (!this._index['Declarations'][node.referencedDeclaration]) {
this._index['Declarations'][node.referencedDeclaration] = [] this._index['Declarations'][node.referencedDeclaration] = []
...@@ -106,10 +105,9 @@ class ContextualListener extends Plugin { ...@@ -106,10 +105,9 @@ class ContextualListener extends Plugin {
this._index['Declarations'][node.referencedDeclaration].push(node) this._index['Declarations'][node.referencedDeclaration].push(node)
} }
this._index['FlatReferences'][node.id] = node this._index['FlatReferences'][node.id] = node
return true
} }
for (const s in compilationResult.sources) { for (const s in compilationResult.sources) {
this.astWalker.walk(compilationResult.sources[s].ast, callback) this.astWalker.walkFull(compilationResult.sources[s].ast, callback)
} }
} }
} }
......
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