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

Use javscript.tmbundle commit 2f95d9ae92

Browse Source 
The commit after this one breaks syntax highlighting
for the lines after a single line comment
This commit is contained in:
Kevin Sawicki
2012-10-12 11:34:42 -07:00
parent 59a98bdaf8
commit 38802ba287
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Rakefile
View File

@@ -76,7 +76,7 @@ task "clone-default-bundles" => "create-dot-atom" do
bundles = {
"https://github.com/textmate/css.tmbundle.git" => "HEAD",
"https://github.com/textmate/html.tmbundle.git" => "HEAD",
"https://github.com/textmate/javascript.tmbundle.git" => "HEAD",
"https://github.com/textmate/javascript.tmbundle.git" => "2f95d9ae92110c82d55455bf4483951be55f1e87",
"https://github.com/textmate/ruby-on-rails.tmbundle.git" => "HEAD",
"https://github.com/textmate/ruby.tmbundle.git" => "daad8ef03de9630e74578a046240fd9acc63b8b5",
"https://github.com/textmate/text.tmbundle.git" => "HEAD",

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

@@ -998,7 +998,7 @@ describe "Editor", ->
line0 = editor.renderedLines.find('.line:first')
span0 = line0.children('span:eq(0)')
expect(span0).toMatchSelector '.source.js'
expect(span0.children('span:eq(0)')).toMatchSelector '.storage.modifier.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)')
@@ -1023,9 +1023,9 @@ describe "Editor", ->
describe "when lines are updated in the buffer", ->
it "syntax highlights the updated lines", ->
expect(editor.renderedLines.find('.line:eq(0) > span:first > span:first')).toMatchSelector '.storage.modifier.js'
expect(editor.renderedLines.find('.line:eq(0) > span:first > span:first')).toMatchSelector '.storage.type.js'
buffer.insert([0, 0], "q")
expect(editor.renderedLines.find('.line:eq(0) > span:first > span:first')).not.toMatchSelector '.storage.modifier.js'
expect(editor.renderedLines.find('.line:eq(0) > span:first > span:first')).not.toMatchSelector '.storage.type.js'
# verify that re-highlighting can occur below the changed line
buffer.insert([5,0], "/* */")

6
spec/app/tokenized-buffer-spec.coffee
View File

@@ -23,7 +23,7 @@ describe "TokenizedBuffer", ->
describe "tokenization", ->
it "tokenizes all the lines in the buffer on construction", ->
expect(tokenizedBuffer.lineForScreenRow(0).tokens[0]).toEqual(value: 'var', scopes: ['source.js', 'storage.modifier.js'])
expect(tokenizedBuffer.lineForScreenRow(0).tokens[0]).toEqual(value: 'var', scopes: ['source.js', 'storage.type.js'])
expect(tokenizedBuffer.lineForScreenRow(11).tokens[1]).toEqual(value: 'return', scopes: ['source.js', 'keyword.control.js'])
describe "when the buffer changes", ->
@@ -77,7 +77,7 @@ describe "TokenizedBuffer", ->
buffer.change(range, "foo()")
# previous line 0 remains
expect(tokenizedBuffer.lineForScreenRow(0).tokens[0]).toEqual(value: 'var', scopes: ['source.js', 'storage.modifier.js'])
expect(tokenizedBuffer.lineForScreenRow(0).tokens[0]).toEqual(value: 'var', scopes: ['source.js', 'storage.type.js'])
# previous line 3 should be combined with input to form line 1
expect(tokenizedBuffer.lineForScreenRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])
@@ -113,7 +113,7 @@ describe "TokenizedBuffer", ->
buffer.change(range, "foo()\nbar()\nbaz()\nquux()")
# previous line 0 remains
expect(tokenizedBuffer.lineForScreenRow(0).tokens[0]).toEqual( value: 'var', scopes: ['source.js', 'storage.modifier.js'])
expect(tokenizedBuffer.lineForScreenRow(0).tokens[0]).toEqual( value: 'var', scopes: ['source.js', 'storage.type.js'])
# 3 new lines inserted
expect(tokenizedBuffer.lineForScreenRow(1).tokens[0]).toEqual(value: 'foo', scopes: ['source.js'])