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

Get the TextEditorComponent specs green

Browse Source
This commit is contained in:
Nathan Sobo
2016-04-04 10:37:54 -06:00
parent fd960e9a37
commit bbef4c67c3
3 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lines-tile-component.coffee
View File

@@ -4,7 +4,6 @@ HighlightsComponent = require './highlights-component'
TokenIterator = require './token-iterator'
AcceptFilter = {acceptNode: -> NodeFilter.FILTER_ACCEPT}
TokenTextEscapeRegex = /[&"'<>]/g
NBSPCharacter = '\u00a0'
MaxTokenLength = 20000
cloneObject = (object) ->
@@ -267,13 +266,13 @@ class LinesTileComponent
openScopeNode.appendChild(newScopeNode)
openScopeNode = newScopeNode
else
textNode = @domElementPool.buildText(lineText.substr(startIndex, tagCode).replace(/\s/g, NBSPCharacter))
textNode = @domElementPool.buildText(lineText.substr(startIndex, tagCode))
startIndex += tagCode
openScopeNode.appendChild(textNode)
@currentLineTextNodes.push(textNode)
if startIndex is 0
textNode = @domElementPool.buildText(NBSPCharacter)
textNode = @domElementPool.buildText(' ')
lineNode.appendChild(textNode)
@currentLineTextNodes.push(textNode)

2
src/text-editor.coffee
View File

@@ -132,6 +132,8 @@ class TextEditor extends Model
@config, @assert, @grammarRegistry, @packageManager
})
{@buffer, @displayLayer} = @displayBuffer
@decorateMarkerLayer(@displayLayer.foldsMarkerLayer, {type: 'line-number', class: 'folded'})
@selectionsMarkerLayer ?= @addMarkerLayer(maintainHistory: true)
for marker in @selectionsMarkerLayer.getMarkers()