github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-21 04:48:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use config rather than syntax for scoped properties

Browse Source
This commit is contained in:
Ben Ogle
2014-10-02 10:31:32 -07:00
parent 82990cfc77
commit e2ac19c17f
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/package-manager-spec.coffee
View File

@@ -313,7 +313,7 @@ describe "PackageManager", ->
atom.packages.activatePackage("package-with-scoped-properties")
runs ->
expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
expect(atom.config.get ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
describe "converted textmate packages", ->
it "loads the package's grammars", ->
@@ -326,13 +326,13 @@ describe "PackageManager", ->
expect(atom.syntax.selectGrammar("file.rb").name).toBe "Ruby"
it "loads the translated scoped properties", ->
expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
expect(atom.config.get(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
waitsForPromise ->
atom.packages.activatePackage('language-ruby')
runs ->
expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBe '# '
expect(atom.config.get(['.source.ruby'], 'editor.commentStart')).toBe '# '
describe "::deactivatePackage(id)", ->
describe "atom packages", ->
@@ -436,9 +436,9 @@ describe "PackageManager", ->
atom.packages.activatePackage("package-with-scoped-properties")
runs ->
expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
expect(atom.config.get ['.source.omg'], 'editor.increaseIndentPattern').toBe '^a'
atom.packages.deactivatePackage("package-with-scoped-properties")
expect(atom.syntax.getProperty ['.source.omg'], 'editor.increaseIndentPattern').toBeUndefined()
expect(atom.config.get ['.source.omg'], 'editor.increaseIndentPattern').toBeUndefined()
describe "textmate packages", ->
it "removes the package's grammars", ->
@@ -458,7 +458,7 @@ describe "PackageManager", ->
runs ->
atom.packages.deactivatePackage('language-ruby')
expect(atom.syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
expect(atom.config.get(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
describe "::activate()", ->
packageActivator = null

2
src/language-mode.coffee
View File

@@ -312,7 +312,7 @@ class LanguageMode
@editor.setIndentationForBufferRow(bufferRow, desiredIndentLevel)
getRegexForProperty: (scopes, property) ->
if pattern = atom.syntax.getProperty(scopes, property)
if pattern = atom.config.get(scopes, property)
new OnigRegExp(pattern)
increaseIndentRegexForScopes: (scopes) ->

4
src/scoped-properties.coffee
View File

@@ -13,7 +13,7 @@ class ScopedProperties
activate: ->
for selector, properties of @scopedProperties
atom.syntax.addProperties(@path, selector, properties)
atom.config.addScopedDefaults(@path, selector, properties)
deactivate: ->
atom.syntax.removeProperties(@path)
atom.config.removeScopedSettingsForName(@path)