github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Allow for parsing injections in parallel"

Browse Source 
This reverts commit a484ca9e65.
This commit is contained in:
Max Brunsfeld
2018-07-06 11:54:18 -07:00
parent ae1849609c
commit 94999cc5e3
2 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/test.ejs Normal file
View File

@@ -0,0 +1,9 @@
<html>
<% if something() { %>
<div class=foo>
<%= html `ok how about <span>this</span>` %>
</div>
<% } %>
</html>

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

@@ -5,7 +5,6 @@ const {Emitter, Disposable} = require('event-kit')
const ScopeDescriptor = require('./scope-descriptor')
const TokenizedLine = require('./tokenized-line')
const TextMateLanguageMode = require('./text-mate-language-mode')
const async = require('async')
let nextId = 0
const MAX_RANGE = new Range(Point.ZERO, Point.INFINITY).freeze()
@@ -31,19 +30,6 @@ class TreeSitterLanguageMode {
this.parser = new Parser()
this.rootLanguageLayer = new LanguageLayer(this, grammar)
this.injectionsMarkerLayer = buffer.addMarkerLayer()
this.updatedGrammars = []
this.parsers = []
this.parseQueue = async.queue(async ({language, oldTree, ranges}, done) => {
const parser = this.parsers.pop() || new Parser()
parser.setLanguage(language)
const newTree = await parser.parseTextBuffer(this.buffer.buffer, oldTree, {
syncOperationLimit: 1000,
includedRanges: ranges
})
this.parsers.push(parser)
done(null, newTree)
}, 2)
this.rootScopeDescriptor = new ScopeDescriptor({scopes: [this.grammar.id]})
this.emitter = new Emitter()
@@ -94,14 +80,6 @@ class TreeSitterLanguageMode {
}
}
parse (language, oldTree, ranges) {
return new Promise(resolve =>
this.parseQueue.push({language, oldTree, ranges}, (error, tree) =>
resolve(tree)
)
)
}
get tree () {
return this.rootLanguageLayer.tree
}
@@ -478,18 +456,18 @@ class LanguageLayer {
}
updateInjections (grammar) {
// if (!grammar.injectionRegExp) return
// if (!this.currentParsePromise) this.currentParsePromise = Promise.resolve()
// this.currentParsePromise = this.currentParsePromise.then(async () => {
// await this._populateInjections(MAX_RANGE, grammar)
// const markers = this.languageMode.injectionsMarkerLayer.getMarkers().filter(marker =>
// marker.parentLanguageLayer === this
// )
// for (const marker of markers) {
// await marker.languageLayer._populateInjections(MAX_RANGE, grammar)
// }
// this.currentParsePromise = null
// })
if (!grammar.injectionRegExp) return
if (!this.currentParsePromise) this.currentParsePromise = Promise.resolve()
this.currentParsePromise = this.currentParsePromise.then(async () => {
await this._populateInjections(MAX_RANGE, grammar)
const markers = this.languageMode.injectionsMarkerLayer.getMarkers().filter(marker =>
marker.parentLanguageLayer === this
)
for (const marker of markers) {
await marker.languageLayer._populateInjections(MAX_RANGE, grammar)
}
this.currentParsePromise = null
})
}
async _performUpdate (containingNodes) {
@@ -500,10 +478,11 @@ class LanguageLayer {
if (includedRanges.length === 0) return
}
const tree = await this.languageMode.parse(
this.grammar.languageModule,
this.languageMode.parser.setLanguage(this.grammar.languageModule)
const tree = await this.languageMode.parser.parseTextBuffer(
this.languageMode.buffer.buffer,
this.tree,
includedRanges
{syncOperationLimit: 1000, includedRanges}
)
tree.buffer = this.languageMode.buffer
@@ -568,7 +547,7 @@ class LanguageLayer {
const injectionNodes = [].concat(contentNodes)
if (!injectionNodes.length) continue
const injectionRange = this._rangeForNode(node)
let marker = existingInjectionMarkers.find(m =>
m.getRange().isEqual(injectionRange) &&
@@ -592,11 +571,9 @@ class LanguageLayer {
}
}
const promises = []
for (const [marker, injectionNodes] of markersToUpdate) {
promises.push(marker.languageLayer.update(injectionNodes))
await marker.languageLayer.update(injectionNodes)
}
return Promise.all(promises)
}
/**