github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

wip: creating token spans

Browse Source
This commit is contained in:
Corey Johnson & Nathan Sobo
2012-09-28 11:49:16 -07:00
committed by Nathan Sobo
parent f47b510d7c
commit bebfaed69b
2 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
spec/app/editor-spec.coffee
View File

@@ -994,19 +994,35 @@ describe "Editor", ->
expect(buffer.lineForRow(10)).toBe ''
expect(editor.renderedLines.find('.line:eq(10)').html()).toBe ' '
it "syntax highlights code based on the file type", ->
line1 = editor.renderedLines.find('.line:first')
expect(line1.find('span:eq(0)')).toMatchSelector '.storage-type-js'
expect(line1.find('span:eq(0)').text()).toBe 'var'
expect(line1.find('span:eq(1)')).toMatchSelector '.source-js'
expect(line1.find('span:eq(1)').text()).toBe ' '
expect(line1.find('span:eq(2)')).toMatchSelector '.entity-name-function-js'
expect(line1.find('span:eq(2)').text()).toBe 'quicksort'
expect(line1.find('span:eq(4)')).toMatchSelector '.keyword-operator-js'
expect(line1.find('span:eq(4)').text()).toBe '='
fit "syntax highlights code based on the file type", ->
line0 = editor.renderedLines.find('.line:first')
editor.activeEditSession.linesForScreenRows(0, 0)[0].tokens.forEach (t) ->
console.log t.value, t.scopes.join('|')
line12 = editor.renderedLines.find('.line:eq(11)')
expect(line12.find('span:eq(1)')).toMatchSelector '.keyword'
span0 = line0.children('span:eq(0)')
expect(span0).toMatchSelector '.source-js'
expect(span0.children('span:eq(0)')).toMatchSelector 'storage-type-js'
expect(span0.children('span:eq(0)').text()).toBe 'var'
span0_1 = span0.children('span:eq(1)')
expect(span0_1).toMatchSelector 'meta.function.js'
expect(span0_1.text()).toBe 'quicksort = function ()'
expect(span0_1.children('span:eq(0)')).toMatchSelector 'entity-name-function-js'
expect(span0_1.children('span:eq(0)').text()).toBe "quicksort"
expect(span0_1.children('span:eq(1)')).toMatchSelector 'keyword-operator-js'
expect(span0_1.children('span:eq(1)').text()).toBe "="
expect(span0_1.children('span:eq(2)')).toMatchSelector 'storage-type-function-js'
expect(span0_1.children('span:eq(2)').text()).toBe "function"
expect(span0_1.children('span:eq(3)')).toMatchSelector 'punctuation-definition-parameters-begin-js'
expect(span0_1.children('span:eq(3)').text()).toBe "("
expect(span0_1.children('span:eq(4)')).toMatchSelector 'punctuation-definition-parameters-end-js'
expect(span0_1.children('span:eq(4)').text()).toBe ")"
expect(span0.children('span:eq(2)')).toMatchSelector 'meta-brace-curly-js'
expect(span0.children('span:eq(2)').text()).toBe "{"
# line12 = editor.renderedLines.find('.line:eq(11)')
# expect(line12.find('span:eq(1)')).toMatchSelector '.keyword'
describe "when lines are updated in the buffer", ->
it "syntax highlights the updated lines", ->

40
src/app/editor.coffee
View File

@@ -810,20 +810,32 @@ class Editor extends View
lines = @activeEditSession.linesForScreenRows(startRow, endRow)
activeEditSession = @activeEditSession
$$ ->
for line in lines
if fold = line.fold
lineAttributes = { class: 'fold line', 'fold-id': fold.id }
if activeEditSession.selectionIntersectsBufferRange(fold.getBufferRange())
lineAttributes.class += ' selected'
else
lineAttributes = { class: 'line' }
@pre lineAttributes, =>
if line.text == ''
@raw ' ' if line.text == ''
else
for token in line.tokens
@span { class: token.getCssClassString() }, token.value
buildLineHtml = @buildLineHtml
$$ -> @raw(buildLineHtml(line)) for line in lines
buildLineHtml: (screenLine) ->
scopesStack = []
line = []
if fold = line.fold
lineAttributes = { class: 'fold line', 'fold-id': fold.id }
if activeEditSession.selectionIntersectsBufferRange(fold.getBufferRange())
lineAttributes.class += ' selected'
else
lineAttributes = { class: 'line' }
attributePairs = "#{attributeName}=\"#{value}\"" for attributeName, value of lineAttributes
line.push("<pre #{attributePairs.join(' ')}>")
if line.text == ''
lines.push('&nbsp;')
else
for token in line.tokens
for scopesStack, i in token.scopes
line.push("<span class=#{classString}>")
line.push("</span>")
line.push("</pre>)
insertLineElements: (row, lineElements) ->
@spliceLineElements(row, 0, lineElements)