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

Merge pull request #10999 from atom/wl-update-language-javascript

Browse Source 
Upgrade language-javascript to 0.111.0
This commit is contained in:
Antonio Scandurra
2016-06-06 14:14:32 +02:00
committed by GitHub
parent 7ff5469385 c6d431bdf1
commit 84e6ff4996
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -132,7 +132,7 @@
"language-html": "0.44.1",
"language-hyperlink": "0.16.0",
"language-java": "0.22.0",
"language-javascript": "0.110.0",
"language-javascript": "0.119.0",
"language-json": "0.18.0",
"language-less": "0.29.3",
"language-make": "0.22.2",

10
spec/tokenized-buffer-spec.coffee
View File

@@ -187,9 +187,9 @@ describe "TokenizedBuffer", ->
buffer.delete([[1, 0], [3, 0]])
changeHandler.reset()
expect(tokenizedBuffer.firstInvalidRow()).toBe 3
expect(tokenizedBuffer.firstInvalidRow()).toBe 2
advanceClock()
expect(changeHandler).toHaveBeenCalledWith(start: 3, end: 7, delta: 0)
expect(changeHandler).toHaveBeenCalledWith(start: 2, end: 6, delta: 0)
describe "when the change invalidates all the lines before the current invalid region", ->
it "retokenizes the invalidated lines and continues into the valid region", ->
@@ -259,7 +259,7 @@ describe "TokenizedBuffer", ->
expect(changeHandler).toHaveBeenCalled()
[event] = changeHandler.argsForCall[0]
delete event.bufferChange
expect(event).toEqual(start: 3, end: 5, delta: 0)
expect(event).toEqual(start: 3, end: 7, delta: 0)
it "resumes highlighting with the state of the previous line", ->
buffer.insert([0, 0], '/*')
@@ -309,7 +309,7 @@ describe "TokenizedBuffer", ->
expect(changeHandler).toHaveBeenCalled()
[event] = changeHandler.argsForCall[0]
delete event.bufferChange
expect(event).toEqual(start: 3, end: 4, delta: 0)
expect(event).toEqual(start: 3, end: 7, delta: 0)
describe "when lines are both updated and inserted", ->
it "updates tokens to reflect the change", ->
@@ -360,7 +360,7 @@ describe "TokenizedBuffer", ->
expect(changeHandler).toHaveBeenCalled()
[event] = changeHandler.argsForCall[0]
delete event.bufferChange
expect(event).toEqual(start: 5, end: 7, delta: 0)
expect(event).toEqual(start: 5, end: 9, delta: 0)
describe "when there is an insertion that is larger than the chunk size", ->
it "tokenizes the initial chunk synchronously, then tokenizes the remaining lines in the background", ->