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

Move grammar override logic into TextEditorRegistry

Browse Source 
Signed-off-by: Nathan Sobo <nathan@github.com>
This commit is contained in:
Max Brunsfeld
2016-07-26 15:00:20 -07:00
committed by Nathan Sobo
parent 455d3213ed
commit a44d5833a8
3 changed files with 62 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/text-editor-registry.js
View File

@@ -55,6 +55,7 @@ export default class TextEditorRegistry {
this.scopesWithConfigSubscriptions = new Set()
this.editorsWithMaintainedConfig = new Set()
this.editorsWithMaintainedGrammar = new Set()
this.editorGrammarOverrides = new Map()
this.editorGrammarScores = new WeakMap()
this.subscriptions.add(
this.grammarRegistry.onDidAddGrammar(this.grammarAddedOrUpdated),
@@ -106,23 +107,21 @@ export default class TextEditorRegistry {
maintainGrammar (editor) {
this.editorsWithMaintainedGrammar.add(editor)
this.selectGrammarForEditor(editor)
this.subscriptions.add(editor.onDidChangePath(() => {
this.editorGrammarScores.delete(editor)
this.selectGrammarForEditor(editor)
}))
}
const assignGrammar = () => {
const {grammar, score} = this.grammarRegistry.selectGrammarWithScore(
editor.getPath(),
editor.getTextInBufferRange(GRAMMAR_SELECTION_RANGE)
)
setGrammarOverride (editor, grammar) {
this.editorGrammarOverrides.set(editor)
editor.setGrammar(grammar)
}
if (!grammar) {
throw new Error(`No grammar found for path: ${editor.getPath()}`)
}
editor.setGrammar(grammar)
this.editorGrammarScores.set(editor, score)
}
assignGrammar()
this.subscriptions.add(editor.onDidChangePath(assignGrammar))
clearGrammarOverride (editor) {
this.editorGrammarOverrides.delete(editor)
this.selectGrammarForEditor(editor)
}
maintainConfig (editor) {
@@ -155,21 +154,44 @@ export default class TextEditorRegistry {
if (editor.tokenizedBuffer.hasTokenForSelector(grammar.injectionSelector)) {
editor.tokenizedBuffer.retokenizeLines()
}
} else {
const newScore = this.grammarRegistry.getGrammarScore(
} else if (!this.editorGrammarOverrides.has(editor)) {
const score = this.grammarRegistry.getGrammarScore(
grammar,
editor.getPath(),
editor.getTextInBufferRange(GRAMMAR_SELECTION_RANGE)
)
let currentScore = this.editorGrammarScores.get(editor)
if (currentScore == null || newScore > currentScore) {
editor.setGrammar(grammar, newScore)
if (currentScore == null || score > currentScore) {
editor.setGrammar(grammar, score)
this.editorGrammarScores.set(editor, score)
this.subscribeToSettingsForEditorScope(editor)
}
}
})
}
selectGrammarForEditor (editor) {
if (this.editorGrammarOverrides.has(editor)) {
return
}
const {grammar, score} = this.grammarRegistry.selectGrammarWithScore(
editor.getPath(),
editor.getTextInBufferRange(GRAMMAR_SELECTION_RANGE)
)
if (!grammar) {
throw new Error(`No grammar found for path: ${editor.getPath()}`)
}
const currentScore = this.editorGrammarScores.get(editor)
if (currentScore == null || score > currentScore) {
editor.setGrammar(grammar)
this.editorGrammarScores.set(editor, score)
}
}
subscribeToSettingsForEditorScope (editor) {
const scopeDescriptor = editor.getRootScopeDescriptor()
const scopeChain = scopeDescriptor.getScopeChain()