ensure only solidity

pull/3094/head
yann300 6 years ago
parent a66709c873
commit d4675fd5e0
  1. 2
      src/app/editor/contextView.js
  2. 7
      src/app/editor/contextualListener.js
  3. 1
      src/app/staticanalysis/staticAnalysisView.js

@ -97,7 +97,7 @@ class ContextView {
} }
} }
let lastCompilationResult = this._deps.compilersArtefacts['__last'] let lastCompilationResult = this._deps.compilersArtefacts['__last']
if (lastCompilationResult && lastCompilationResult.data) { if (lastCompilationResult && lastCompilationResult.languageversion.indexOf('soljson') === 0 && lastCompilationResult.data) {
const lineColumn = this._deps.offsetToLineColumnConverter.offsetToLineColumn( const lineColumn = this._deps.offsetToLineColumnConverter.offsetToLineColumn(
position, position,
position.file, position.file,

@ -27,6 +27,7 @@ class ContextualListener {
this._activeHighlights = [] this._activeHighlights = []
this.pluginManager.event.register('sendCompilationResult', (file, source, languageVersion, data) => { this.pluginManager.event.register('sendCompilationResult', (file, source, languageVersion, data) => {
if (languageVersion.indexOf('soljson') !== 0) return
this._stopHighlighting() this._stopHighlighting()
this._index = { this._index = {
Declarations: {}, Declarations: {},
@ -40,7 +41,7 @@ class ContextualListener {
this.sourceMappingDecoder = new SourceMappingDecoder() this.sourceMappingDecoder = new SourceMappingDecoder()
this.astWalker = new AstWalker() this.astWalker = new AstWalker()
setInterval(() => { setInterval(() => {
if (this._deps.compilersArtefacts['__last']) { if (this._deps.compilersArtefacts['__last'] && this._deps.compilersArtefacts['__last'].languageversion.indexOf('soljson') === 0) {
this._highlightItems(this.editor.getCursorPosition(), this._deps.compilersArtefacts['__last'], this._deps.config.get('currentFile')) this._highlightItems(this.editor.getCursorPosition(), this._deps.compilersArtefacts['__last'], this._deps.config.get('currentFile'))
} }
}, 1000) }, 1000)
@ -105,14 +106,14 @@ class ContextualListener {
const position = this.sourceMappingDecoder.decode(node.src) const position = this.sourceMappingDecoder.decode(node.src)
const eventId = this._highlightInternal(position, node) const eventId = this._highlightInternal(position, node)
let lastCompilationResult = this._deps.compilersArtefacts['__last'] let lastCompilationResult = this._deps.compilersArtefacts['__last']
if (eventId && lastCompilationResult) { if (eventId && lastCompilationResult && lastCompilationResult.languageversion.indexOf('soljson') === 0) {
this._activeHighlights.push({ eventId, position, fileTarget: lastCompilationResult.getSourceName(position.file), nodeId: node.id }) this._activeHighlights.push({ eventId, position, fileTarget: lastCompilationResult.getSourceName(position.file), nodeId: node.id })
} }
} }
_highlightInternal (position, node) { _highlightInternal (position, node) {
let lastCompilationResult = this._deps.compilersArtefacts['__last'] let lastCompilationResult = this._deps.compilersArtefacts['__last']
if (lastCompilationResult) { if (lastCompilationResult && lastCompilationResult.languageversion.indexOf('soljson') === 0) {
let lineColumn = this._deps.offsetToLineColumnConverter.offsetToLineColumn(position, position.file, lastCompilationResult.getSourceCode().sources, lastCompilationResult.getAsts()) let lineColumn = this._deps.offsetToLineColumnConverter.offsetToLineColumn(position, position.file, lastCompilationResult.getSourceCode().sources, lastCompilationResult.getAsts())
let css = 'highlightreference' let css = 'highlightreference'
if (node.children && node.children.length) { if (node.children && node.children.length) {

@ -27,6 +27,7 @@ function staticAnalysisView (localRegistry) {
} }
self._deps.pluginManager.event.register('sendCompilationResult', (file, source, languageVersion, data) => { self._deps.pluginManager.event.register('sendCompilationResult', (file, source, languageVersion, data) => {
if (languageVersion.indexOf('soljson') !== 0) return
self.lastCompilationResult = null self.lastCompilationResult = null
self.lastCompilationSource = null self.lastCompilationSource = null
$('#staticanalysisresult').empty() $('#staticanalysisresult').empty()

Loading…
Cancel
Save