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

scopes -> scopeDescriptor

Browse Source 
!!!
This commit is contained in:
Ben Ogle
2014-10-13 16:30:41 -07:00
parent 8cf36af1dc
commit c0091b4601
12 changed files with 116 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/text-editor.coffee
View File

@@ -2376,7 +2376,7 @@ class TextEditor extends Model
getRootScopeDescriptor: ->
@displayBuffer.getRootScopeDescriptor()
# Essential: Get the syntactic scopes for the given position in buffer
# Essential: Get the syntactic scopeDescriptor for the given position in buffer
# coordinates. Useful with {Config::get}.
#
# For example, if called with a position inside the parameter list of an
@@ -2404,9 +2404,9 @@ class TextEditor extends Model
# Extended: Determine if the given row is entirely a comment
isBufferRowCommented: (bufferRow) ->
if match = @lineTextForBufferRow(bufferRow).match(/\S/)
scopes = @tokenForBufferPosition([bufferRow, match.index]).scopes
scopeDescriptor = @tokenForBufferPosition([bufferRow, match.index]).scopeDescriptor
@commentScopeSelector ?= new TextMateScopeSelector('comment.*')
@commentScopeSelector.matches(scopes)
@commentScopeSelector.matches(scopeDescriptor)
logCursorScope: ->
console.log @getLastCursor().getScopeDescriptor()
@@ -2416,10 +2416,7 @@ class TextEditor extends Model
scopesAtCursor: ->
deprecate 'Use editor.getLastCursor().scopesAtCursor() instead'
if cursor = @getLastCursor()
cursor.getScopes()
else
@getRootScopeDescriptor()
cursor.getScopeDescriptor()
getCursorScopes: ->
deprecate 'Use editor.getLastCursor().scopesAtCursor() instead'
@scopesAtCursor()