Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Update Tree-sitter syntax highlighting synchronously for parses that complete sync #17923

Merged
merged 8 commits into from
Aug 24, 2018
Merged

Update Tree-sitter syntax highlighting synchronously for parses that complete sync #17923

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d1283fa
Fix TreeSitterLanguageMode.isRowCommented
maxbrunsfeld Aug 21, 2018
d937f14
Fix off-by-one error that was masked by TextMateLanguageMode
maxbrunsfeld Aug 21, 2018
f39ef32
Delete spurious file
maxbrunsfeld Aug 22, 2018
f716a73
Allow replacing editor's grammar with a grammar with the same scope name
maxbrunsfeld Aug 22, 2018
3b9eb20
Implement getNonWordCharacters on TreeSitterLanguageMode
maxbrunsfeld Aug 22, 2018
c0c071d
Avoid error calling buildHighlightIterator on a destroyed language mode
maxbrunsfeld Aug 22, 2018
f1f37ee
Update syntax highlighting synchronously if parsing completes synchro…
maxbrunsfeld Aug 24, 2018
4d3a9ec
Update TextEditorRegistry spec to expect sync updates
maxbrunsfeld Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow replacing editor's grammar with a grammar with the same scope name
  • Loading branch information
@maxbrunsfeld
maxbrunsfeld committed Aug 24, 2018
commit f716a73b5944996c24e005ec165e7bbd46b93bdc
4 changes: 2 additions & 2 deletions src/grammar-registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class GrammarRegistry {
}

this.grammarScoresByBuffer.set(buffer, null)
if (grammar.scopeName !== buffer.getLanguageMode().getLanguageId()) {
if (grammar !== buffer.getLanguageMode().grammar) {
buffer.setLanguageMode(this.languageModeForGrammarAndBuffer(grammar, buffer))
}

Expand All @@ -161,7 +161,7 @@ class GrammarRegistry {
)
this.languageOverridesByBufferId.delete(buffer.id)
this.grammarScoresByBuffer.set(buffer, result.score)
if (result.grammar.scopeName !== buffer.getLanguageMode().getLanguageId()) {
if (result.grammar !== buffer.getLanguageMode().grammar) {
buffer.setLanguageMode(this.languageModeForGrammarAndBuffer(result.grammar, buffer))
}
}
Expand Down