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

Observe grammar changes on editors in maintainConfig

Browse Source
This commit is contained in:
Max Brunsfeld
2016-08-08 12:10:56 -07:00
parent ee2e18737e
commit eb9d89f8c8
3 changed files with 72 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,10 +135,18 @@ export default class TextEditorRegistry {
}
this.selectGrammarForEditor(editor)
this.subscriptions.add(editor.onDidChangePath(() => {
const pathChangeSubscription = editor.onDidChangePath(() => {
this.editorGrammarScores.delete(editor)
this.selectGrammarForEditor(editor)
}))
})
this.subscriptions.add(pathChangeSubscription)
return new Disposable(() => {
this.subscriptions.remove(pathChangeSubscription)
pathChangeSubscription.dispose()
})
}
setGrammarOverride (editor, scopeName) {
@@ -160,17 +168,18 @@ export default class TextEditorRegistry {
if (this.editorsWithMaintainedConfig.has(editor)) {
return
}
this.editorsWithMaintainedConfig.add(editor)
this.subscribeToSettingsForEditorScope(editor)
editor.setScopedSettingsDelegate(this.scopedSettingsDelegate)
const configOptions = {scope: editor.getRootScopeDescriptor()}
for (const [settingKey, setterName] of EDITOR_SETTER_NAMES_BY_SETTING_KEY) {
editor[setterName](this.config.get(settingKey, configOptions))
}
this.subscribeToSettingsForEditorScope(editor)
const grammarChangeSubscription = editor.onDidChangeGrammar(() => {
this.subscribeToSettingsForEditorScope(editor)
})
this.subscriptions.add(grammarChangeSubscription)
const updateTabTypes = () => {
const configOptions = {scope: editor.getRootScopeDescriptor()}
editor.setSoftTabs(shouldEditorUseSoftTabs(
editor,
this.config.get('editor.tabType', configOptions),
@@ -180,6 +189,12 @@ export default class TextEditorRegistry {
updateTabTypes()
this.subscriptions.add(editor.onDidTokenize(updateTabTypes))
return new Disposable(() => {
editor.setScopedSettingsDelegate(null)
this.subscriptions.remove(grammarChangeSubscription)
grammarChangeSubscription.dispose()
})
}
// Private
@@ -209,7 +224,6 @@ export default class TextEditorRegistry {
if (currentScore == null || score > currentScore) {
editor.setGrammar(grammar, score)
this.editorGrammarScores.set(editor, score)
this.subscribeToSettingsForEditorScope(editor)
}
}
})
@@ -243,12 +257,15 @@ export default class TextEditorRegistry {
subscribeToSettingsForEditorScope (editor) {
const scopeDescriptor = editor.getRootScopeDescriptor()
const scopeChain = scopeDescriptor.getScopeChain()
const configOptions = {scope: scopeDescriptor}
for (const [settingKey, setterName] of EDITOR_SETTER_NAMES_BY_SETTING_KEY) {
editor[setterName](this.config.get(settingKey, configOptions))
}
if (!this.scopesWithConfigSubscriptions.has(scopeChain)) {
this.scopesWithConfigSubscriptions.add(scopeChain)
const configOptions = {scope: scopeDescriptor}
for (const [settingKey, setterName] of EDITOR_SETTER_NAMES_BY_SETTING_KEY) {
this.subscriptions.add(
this.config.onDidChange(settingKey, configOptions, ({newValue}) => {
@@ -264,7 +281,6 @@ export default class TextEditorRegistry {
const updateTabTypes = () => {
const tabType = this.config.get('editor.tabType', configOptions)
const softTabs = this.config.get('editor.softTabs', configOptions)
this.editorsWithMaintainedConfig.forEach(editor => {
if (editor.getRootScopeDescriptor().isEqual(scopeDescriptor)) {
editor.setSoftTabs(shouldEditorUseSoftTabs(editor, tabType, softTabs))