github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add Editor.setShowInvisibles and remove showInvisibles from EditSession

Browse Source
This commit is contained in:
Corey Johnson & Nathan Sobo
2012-10-18 14:10:36 -07:00
parent ae0a60f4a9
commit a72d0399f7
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/editor.coffee
View File

@@ -46,12 +46,12 @@ class Editor extends View
@deserialize: (state, rootView) ->
editSessions = state.editSessions.map (state) -> EditSession.deserialize(state, rootView.project)
editor = new Editor(editSession: editSessions[state.activeEditSessionIndex], mini: state.mini)
editor = new Editor(editSession: editSessions[state.activeEditSessionIndex], mini: state.mini, showInvisibles: rootView.showInvisibles)
editor.editSessions = editSessions
editor.isFocused = state.isFocused
editor
initialize: ({editSession, @mini} = {}) ->
initialize: ({editSession, @mini, @showInvisibles} = {}) ->
requireStylesheet 'editor.css'
@id = Editor.idCounter++
@@ -265,6 +265,11 @@ class Editor extends View
getPageRows: ->
Math.max(1, Math.ceil(@scrollView[0].clientHeight / @lineHeight))
setShowInvisibles: (showInvisibles) ->
return if showInvisibles == @showInvisibles
@showInvisibles = showInvisibles
@renderLines()
setText: (text) -> @getBuffer().setText(text)
getText: -> @getBuffer().getText()
getPath: -> @getBuffer().getPath()
@@ -569,7 +574,7 @@ class Editor extends View
@updateRenderedLines()
newSplitEditor: ->
new Editor { editSession: @activeEditSession.copy() }
new Editor { editSession: @activeEditSession.copy(), @showInvisibles }
splitLeft: ->
@pane()?.splitLeft(@newSplitEditor()).wrappedView
@@ -874,7 +879,7 @@ class Editor extends View
line.push("<pre #{attributePairs.join(' ')}>")
if screenLine.text == ''
line.push("&nbsp;") unless @activeEditSession.showInvisibles
line.push("&nbsp;") unless @showInvisibles
else
firstNonWhitespacePosition = screenLine.text.search(/\S/)
firstTrailingWhitespacePosition = screenLine.text.search(/\s*$/)
@@ -882,14 +887,14 @@ class Editor extends View
for token in screenLine.tokens
updateScopeStack(token.scopes)
line.push(token.getValueAsHtml(
showInvisibles: @activeEditSession.showInvisibles
showInvisibles: @showInvisibles
hasLeadingWhitespace: position < firstNonWhitespacePosition
hasTrailingWhitespace: position + token.value.length > firstTrailingWhitespacePosition
))
position += token.value.length
line.push("<span class='invisible'>¬</span>") if @activeEditSession.showInvisibles
line.push("<span class='invisible'>¬</span>") if @showInvisibles
line.push('</pre>')
line.join('')