diff --git a/src/app/editor/contextView.js b/src/app/editor/contextView.js index 5d9c09513f..36199f251a 100644 --- a/src/app/editor/contextView.js +++ b/src/app/editor/contextView.js @@ -97,7 +97,7 @@ class ContextView { } } 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( position, position.file, diff --git a/src/app/editor/contextualListener.js b/src/app/editor/contextualListener.js index 5853c36f45..3b28b64ba5 100644 --- a/src/app/editor/contextualListener.js +++ b/src/app/editor/contextualListener.js @@ -27,6 +27,7 @@ class ContextualListener { this._activeHighlights = [] this.pluginManager.event.register('sendCompilationResult', (file, source, languageVersion, data) => { + if (languageVersion.indexOf('soljson') !== 0) return this._stopHighlighting() this._index = { Declarations: {}, @@ -40,7 +41,7 @@ class ContextualListener { this.sourceMappingDecoder = new SourceMappingDecoder() this.astWalker = new AstWalker() 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')) } }, 1000) @@ -105,14 +106,14 @@ class ContextualListener { const position = this.sourceMappingDecoder.decode(node.src) const eventId = this._highlightInternal(position, node) 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 }) } } _highlightInternal (position, node) { 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 css = 'highlightreference' if (node.children && node.children.length) { diff --git a/src/app/staticanalysis/staticAnalysisView.js b/src/app/staticanalysis/staticAnalysisView.js index ddfd8a78c3..12b8e352c0 100644 --- a/src/app/staticanalysis/staticAnalysisView.js +++ b/src/app/staticanalysis/staticAnalysisView.js @@ -27,6 +27,7 @@ function staticAnalysisView (localRegistry) { } self._deps.pluginManager.event.register('sendCompilationResult', (file, source, languageVersion, data) => { + if (languageVersion.indexOf('soljson') !== 0) return self.lastCompilationResult = null self.lastCompilationSource = null $('#staticanalysisresult').empty()