Skip to content

Commit

Permalink
Merge pull request atom#10999 from atom/wl-update-language-javascript
Browse files Browse the repository at this point in the history
Upgrade language-javascript to 0.111.0
  • Loading branch information
Antonio Scandurra authored Jun 6, 2016
2 parents 7ff5469 + c6d431b commit 84e6ff4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions spec/tokenized-buffer-spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -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", ->
Expand Down Expand Up @@ -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], '/*')
Expand Down Expand Up @@ -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", ->
Expand Down Expand Up @@ -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", ->
Expand Down

0 comments on commit 84e6ff4

Please sign in to comment.