From 9b1b9df2f4d3d65fa819aae53cc647da4f2e90da Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Sun, 28 Feb 2016 17:31:46 -0500 Subject: [PATCH 1/4] :arrow_up: language-javascript@0.111.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5dc94cda9..c6d368aff 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "language-html": "0.44.1", "language-hyperlink": "0.16.0", "language-java": "0.17.0", - "language-javascript": "0.110.0", + "language-javascript": "0.111.0", "language-json": "0.17.4", "language-less": "0.29.0", "language-make": "0.21.0", From e0664ee5a4f732f6fe31c6e8b0aca5e5dd65f54f Mon Sep 17 00:00:00 2001 From: Wliu Date: Mon, 18 Apr 2016 16:33:12 -0400 Subject: [PATCH 2/4] :arrow_up: language-javascript@0.116.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4009a254..1e529898e 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "language-html": "0.44.1", "language-hyperlink": "0.16.0", "language-java": "0.17.0", - "language-javascript": "0.111.0", + "language-javascript": "0.116.0", "language-json": "0.18.0", "language-less": "0.29.1", "language-make": "0.21.0", From f78dfdf9b229d60478cf5fe80f6ec74cafe4b4f8 Mon Sep 17 00:00:00 2001 From: Wliu Date: Wed, 4 May 2016 15:49:05 -0400 Subject: [PATCH 3/4] :arrow_up: language-javascript@0.119.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93774e26f..936ec2ecf 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "language-html": "0.44.1", "language-hyperlink": "0.16.0", "language-java": "0.17.0", - "language-javascript": "0.116.0", + "language-javascript": "0.119.0", "language-json": "0.18.0", "language-less": "0.29.3", "language-make": "0.21.1", From 9b70066bed3e9874e719c9af352e2b245e3fdb49 Mon Sep 17 00:00:00 2001 From: Wliu Date: Wed, 4 May 2016 17:28:15 -0400 Subject: [PATCH 4/4] Fix TokenizedBuffer specs? --- spec/tokenized-buffer-spec.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/tokenized-buffer-spec.coffee b/spec/tokenized-buffer-spec.coffee index ee418a386..d11c93213 100644 --- a/spec/tokenized-buffer-spec.coffee +++ b/spec/tokenized-buffer-spec.coffee @@ -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", ->