github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 23:38:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove grammar argument from populateInjections

Browse Source 
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
This commit is contained in:
Max Brunsfeld
2018-07-06 12:15:30 -07:00
parent c8830e5718
commit 1ba18314f9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tree-sitter-language-mode.js
View File

@@ -459,12 +459,12 @@ class LanguageLayer {
if (!grammar.injectionRegExp) return
if (!this.currentParsePromise) this.currentParsePromise = Promise.resolve()
this.currentParsePromise = this.currentParsePromise.then(async () => {
await this._populateInjections(MAX_RANGE, grammar)
await this._populateInjections(MAX_RANGE)
const markers = this.languageMode.injectionsMarkerLayer.getMarkers().filter(marker =>
marker.parentLanguageLayer === this
)
for (const marker of markers) {
await marker.languageLayer._populateInjections(MAX_RANGE, grammar)
await marker.languageLayer._populateInjections(MAX_RANGE)
}
this.currentParsePromise = null
})
@@ -512,7 +512,7 @@ class LanguageLayer {
await this._populateInjections(affectedRange)
}
async _populateInjections (range, newGrammar = null) {
async _populateInjections (range) {
const {injectionsMarkerLayer, grammarForLanguageString} = this.languageMode
const existingInjectionMarkers = injectionsMarkerLayer
@@ -540,7 +540,6 @@ class LanguageLayer {
const grammar = grammarForLanguageString(languageName)
if (!grammar) continue
if (newGrammar && grammar !== newGrammar) continue
const contentNodes = injectionPoint.content(node)
if (!contentNodes) continue