github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 22:08:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make TextEditorRegistry.setGrammarOverride take a scope name

Browse Source 
Also, clear the stored grammar score for that editor when setting an override.
This commit is contained in:
Max Brunsfeld
2016-07-29 13:40:29 -07:00
parent 43caead392
commit e2e245aca1
2 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spec/text-editor-registry-spec.js
View File

@@ -84,24 +84,47 @@ describe('TextEditorRegistry', function () {
})
})
describe('.setGrammarOverride and .clearGrammarOverride', function () {
it('sets the editor\'s grammar and does not update it based on other criteria until the override is cleared', async function () {
registry.maintainGrammar(editor)
describe('.setGrammarOverride', function () {
it('sets the editor\'s grammar and does not update it based on other criteria', async function () {
await atom.packages.activatePackage('language-c')
expect(editor.getGrammar().name).toBe('Null Grammar')
await atom.packages.activatePackage('language-javascript')
registry.setGrammarOverride(editor, atom.grammars.grammarForScopeName('source.c'))
registry.maintainGrammar(editor)
editor.getBuffer().setPath('file-1.js')
expect(editor.getGrammar().name).toBe('JavaScript')
registry.setGrammarOverride(editor, 'source.c')
expect(editor.getGrammar().name).toBe('C')
editor.getBuffer().setPath('file-3.rb')
await atom.packages.activatePackage('language-ruby')
expect(editor.getGrammar().name).toBe('C')
editor.getBuffer().setPath('file-1.js')
await atom.packages.activatePackage('language-javascript')
expect(editor.getGrammar().name).toBe('C')
})
})
editor.getBuffer().setPath('file-2.js')
describe('.clearGrammarOverride', function () {
it('resumes setting the grammar based on its path and content', async function () {
await atom.packages.activatePackage('language-c')
await atom.packages.activatePackage('language-javascript')
registry.maintainGrammar(editor)
editor.getBuffer().setPath('file-1.js')
expect(editor.getGrammar().name).toBe('JavaScript')
registry.setGrammarOverride(editor, 'source.c')
expect(registry.getGrammarOverride(editor)).toBe('source.c')
expect(editor.getGrammar().name).toBe('C')
registry.clearGrammarOverride(editor)
expect(editor.getGrammar().name).toBe('JavaScript')
editor.getBuffer().setPath('file-3.rb')
await atom.packages.activatePackage('language-ruby')
expect(editor.getGrammar().name).toBe('Ruby')
expect(registry.getGrammarOverride(editor)).toBe(undefined)
})
})
@@ -464,14 +487,17 @@ describe('TextEditorRegistry', function () {
registry.maintainGrammar(editor)
registry.maintainGrammar(editor2)
registry.setGrammarOverride(editor, atom.grammars.grammarForScopeName('source.c'))
registry.setGrammarOverride(editor2, atom.grammars.grammarForScopeName('source.js'))
registry.setGrammarOverride(editor, 'source.c')
registry.setGrammarOverride(editor2, 'source.js')
atom.packages.deactivatePackage('language-javascript')
const editorCopy = TextEditor.deserialize(editor.serialize(), atom)
const editor2Copy = TextEditor.deserialize(editor2.serialize(), atom)
const registryCopy = TextEditorRegistry.deserialize(registry.serialize(), atom)
const registryCopy = TextEditorRegistry.deserialize(
JSON.parse(JSON.stringify(registry.serialize())),
atom
)
expect(editorCopy.getGrammar().name).toBe('Null Grammar')
expect(editor2Copy.getGrammar().name).toBe('Null Grammar')

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

@@ -132,9 +132,14 @@ export default class TextEditorRegistry {
}))
}
setGrammarOverride (editor, grammar) {
this.editorGrammarOverrides[editor.id] = grammar.scopeName
editor.setGrammar(grammar)
setGrammarOverride (editor, scopeName) {
this.editorGrammarOverrides[editor.id] = scopeName
this.editorGrammarScores.delete(editor)
editor.setGrammar(this.grammarRegistry.grammarForScopeName(scopeName))
}
getGrammarOverride (editor) {
return this.editorGrammarOverrides[editor.id]
}
clearGrammarOverride (editor) {