github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-14 08:35:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

getGrammarScopeDescriptor -> getRootScopeDescriptor

Browse Source
This commit is contained in:
Ben Ogle
2014-10-07 17:49:16 -07:00
parent d7cd0de0f8
commit f2d480fc72
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/text-editor.coffee
View File

@@ -163,7 +163,7 @@ class TextEditor extends Model
@scopedConfigSubscriptions?.dispose()
@scopedConfigSubscriptions = subscriptions = new CompositeDisposable
scopeDescriptor = @getGrammarScopeDescriptor()
scopeDescriptor = @getRootScopeDescriptor()
subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.showInvisibles', => @updateInvisibles()
subscriptions.add atom.config.onDidChange scopeDescriptor, 'editor.invisibles', => @updateInvisibles()
@@ -2369,7 +2369,7 @@ class TextEditor extends Model
if cursor = @getLastCursor()
cursor.getScopes()
else
@getGrammarScopeDescriptor()
@getRootScopeDescriptor()
getCursorScopes: ->
deprecate 'Use TextEditor::scopesAtCursor() instead'
@scopesAtCursor()
@@ -2396,8 +2396,8 @@ class TextEditor extends Model
bufferRangeForScopeAtCursor: (selector) ->
@displayBuffer.bufferRangeForScopeAtPosition(selector, @getCursorBufferPosition())
getGrammarScopeDescriptor: ->
@displayBuffer.getGrammarScopeDescriptor()
getRootScopeDescriptor: ->
@displayBuffer.getRootScopeDescriptor()
logCursorScope: ->
console.log @scopesAtCursor()
@@ -2668,14 +2668,14 @@ class TextEditor extends Model
###
shouldAutoIndent: ->
atom.config.get(@getGrammarScopeDescriptor(), "editor.autoIndent")
atom.config.get(@getRootScopeDescriptor(), "editor.autoIndent")
shouldShowInvisibles: ->
not @mini and atom.config.get(@getGrammarScopeDescriptor(), 'editor.showInvisibles')
not @mini and atom.config.get(@getRootScopeDescriptor(), 'editor.showInvisibles')
updateInvisibles: ->
if @shouldShowInvisibles()
@displayBuffer.setInvisibles(atom.config.get(@getGrammarScopeDescriptor(), 'editor.invisibles'))
@displayBuffer.setInvisibles(atom.config.get(@getRootScopeDescriptor(), 'editor.invisibles'))
else
@displayBuffer.setInvisibles(null)