From 27cc953c07252266e25309f28408a3a23c52031f Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 01:08:28 -0800 Subject: [PATCH 01/24] Destroy pending item when new item is activated --- src/pane.coffee | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/pane.coffee b/src/pane.coffee index 412fc5251..3b698c444 100644 --- a/src/pane.coffee +++ b/src/pane.coffee @@ -337,14 +337,18 @@ class Pane extends Model # # * `index` {Number} activateItemAtIndex: (index) -> - @activateItem(@itemAtIndex(index)) + @setActiveItem(@itemAtIndex(index)) # Public: Make the given item *active*, causing it to be displayed by # the pane's view. activateItem: (item) -> if item? - @addItem(item, @getActiveItemIndex() + 1, false) - @setActiveItem(item) + if @activeItem?.isPending() + index = @getActiveItemIndex() + @destroyActiveItem() + else + index = @getActiveItemIndex() + 1 + @addItem(item, index, false) # Public: Add the given item to the pane. # @@ -358,14 +362,16 @@ class Pane extends Model throw new Error("Pane items must be objects. Attempted to add item #{item}.") unless item? and typeof item is 'object' throw new Error("Adding a pane item with URI '#{item.getURI?()}' that has already been destroyed") if item.isDestroyed?() - return if item in @items + if item in @items + @setActiveItem(item) + return if typeof item.onDidDestroy is 'function' @itemSubscriptions.set item, item.onDidDestroy => @removeItem(item, false) @items.splice(index, 0, item) @emitter.emit 'did-add-item', {item, index, moved} - @setActiveItem(item) unless @getActiveItem()? + @setActiveItem(item) item # Public: Add the given items to the pane. From b24250289e81ee2464217d2655597a69fc796b26 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 01:10:42 -0800 Subject: [PATCH 02/24] Add pending status to text editors Add event methods for 'did-confirm-pending-state'. --- src/text-editor.coffee | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/text-editor.coffee b/src/text-editor.coffee index 1435aef19..f769646dc 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -92,9 +92,10 @@ class TextEditor extends Model softWrapped, @displayBuffer, @selectionsMarkerLayer, buffer, suppressCursorCreation, @mini, @placeholderText, lineNumberGutterVisible, largeFileMode, @config, @notificationManager, @packageManager, @clipboard, @viewRegistry, @grammarRegistry, - @project, @assert, @applicationDelegate + @project, @assert, @applicationDelegate, @pending } = params + throw new Error("Must pass a config parameter when constructing TextEditors") unless @config? throw new Error("Must pass a notificationManager parameter when constructing TextEditors") unless @notificationManager? throw new Error("Must pass a packageManager parameter when constructing TextEditors") unless @packageManager? @@ -161,6 +162,9 @@ class TextEditor extends Model @disposables.add @buffer.onDidChangeEncoding => @emitter.emit 'did-change-encoding', @getEncoding() @disposables.add @buffer.onDidDestroy => @destroy() + if @pending + @disposables.add @buffer.onDidChangeModified => + @confirmPendingState() if @buffer.isModified() @preserveCursorPositionOnBufferReload() @@ -569,6 +573,13 @@ class TextEditor extends Model getEditorWidthInChars: -> @displayBuffer.getEditorWidthInChars() + onDidConfirmPendingState: (callback) -> + @emitter.on 'did-confirm-pending-state', callback + + confirmPendingState: -> + @pending = false + @emitter.emit 'did-confirm-pending-state', this + ### Section: File Details ### @@ -652,6 +663,9 @@ class TextEditor extends Model # Essential: Returns {Boolean} `true` if this editor has no content. isEmpty: -> @buffer.isEmpty() + # Returns {Boolean} `true` if this editor is pending and `false` if it is permanent. + isPending: -> Boolean(@pending) + # Copies the current file path to the native clipboard. copyPathToClipboard: -> if filePath = @getPath() From 219ebea98b08a5f8b7463f3ef5ad81249863a7cb Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 01:31:19 -0800 Subject: [PATCH 03/24] Fix bug in ::activate Item Check if isPending function exists on item before invoking. --- src/pane.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pane.coffee b/src/pane.coffee index 3b698c444..4e97e8bdc 100644 --- a/src/pane.coffee +++ b/src/pane.coffee @@ -343,7 +343,7 @@ class Pane extends Model # the pane's view. activateItem: (item) -> if item? - if @activeItem?.isPending() + if @activeItem?.isPending?() index = @getActiveItemIndex() @destroyActiveItem() else From 4c4e16ac3bd2b1cc7ec2416ead90ae33f769d077 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 12:29:22 -0800 Subject: [PATCH 04/24] Fix bug in ::activateItem Only destroy active item if it is not the same as the new item. --- src/pane.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pane.coffee b/src/pane.coffee index 4e97e8bdc..b0758f4c4 100644 --- a/src/pane.coffee +++ b/src/pane.coffee @@ -345,7 +345,7 @@ class Pane extends Model if item? if @activeItem?.isPending?() index = @getActiveItemIndex() - @destroyActiveItem() + @destroyActiveItem() unless item is @activeItem else index = @getActiveItemIndex() + 1 @addItem(item, index, false) @@ -580,7 +580,6 @@ class Pane extends Model # Public: Makes this pane the *active* pane, causing it to gain focus. activate: -> throw new Error("Pane has been destroyed") if @isDestroyed() - @container?.setActivePane(this) @emitter.emit 'did-activate' From e26ae05597c5c45726b1b5340a5a3ece418f6234 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 13:34:58 -0800 Subject: [PATCH 05/24] Fix bug in ::activateItemAtIndex Revert to original code to conform to specs. --- src/pane.coffee | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pane.coffee b/src/pane.coffee index b0758f4c4..21d74b3d7 100644 --- a/src/pane.coffee +++ b/src/pane.coffee @@ -337,7 +337,7 @@ class Pane extends Model # # * `index` {Number} activateItemAtIndex: (index) -> - @setActiveItem(@itemAtIndex(index)) + @activateItem(@itemAtIndex(index)) # Public: Make the given item *active*, causing it to be displayed by # the pane's view. @@ -349,6 +349,7 @@ class Pane extends Model else index = @getActiveItemIndex() + 1 @addItem(item, index, false) + @setActiveItem(item) # Public: Add the given item to the pane. # @@ -362,16 +363,14 @@ class Pane extends Model throw new Error("Pane items must be objects. Attempted to add item #{item}.") unless item? and typeof item is 'object' throw new Error("Adding a pane item with URI '#{item.getURI?()}' that has already been destroyed") if item.isDestroyed?() - if item in @items - @setActiveItem(item) - return + return if item in @items if typeof item.onDidDestroy is 'function' @itemSubscriptions.set item, item.onDidDestroy => @removeItem(item, false) @items.splice(index, 0, item) @emitter.emit 'did-add-item', {item, index, moved} - @setActiveItem(item) + @setActiveItem(item) unless @getActiveItem() item # Public: Add the given items to the pane. From 63b5ddbd9952c7ef10c769de5f7d23fe27d626f1 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 13:58:59 -0800 Subject: [PATCH 06/24] Handle out-of-bound indices for ::activateItemAtIndex --- src/pane.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pane.coffee b/src/pane.coffee index 21d74b3d7..70687227a 100644 --- a/src/pane.coffee +++ b/src/pane.coffee @@ -337,7 +337,8 @@ class Pane extends Model # # * `index` {Number} activateItemAtIndex: (index) -> - @activateItem(@itemAtIndex(index)) + item = @itemAtIndex(index) or @getActiveItem() + @setActiveItem(item) # Public: Make the given item *active*, causing it to be displayed by # the pane's view. @@ -370,7 +371,7 @@ class Pane extends Model @items.splice(index, 0, item) @emitter.emit 'did-add-item', {item, index, moved} - @setActiveItem(item) unless @getActiveItem() + @setActiveItem(item) unless @getActiveItem()? item # Public: Add the given items to the pane. From cca9ea4b608c9e40cc673372fa438b2de5c6a4f5 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 17:56:18 -0800 Subject: [PATCH 07/24] Rename onDidConfirmPendingState for clarity Now it is called onDidTerminatePendingState. --- src/text-editor.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/text-editor.coffee b/src/text-editor.coffee index f769646dc..e54734257 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -164,7 +164,7 @@ class TextEditor extends Model @disposables.add @buffer.onDidDestroy => @destroy() if @pending @disposables.add @buffer.onDidChangeModified => - @confirmPendingState() if @buffer.isModified() + @terminatePendingState() if @buffer.isModified() @preserveCursorPositionOnBufferReload() @@ -573,10 +573,10 @@ class TextEditor extends Model getEditorWidthInChars: -> @displayBuffer.getEditorWidthInChars() - onDidConfirmPendingState: (callback) -> + onDidTerminatePendingState: (callback) -> @emitter.on 'did-confirm-pending-state', callback - confirmPendingState: -> + terminatePendingState: -> @pending = false @emitter.emit 'did-confirm-pending-state', this From fa86d2d1568c326900953b247aae3679e170a07b Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 17:57:08 -0800 Subject: [PATCH 08/24] Add tests for pending status --- spec/text-editor-spec.coffee | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index 02d2e4a96..c51ec41d7 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -5804,3 +5804,20 @@ describe "TextEditor", -> screenRange: marker1.getRange(), rangeIsReversed: false } + + describe "pending state", -> + editor1 = null + beforeEach -> + waitsForPromise -> + atom.workspace.open('sample.txt', pending: true).then (o) -> editor1 = o + + it "should open file in pending state if 'pending' option is true", -> + expect(editor1.isPending()).toBe true + expect(editor.isPending()).toBe false # By default pending status is false + + it "invokes ::onDidTerminatePendingState observers if pending status is removed", -> + events = [] + editor1.onDidTerminatePendingState (event) -> events.push(event) + editor1.terminatePendingState() + expect(editor1.isPending()).toBe false + expect(events).toEqual [editor1] From 7f57b0ada488845675d9bda5d31137ded3866979 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 18:02:07 -0800 Subject: [PATCH 09/24] Change event to 'did-terminate-pending-state' --- src/text-editor.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/text-editor.coffee b/src/text-editor.coffee index e54734257..55a7b026f 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -574,11 +574,11 @@ class TextEditor extends Model @displayBuffer.getEditorWidthInChars() onDidTerminatePendingState: (callback) -> - @emitter.on 'did-confirm-pending-state', callback + @emitter.on 'did-terminate-pending-state', callback terminatePendingState: -> @pending = false - @emitter.emit 'did-confirm-pending-state', this + @emitter.emit 'did-terminate-pending-state', this ### Section: File Details From 217e07530feead0d3295d1577d589e814cc437a0 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 18:43:57 -0800 Subject: [PATCH 10/24] Add test: modified buffer terminates pending state Test not yet passing. ::insertText is not triggering terminatePendingState. Not sure why... --- spec/text-editor-spec.coffee | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index c51ec41d7..225a1485a 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -5821,3 +5821,11 @@ describe "TextEditor", -> editor1.terminatePendingState() expect(editor1.isPending()).toBe false expect(events).toEqual [editor1] + + it "should terminate pending state when buffer is changed", -> + events = [] + editor1.onDidTerminatePendingState (event) -> events.push(event) + expect(editor1.isPending()).toBe true + editor1.insertText('I\'ll be back!') + expect(editor1.isPending()).toBe false + expect(events).toEqual [editor1] From def62fc6c7849b3b2c705939cee02848d7332432 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 24 Dec 2015 21:42:00 -0800 Subject: [PATCH 11/24] Fix test: modified buffer terminates pending state --- spec/text-editor-spec.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index 225a1485a..686bb6868 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -5827,5 +5827,6 @@ describe "TextEditor", -> editor1.onDidTerminatePendingState (event) -> events.push(event) expect(editor1.isPending()).toBe true editor1.insertText('I\'ll be back!') + advanceClock(500) expect(editor1.isPending()).toBe false expect(events).toEqual [editor1] From 67d49955f136a48cb215a698ab1f06ab3e60d176 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Tue, 5 Jan 2016 10:38:13 -0800 Subject: [PATCH 12/24] Add tests for pending pane items --- spec/pane-spec.coffee | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/spec/pane-spec.coffee b/spec/pane-spec.coffee index 36803bde6..5c5cd9e95 100644 --- a/spec/pane-spec.coffee +++ b/spec/pane-spec.coffee @@ -18,6 +18,8 @@ describe "Pane", -> onDidDestroy: (fn) -> @emitter.on('did-destroy', fn) destroy: -> @destroyed = true; @emitter.emit('did-destroy') isDestroyed: -> @destroyed + isPending: -> @pending + pending: false beforeEach -> confirm = spyOn(atom.applicationDelegate, 'confirm') @@ -153,6 +155,26 @@ describe "Pane", -> pane.activateItem(pane.itemAtIndex(1)) expect(observed).toEqual [pane.itemAtIndex(1)] + it "replaces pending items", -> + itemC = new Item("C") + itemD = new Item("D") + itemC.pending = true + itemD.pending = true + + expect(itemC.isPending()).toBe true + pane.activateItem(itemC) + expect(pane.getItems().length).toBe 3 + expect(pane.getActiveItem()).toBe pane.itemAtIndex(1) + + expect(itemD.isPending()).toBe true + pane.activateItem(itemD) + expect(pane.getItems().length).toBe 3 + expect(pane.getActiveItem()).toBe pane.itemAtIndex(1) + + pane.activateItem(pane.itemAtIndex(2)) + expect(pane.getItems().length).toBe 2 + expect(pane.getActiveItem()).toBe pane.itemAtIndex(1) + describe "::activateNextItem() and ::activatePreviousItem()", -> it "sets the active item to the next/previous item, looping around at either end", -> pane = new Pane(paneParams(items: [new Item("A"), new Item("B"), new Item("C")])) From cee41a2fb0c513c92fc6f056d6ad87f28d951a73 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Tue, 5 Jan 2016 10:42:07 -0800 Subject: [PATCH 13/24] Remove new line --- src/text-editor.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/src/text-editor.coffee b/src/text-editor.coffee index 55a7b026f..7410f8209 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -95,7 +95,6 @@ class TextEditor extends Model @project, @assert, @applicationDelegate, @pending } = params - throw new Error("Must pass a config parameter when constructing TextEditors") unless @config? throw new Error("Must pass a notificationManager parameter when constructing TextEditors") unless @notificationManager? throw new Error("Must pass a packageManager parameter when constructing TextEditors") unless @packageManager? From de043956bb2c1812c40033278ed66771ede69783 Mon Sep 17 00:00:00 2001 From: Lee DohM Date: Thu, 7 Jan 2016 18:51:26 -0800 Subject: [PATCH 14/24] Relocate and rename 'View > Reload' to prevent confusion --- menus/darwin.cson | 2 +- menus/linux.cson | 2 +- menus/win32.cson | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/menus/darwin.cson b/menus/darwin.cson index 52b7a5bc8..31a2b8db6 100644 --- a/menus/darwin.cson +++ b/menus/darwin.cson @@ -139,7 +139,6 @@ { label: 'View' submenu: [ - { label: 'Reload', command: 'window:reload' } { label: 'Toggle Full Screen', command: 'window:toggle-full-screen' } { label: 'Panes' @@ -165,6 +164,7 @@ submenu: [ { label: 'Open In Dev Mode…', command: 'application:open-dev' } { label: 'Run Package Specs', command: 'window:run-package-specs' } + { label: 'Reload Window', command: 'window:reload' } { label: 'Toggle Developer Tools', command: 'window:toggle-dev-tools' } ] } diff --git a/menus/linux.cson b/menus/linux.cson index fa831b4a4..8e9b22cc4 100644 --- a/menus/linux.cson +++ b/menus/linux.cson @@ -95,7 +95,6 @@ { label: '&View' submenu: [ - { label: '&Reload', command: 'window:reload' } { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' } { label: 'Toggle Menu Bar', command: 'window:toggle-menu-bar' } { @@ -122,6 +121,7 @@ submenu: [ { label: 'Open In &Dev Mode…', command: 'application:open-dev' } { label: 'Run Package &Specs', command: 'window:run-package-specs' } + { label: '&Reload Window', command: 'window:reload' } { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' } ] } diff --git a/menus/win32.cson b/menus/win32.cson index 04da3d388..edc6a9c6c 100644 --- a/menus/win32.cson +++ b/menus/win32.cson @@ -94,7 +94,6 @@ { label: '&View' submenu: [ - { label: '&Reload', command: 'window:reload' } { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' } { label: 'Toggle Menu Bar', command: 'window:toggle-menu-bar' } { @@ -121,6 +120,7 @@ submenu: [ { label: 'Open In &Dev Mode…', command: 'application:open-dev' } { label: 'Run Package &Specs', command: 'window:run-package-specs' } + { label: '&Reload Window', command: 'window:reload' } { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' } ] } From e9bb1f9220a07c3e723d6c801ca80265e4f92fa7 Mon Sep 17 00:00:00 2001 From: Lee DohM Date: Thu, 7 Jan 2016 19:31:03 -0800 Subject: [PATCH 15/24] Sort alphabetically --- menus/darwin.cson | 2 +- menus/linux.cson | 2 +- menus/win32.cson | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/menus/darwin.cson b/menus/darwin.cson index 31a2b8db6..0195bde71 100644 --- a/menus/darwin.cson +++ b/menus/darwin.cson @@ -163,8 +163,8 @@ label: 'Developer' submenu: [ { label: 'Open In Dev Mode…', command: 'application:open-dev' } - { label: 'Run Package Specs', command: 'window:run-package-specs' } { label: 'Reload Window', command: 'window:reload' } + { label: 'Run Package Specs', command: 'window:run-package-specs' } { label: 'Toggle Developer Tools', command: 'window:toggle-dev-tools' } ] } diff --git a/menus/linux.cson b/menus/linux.cson index 8e9b22cc4..9f251d67f 100644 --- a/menus/linux.cson +++ b/menus/linux.cson @@ -120,8 +120,8 @@ label: 'Developer' submenu: [ { label: 'Open In &Dev Mode…', command: 'application:open-dev' } - { label: 'Run Package &Specs', command: 'window:run-package-specs' } { label: '&Reload Window', command: 'window:reload' } + { label: 'Run Package &Specs', command: 'window:run-package-specs' } { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' } ] } diff --git a/menus/win32.cson b/menus/win32.cson index edc6a9c6c..ad0461898 100644 --- a/menus/win32.cson +++ b/menus/win32.cson @@ -119,8 +119,8 @@ label: 'Developer' submenu: [ { label: 'Open In &Dev Mode…', command: 'application:open-dev' } - { label: 'Run Package &Specs', command: 'window:run-package-specs' } { label: '&Reload Window', command: 'window:reload' } + { label: 'Run Package &Specs', command: 'window:run-package-specs' } { label: 'Toggle Developer &Tools', command: 'window:toggle-dev-tools' } ] } From f527504402452aad70210e767abcae37981aa3e2 Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Thu, 7 Jan 2016 22:49:30 -0500 Subject: [PATCH 16/24] :arrow_up: language-python@0.43.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eaad0b69a..f9d41fc64 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "language-perl": "0.32.0", "language-php": "0.36.0", "language-property-list": "0.8.0", - "language-python": "0.42.1", + "language-python": "0.43.0", "language-ruby": "0.67.0", "language-ruby-on-rails": "0.25.0", "language-sass": "0.45.0", From 0bb8e21c04378f3c46fd0181c136b4136e714746 Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Thu, 7 Jan 2016 22:49:51 -0500 Subject: [PATCH 17/24] :arrow_up: language-json@0.17.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f9d41fc64..8f8b24b9c 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "language-hyperlink": "0.16.0", "language-java": "0.17.0", "language-javascript": "0.105.0", - "language-json": "0.17.2", + "language-json": "0.17.3", "language-less": "0.29.0", "language-make": "0.21.0", "language-mustache": "0.13.0", From 5738b14eda476e90c85aaf67128df5baf7cbff23 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Fri, 8 Jan 2016 13:39:46 -0800 Subject: [PATCH 18/24] :art: --- spec/text-editor-spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index 686bb6868..ce84d2c50 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -5815,7 +5815,7 @@ describe "TextEditor", -> expect(editor1.isPending()).toBe true expect(editor.isPending()).toBe false # By default pending status is false - it "invokes ::onDidTerminatePendingState observers if pending status is removed", -> + it "invokes ::onDidTerminatePendingState observers if pending status is terminated", -> events = [] editor1.onDidTerminatePendingState (event) -> events.push(event) editor1.terminatePendingState() From 35f262f4117d6d4cbe33ec336d905781ef79af83 Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Sun, 10 Jan 2016 20:41:43 -0500 Subject: [PATCH 19/24] :arrow_up: language-html@0.44.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8f8b24b9c..76a351866 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "language-gfm": "0.82.0", "language-git": "0.11.0", "language-go": "0.41.0", - "language-html": "0.43.1", + "language-html": "0.44.0", "language-hyperlink": "0.16.0", "language-java": "0.17.0", "language-javascript": "0.105.0", From d48f3aaed8d750b07a8d6c1da582a4309ff2ff0f Mon Sep 17 00:00:00 2001 From: Daniel Hengeveld Date: Mon, 11 Jan 2016 10:06:01 -0500 Subject: [PATCH 20/24] :arrow_up: settings-view@0.232.1 refs https://github.com/atom/settings-view/pull/698 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76a351866..8fd36fd8a 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "open-on-github": "0.40.0", "package-generator": "0.41.0", "release-notes": "0.53.0", - "settings-view": "0.232.1", + "settings-view": "0.232.2", "snippets": "1.0.1", "spell-check": "0.63.0", "status-bar": "0.80.0", From 9e6136470e30842fe57db21eb2819215657d673a Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Mon, 11 Jan 2016 12:17:08 -0500 Subject: [PATCH 21/24] :fire: CHANGELOG.md Having this file still here is confusing. Do we use it, or do we use https://github.com/benogle/pr-changelog? Let's apply :fire: if we're not gonna keep it up to date. /cc @mnquintana --- CHANGELOG.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e36b3f59e..8823bd9cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1 @@ See https://atom.io/releases - -## 1.4.0 - -* Switching encoding is now fast also with large files. -* Fixed an issue where disabling and re-enabling a package caused custom keymaps to be overridden. -* Fixed restoring untitled editors on restart. The new behavior never prompts to save new/changed files when closing a window or quitting Atom. - -## 1.3.0 - -* The tree-view now sorts directory entries more naturally, in a locale-sensitive way. -* Lines can now be moved up and down with multiple cursors. -* Improved the performance of marker-dependent code paths such as spell-check and find and replace. -* Fixed copying and pasting in native input fields. -* By default, windows with no pane items are now closed via the `core:close` command. The previous behavior can be restored via the `Close Empty Windows` option in settings. -* Fixed an issue where characters were inserted when toggling the settings view on some keyboard layouts. -* Modules can now temporarily override `Error.prepareStackTrace`. There is also an `Error.prototype.getRawStack()` method if you just need access to the raw v8 trace structure. -* Fixed a problem that caused blurry fonts on monitors that have a slightly higher resolution than 96 DPI. From ff0a62833f3302a1656b89686c25a28532f1fa6f Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 11 Jan 2016 11:26:31 -0700 Subject: [PATCH 22/24] Pin jQuery to 2.1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8fd36fd8a..06f4d2bfe 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "grim": "1.5.0", "jasmine-json": "~0.0", "jasmine-tagged": "^1.1.4", - "jquery": "^2.1.1", + "jquery": "2.1.4", "key-path-helpers": "^0.4.0", "less-cache": "0.22", "marked": "^0.3.4", From 339489997b7fbecfd9ea6340f0f0d2de7768daf5 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 11 Jan 2016 11:31:31 -0700 Subject: [PATCH 23/24] :arrow_up: tree-view --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06f4d2bfe..e3a4637a7 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "symbols-view": "0.110.1", "tabs": "0.88.0", "timecop": "0.33.0", - "tree-view": "0.198.0", + "tree-view": "0.198.1", "update-package-dependencies": "0.10.0", "welcome": "0.33.0", "whitespace": "0.32.1", From 2acb9c1ee885f0b47cc8e87085bf3c44748acf69 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 11 Jan 2016 11:31:38 -0700 Subject: [PATCH 24/24] :arrow_up: settings-view --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3a4637a7..d781d82ac 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "open-on-github": "0.40.0", "package-generator": "0.41.0", "release-notes": "0.53.0", - "settings-view": "0.232.2", + "settings-view": "0.232.3", "snippets": "1.0.1", "spell-check": "0.63.0", "status-bar": "0.80.0",