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

Emit highlight change events when removing injections

Browse Source 
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
This commit is contained in:
Max Brunsfeld
2018-06-27 15:40:06 -07:00
parent 6c85ff84a5
commit cdb9529b68
2 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spec/tree-sitter-language-mode-spec.js
View File

@@ -342,7 +342,7 @@ describe('TreeSitterLanguageMode', () => {
})
it('highlights code inside of injection points', async () => {
buffer.setText('node.innerHTML = html `a ${b}<img src="d">\n`;')
buffer.setText('node.innerHTML = html `\na ${b}<img src="d">\n`;')
const languageMode = new TreeSitterLanguageMode({buffer, grammar: jsGrammar, grammars: atom.grammars})
buffer.setLanguageMode(languageMode)
@@ -356,6 +356,8 @@ describe('TreeSitterLanguageMode', () => {
{text: 'html', scopes: ['function']},
{text: ' ', scopes: []},
{text: '`', scopes: ['string']},
{text: '', scopes: ['string', 'html']}
], [
{text: 'a ', scopes: ['string', 'html']},
{text: '${', scopes: ['string', 'html', 'interpolation']},
{text: 'b', scopes: ['string', 'html']},
@@ -364,7 +366,31 @@ describe('TreeSitterLanguageMode', () => {
{text: 'img', scopes: ['string', 'html', 'tag']},
{text: ' ', scopes: ['string', 'html']},
{text: 'src', scopes: ['string', 'html', 'attr']},
{text: '="d">', scopes: ['string', 'html']},
{text: '="d">', scopes: ['string', 'html']}
], [
{text: '`', scopes: ['string']},
{text: ';', scopes: []},
],
])
const range = buffer.findSync('html')
buffer.setTextInRange(range, 'xml')
await languageMode.reparsePromise
expectTokensToEqual(editor, [
[
{text: 'node.', scopes: []},
{text: 'innerHTML', scopes: ['property']},
{text: ' = ', scopes: []},
{text: 'xml', scopes: ['function']},
{text: ' ', scopes: []},
{text: '`', scopes: ['string']}
], [
{text: 'a ', scopes: ['string']},
{text: '${', scopes: ['string', 'interpolation']},
{text: 'b', scopes: ['string']},
{text: '}', scopes: ['string', 'interpolation']},
{text: '<img src="d">', scopes: ['string']},
], [
{text: '`', scopes: ['string']},
{text: ';', scopes: []},

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

@@ -522,9 +522,12 @@ class LanguageLayer {
const injectionNode = injectionPoint.content(node)
if (!injectionNode) continue
const injectionRange = new Range(injectionNode.startPosition, injectionNode.endPosition)
let marker = existingInjectionMarkers.find(m => m.getRange().isEqual(injectionRange))
if (!marker || marker.languageLayer.grammar !== grammar) {
const injectionRange = new Range(node.startPosition, node.endPosition)
let marker = existingInjectionMarkers.find(m =>
m.getRange().isEqual(injectionRange) &&
m.languageLayer.grammar === grammar
)
if (!marker) {
marker = injectionsMarkerLayer.markRange(injectionRange)
marker.languageLayer = new LanguageLayer(this.languageMode, grammar)
marker.parentLanguageLayer = this
@@ -537,6 +540,7 @@ class LanguageLayer {
for (const marker of existingInjectionMarkers) {
if (!markersToUpdate.has(marker)) {
marker.languageLayer.destroy()
emitRangeUpdate(marker.getRange())
marker.destroy()
}
}