From 31634f3f531bbd6fdbf87eeda38a7c489cc539c1 Mon Sep 17 00:00:00 2001 From: Jonathan Delgado Date: Sat, 15 Aug 2015 10:21:25 -0700 Subject: [PATCH 01/24] Add disableInitialEmptyEditor setting --- src/atom.coffee | 1 + src/config-schema.coffee | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/atom.coffee b/src/atom.coffee index 7065a0d93..3bba8ffca 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -673,6 +673,7 @@ class Atom extends Model @windowEventHandler?.unsubscribe() openInitialEmptyEditorIfNecessary: -> + return if @config.get('core.disableInitialEmptyEditor') if @getLoadSettings().initialPaths?.length is 0 and @workspace.getPaneItems().length is 0 @workspace.open(null) diff --git a/src/config-schema.coffee b/src/config-schema.coffee index a1bd91cc7..2487f4c37 100644 --- a/src/config-schema.coffee +++ b/src/config-schema.coffee @@ -89,6 +89,10 @@ module.exports = 'windows1258', 'windows866' ] + disableInitialEmptyEditor: + description: 'Disable the initial empty editor when atom starts.' + type: 'boolean' + default: false editor: type: 'object' From f2c9688b435b9337698606c2fd3f0b45f8873a93 Mon Sep 17 00:00:00 2001 From: Jeremy Ebneyamin Date: Sat, 22 Aug 2015 18:42:16 -0700 Subject: [PATCH 02/24] Fix config.get for schemas containing objects The config.get method would not return the default values for the properties in objects. Now with _.deepExtends, the default values are the base while any new values overwrite the defaults. This way all default values appear, including those nested in an object. This fixes atom/settings-view#386 and fixes atom/settings-view#518. --- src/config.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.coffee b/src/config.coffee index 00ebabf58..d4fe1e753 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -864,8 +864,8 @@ class Config defaultValue = _.valueForKeyPath(@defaultSettings, keyPath) if value? - value = @deepClone(value) - _.defaults(value, defaultValue) if isPlainObject(value) and isPlainObject(defaultValue) + defaultValue = @deepClone(defaultValue) + value = _.deepExtends(defaultValue, value) if isPlainObject(value) and isPlainObject(defaultValue) else value = @deepClone(defaultValue) From 85800f6d00aac38628dc9fc66a874cae01870dc2 Mon Sep 17 00:00:00 2001 From: Jeremy Ramin Date: Sat, 22 Aug 2015 21:16:32 -0700 Subject: [PATCH 03/24] Fix method typo --- src/config.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.coffee b/src/config.coffee index d4fe1e753..18b111471 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -865,7 +865,7 @@ class Config if value? defaultValue = @deepClone(defaultValue) - value = _.deepExtends(defaultValue, value) if isPlainObject(value) and isPlainObject(defaultValue) + value = _.deepExtend(defaultValue, value) if isPlainObject(value) and isPlainObject(defaultValue) else value = @deepClone(defaultValue) From 9a0d657d52e77f0cfe123b26b9285f98d1c79962 Mon Sep 17 00:00:00 2001 From: Jeremy Ramin Date: Sat, 22 Aug 2015 23:03:19 -0700 Subject: [PATCH 04/24] Adds deepDefaults to config Took at the deepExtend in the atom/underscore-plus repo and modified it to become a deepDefaults method. Using this instead to see if it fixes the failing specs. --- src/config.coffee | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/config.coffee b/src/config.coffee index 18b111471..15aa664bb 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -864,8 +864,8 @@ class Config defaultValue = _.valueForKeyPath(@defaultSettings, keyPath) if value? - defaultValue = @deepClone(defaultValue) - value = _.deepExtend(defaultValue, value) if isPlainObject(value) and isPlainObject(defaultValue) + value = @deepClone(value) + @deepDefaults(value, defaultValue) if isPlainObject(value) and isPlainObject(defaultValue) else value = @deepClone(defaultValue) @@ -928,6 +928,19 @@ class Config else object + deepDefaults: (target) -> + result = target + i = 0 + while ++i < arguments.length + object = arguments[i] + if isPlainObject(result) and isPlainObject(object) + for key in Object.keys(object) + result[key] = @deepDefaults(result[key], object[key]) + else + if not result? + result = @deepClone(object) + result + # `schema` will look something like this # # ```coffee From c292299516747bd4953c48ea68f8af4c5024bbba Mon Sep 17 00:00:00 2001 From: Jonathan Delgado Date: Sun, 23 Aug 2015 07:51:22 -0700 Subject: [PATCH 05/24] Changed setting disableInitialEmptyEditor to openEmptyEditorOnStart --- src/atom.coffee | 2 +- src/config-schema.coffee | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/atom.coffee b/src/atom.coffee index 3bba8ffca..297e0ce31 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -673,7 +673,7 @@ class Atom extends Model @windowEventHandler?.unsubscribe() openInitialEmptyEditorIfNecessary: -> - return if @config.get('core.disableInitialEmptyEditor') + return unless @config.get('core.openEmptyEditorOnStart') if @getLoadSettings().initialPaths?.length is 0 and @workspace.getPaneItems().length is 0 @workspace.open(null) diff --git a/src/config-schema.coffee b/src/config-schema.coffee index 2487f4c37..d8eeb6fe3 100644 --- a/src/config-schema.coffee +++ b/src/config-schema.coffee @@ -89,10 +89,10 @@ module.exports = 'windows1258', 'windows866' ] - disableInitialEmptyEditor: - description: 'Disable the initial empty editor when atom starts.' + openEmptyEditorOnStart: + description: 'Automatically opens an empty editor when atom starts.' type: 'boolean' - default: false + default: true editor: type: 'object' From 86dfb50becf41a64809b730318109f2e83614832 Mon Sep 17 00:00:00 2001 From: Jonathan Delgado Date: Sun, 23 Aug 2015 08:07:19 -0700 Subject: [PATCH 06/24] Added spec for openEmptyEditorOnStart --- .../fixtures/atom-home/config-openEmptyEditorOnStart.cson | 6 ++++++ spec/integration/startup-spec.coffee | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson diff --git a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson new file mode 100644 index 000000000..4d09f3deb --- /dev/null +++ b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson @@ -0,0 +1,6 @@ +"*": + welcome: + showOnStartup: false + "exception-reporting": + userId: "7c0a3c52-795c-5e20-5323-64efcf91f212" + openEmptyEditorOnStart: false \ No newline at end of file diff --git a/spec/integration/startup-spec.coffee b/spec/integration/startup-spec.coffee index d2583ed27..67f4dc0a8 100644 --- a/spec/integration/startup-spec.coffee +++ b/spec/integration/startup-spec.coffee @@ -196,6 +196,13 @@ describe "Starting Atom", -> , 5000) .waitForExist("atom-workspace") .waitForPaneItemCount(1, 5000) + + it "doesn't open a new window if openEmptyEditorOnStart is disabled", -> + fs.writeFileSync(path.join(atomHome, 'config.cson'), fs.readFileSync(path.join(__dirname, 'fixtures', 'atom-home', 'config-openEmptyEditorOnStart.cson'))) + runAtom [], {ATOM_HOME: atomHome}, (client) -> + client + .waitForExist("atom-workspace") + .waitForPaneItemCount(0, 5000) it "reopens any previously opened windows", -> runAtom [tempDirPath], {ATOM_HOME: atomHome}, (client) -> From e5d78860974c067ee5a4ef934ff5b9263f4c9369 Mon Sep 17 00:00:00 2001 From: Jonathan Delgado Date: Sun, 23 Aug 2015 08:09:09 -0700 Subject: [PATCH 07/24] Fix openEmptyEditorOnStart spec styling --- .../fixtures/atom-home/config-openEmptyEditorOnStart.cson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson index 4d09f3deb..cf86d6120 100644 --- a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson +++ b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson @@ -3,4 +3,4 @@ showOnStartup: false "exception-reporting": userId: "7c0a3c52-795c-5e20-5323-64efcf91f212" - openEmptyEditorOnStart: false \ No newline at end of file + openEmptyEditorOnStart: false From effd96f4bb692aa5551e315c5b548bdc27bdfb18 Mon Sep 17 00:00:00 2001 From: Jonathan Delgado Date: Mon, 24 Aug 2015 10:31:37 -0700 Subject: [PATCH 08/24] Fix openEmptyEditorOnStart fixture --- .../fixtures/atom-home/config-openEmptyEditorOnStart.cson | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson index cf86d6120..23ac98d08 100644 --- a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson +++ b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson @@ -3,4 +3,5 @@ showOnStartup: false "exception-reporting": userId: "7c0a3c52-795c-5e20-5323-64efcf91f212" - openEmptyEditorOnStart: false + core: + openEmptyEditorOnStart: false From 82a80cd732018de87e09df2e3b4897355e324f53 Mon Sep 17 00:00:00 2001 From: Jonathan Delgado Date: Mon, 24 Aug 2015 10:32:56 -0700 Subject: [PATCH 09/24] Fixed openEmptyEditorOnStart fixture tabs --- .../fixtures/atom-home/config-openEmptyEditorOnStart.cson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson index 23ac98d08..84ea0be11 100644 --- a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson +++ b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson @@ -3,5 +3,5 @@ showOnStartup: false "exception-reporting": userId: "7c0a3c52-795c-5e20-5323-64efcf91f212" - core: + core: openEmptyEditorOnStart: false From 1de707f2d7fe54ef772a796e60169b24ad866415 Mon Sep 17 00:00:00 2001 From: Jeremy Ramin Date: Mon, 24 Aug 2015 16:08:43 -0700 Subject: [PATCH 10/24] :white_check_mark: Add tests to config spec Add tests to check if the get command properly merges the stored values with the defined defaults in the schema. Two cases: - Obj has no property changes. - Obj has one or more changes to a property. --- spec/config-spec.coffee | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/spec/config-spec.coffee b/spec/config-spec.coffee index 3b7bd6061..23541bfb5 100644 --- a/spec/config-spec.coffee +++ b/spec/config-spec.coffee @@ -1110,6 +1110,24 @@ describe "Config", -> nestedObject: superNestedInt: 36 + expect(atom.config.get("foo")).toEqual { + bar: + anInt: 12 + anObject: + nestedInt: 24 + nestedObject: + superNestedInt: 36 + } + atom.config.set("foo.bar.anObject.nestedObject.superNestedInt", 37) + expect(atom.config.get("foo")).toEqual { + bar: + anInt: 12 + anObject: + nestedInt: 24 + nestedObject: + superNestedInt: 37 + } + it 'can set a non-object schema', -> schema = type: 'integer' From 43213766c915ce260b75fa6bdb615e8819b43587 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 24 Aug 2015 20:26:39 -0600 Subject: [PATCH 11/24] :arrow_up: line-ending-selector --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a4f0879d..3b0187c8a 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "image-view": "0.54.0", "incompatible-packages": "0.24.1", "keybinding-resolver": "0.33.0", - "line-ending-selector": "0.0.4", + "line-ending-selector": "0.0.5", "link": "0.30.0", "markdown-preview": "0.150.0", "metrics": "0.51.0", From bf20370f52326d097d218698fd26dc7c4cf80b13 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 25 Aug 2015 10:49:30 -0700 Subject: [PATCH 12/24] :arrow_up: text-buffer (pre-release) version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b0187c8a..86c2ef9a5 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "space-pen": "3.8.2", "stacktrace-parser": "0.1.1", "temp": "0.8.1", - "text-buffer": "6.6.1", + "text-buffer": "6.7.0-0", "theorist": "^1.0.2", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", From b8aec9db7c5578a29ceafa63c90ee65108a63432 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 25 Aug 2015 10:50:05 -0700 Subject: [PATCH 13/24] Fix display buffer spec for new historied marker behavior --- spec/display-buffer-spec.coffee | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee index 1b490d2ff..1331c2c0a 100644 --- a/spec/display-buffer-spec.coffee +++ b/spec/display-buffer-spec.coffee @@ -1025,7 +1025,7 @@ describe "DisplayBuffer", -> markerChangedHandler.reset() marker2ChangedHandler.reset() - marker3 = displayBuffer.markBufferRange([[8, 1], [8, 2]], maintainHistory: true) + marker3 = displayBuffer.markBufferRange([[8, 1], [8, 2]]) marker3.onDidChange marker3ChangedHandler = jasmine.createSpy("marker3ChangedHandler") onDisplayBufferChange = -> @@ -1039,10 +1039,6 @@ describe "DisplayBuffer", -> expect(marker.getHeadScreenPosition()).toEqual [5, 10] expect(marker.getTailScreenPosition()).toEqual [5, 4] - # but marker snapshots are not restored until the end of the undo. - expect(marker2.isValid()).toBeFalsy() - expect(marker3.isValid()).toBeFalsy() - buffer.undo() expect(changeHandler).toHaveBeenCalled() expect(markerChangedHandler).toHaveBeenCalled() @@ -1078,8 +1074,6 @@ describe "DisplayBuffer", -> expect(markerChangedHandler).toHaveBeenCalled() expect(marker2ChangedHandler).toHaveBeenCalled() expect(marker3ChangedHandler).toHaveBeenCalled() - expect(marker2.isValid()).toBeFalsy() - expect(marker3.isValid()).toBeTruthy() it "updates the position of markers before emitting change events that aren't caused by a buffer change", -> displayBuffer.onDidChange changeHandler = jasmine.createSpy("changeHandler").andCallFake -> From f57da0c6f806936eee335d75a62800338b2f7432 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 25 Aug 2015 10:51:45 -0700 Subject: [PATCH 14/24] Suppress merging selections during undo/redo Now, during undo/redo overlapping selections will be temporarily created as markers are created via snapshots. Old selections will immediately be destroyed though, since undo/redo now completely replace all historied markers w/ those in the snapshot, so there is no need to merge selections. --- spec/text-editor-spec.coffee | 57 ++++++++++++++++++++++++++++++++++++ src/text-editor.coffee | 7 +++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index 36dc9e739..291014a89 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -3417,6 +3417,63 @@ describe "TextEditor", -> expect(buffer.lineForRow(0)).not.toContain "foo" expect(buffer.lineForRow(0)).toContain "fovar" + it "restores cursors and selections to their states before and after undone and redone changes", -> + editor.setSelectedBufferRanges([ + [[0, 0], [0, 0]], + [[1, 0], [1, 3]], + ]) + editor.insertText("abc") + + expect(editor.getSelectedBufferRanges()).toEqual [ + [[0, 3], [0, 3]], + [[1, 3], [1, 3]] + ] + + editor.setCursorBufferPosition([0, 0]) + editor.setSelectedBufferRanges([ + [[2, 0], [2, 0]], + [[3, 0], [3, 0]], + [[4, 0], [4, 3]], + ]) + editor.insertText("def") + + expect(editor.getSelectedBufferRanges()).toEqual [ + [[2, 3], [2, 3]], + [[3, 3], [3, 3]] + [[4, 3], [4, 3]] + ] + + editor.setCursorBufferPosition([0, 0]) + editor.undo() + + expect(editor.getSelectedBufferRanges()).toEqual [ + [[2, 0], [2, 0]], + [[3, 0], [3, 0]], + [[4, 0], [4, 3]], + ] + + editor.undo() + + expect(editor.getSelectedBufferRanges()).toEqual [ + [[0, 0], [0, 0]], + [[1, 0], [1, 3]] + ] + + editor.redo() + + expect(editor.getSelectedBufferRanges()).toEqual [ + [[0, 3], [0, 3]], + [[1, 3], [1, 3]] + ] + + editor.redo() + + expect(editor.getSelectedBufferRanges()).toEqual [ + [[2, 3], [2, 3]], + [[3, 3], [3, 3]] + [[4, 3], [4, 3]] + ] + it "restores the selected ranges after undo and redo", -> editor.setSelectedBufferRanges([[[1, 6], [1, 10]], [[1, 22], [1, 27]]]) editor.delete() diff --git a/src/text-editor.coffee b/src/text-editor.coffee index e2b93a3b2..1e0c6f4d6 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -1119,12 +1119,12 @@ class TextEditor extends Model # Essential: Undo the last change. undo: -> - @buffer.undo() + @avoidMergingSelections => @buffer.undo() @getLastSelection().autoscroll() # Essential: Redo the last change. redo: -> - @buffer.redo(this) + @avoidMergingSelections => @buffer.redo() @getLastSelection().autoscroll() # Extended: Batch multiple operations as a single undo/redo step. @@ -2217,6 +2217,9 @@ class TextEditor extends Model previousSelection.intersectsScreenRowRange(screenRange.start.row, screenRange.end.row) + avoidMergingSelections: (args...) -> + @mergeSelections args..., -> false + mergeSelections: (args...) -> mergePredicate = args.pop() fn = args.pop() if _.isFunction(_.last(args)) From 4180c81706935f998fd39022804785efc8ebed63 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 25 Aug 2015 11:13:00 -0700 Subject: [PATCH 15/24] :arrow_up: text-buffer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 86c2ef9a5..46fda56c7 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "space-pen": "3.8.2", "stacktrace-parser": "0.1.1", "temp": "0.8.1", - "text-buffer": "6.7.0-0", + "text-buffer": "6.7.0", "theorist": "^1.0.2", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", From 3f49d9aa002e0d72fca610e2fe34fdffd6848e08 Mon Sep 17 00:00:00 2001 From: Thomas Johansen Date: Tue, 25 Aug 2015 21:44:34 +0200 Subject: [PATCH 16/24] :arrow_up: symbols-view@0.103.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 46fda56c7..9adda8823 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "spell-check": "0.59.0", "status-bar": "0.78.0", "styleguide": "0.44.0", - "symbols-view": "0.101.0", + "symbols-view": "0.103.0", "tabs": "0.82.0", "timecop": "0.31.0", "tree-view": "0.184.0", From 499f920638cc3ea60288bd3472dc9786b5440207 Mon Sep 17 00:00:00 2001 From: Thomas Johansen Date: Tue, 25 Aug 2015 21:45:33 +0200 Subject: [PATCH 17/24] Rename .ctags file to ctags-config in unpack list Necessary since the file was renamed in symbols-view@0.103.0. --- build/tasks/generate-asar-task.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tasks/generate-asar-task.coffee b/build/tasks/generate-asar-task.coffee index 800721fee..3d28f1cca 100644 --- a/build/tasks/generate-asar-task.coffee +++ b/build/tasks/generate-asar-task.coffee @@ -10,7 +10,7 @@ module.exports = (grunt) -> unpack = [ '*.node' - '.ctags' + 'ctags-config' 'ctags-darwin' 'ctags-linux' 'ctags-win32.exe' From b9ca563c3c987b9df93bb0bcb6e1629150f55897 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 25 Aug 2015 14:24:11 -0700 Subject: [PATCH 18/24] Don't use fixture file in openEmptyEditorOnStart spec --- .../atom-home/config-openEmptyEditorOnStart.cson | 7 ------- spec/integration/startup-spec.coffee | 9 +++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson diff --git a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson deleted file mode 100644 index 84ea0be11..000000000 --- a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson +++ /dev/null @@ -1,7 +0,0 @@ -"*": - welcome: - showOnStartup: false - "exception-reporting": - userId: "7c0a3c52-795c-5e20-5323-64efcf91f212" - core: - openEmptyEditorOnStart: false diff --git a/spec/integration/startup-spec.coffee b/spec/integration/startup-spec.coffee index 67f4dc0a8..87ecba409 100644 --- a/spec/integration/startup-spec.coffee +++ b/spec/integration/startup-spec.coffee @@ -10,6 +10,7 @@ fs = require "fs" path = require "path" temp = require("temp").track() runAtom = require "./helpers/start-atom" +CSON = require "season" describe "Starting Atom", -> [tempDirPath, otherTempDirPath, atomHome] = [] @@ -196,9 +197,13 @@ describe "Starting Atom", -> , 5000) .waitForExist("atom-workspace") .waitForPaneItemCount(1, 5000) - + it "doesn't open a new window if openEmptyEditorOnStart is disabled", -> - fs.writeFileSync(path.join(atomHome, 'config.cson'), fs.readFileSync(path.join(__dirname, 'fixtures', 'atom-home', 'config-openEmptyEditorOnStart.cson'))) + configPath = path.join(atomHome, 'config.cson') + config = CSON.readFileSync(configPath) + config['*'].core = {openEmptyEditorOnStart: false} + CSON.writeFileSync(configPath, config) + runAtom [], {ATOM_HOME: atomHome}, (client) -> client .waitForExist("atom-workspace") From a2a1f0c66049b70c1f796a95636feaf7765e207d Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 26 Aug 2015 13:40:07 +0900 Subject: [PATCH 19/24] :arrow_up: notifications@v0.59.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9adda8823..f0b48a855 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "link": "0.30.0", "markdown-preview": "0.150.0", "metrics": "0.51.0", - "notifications": "0.58.0", + "notifications": "0.59.0", "open-on-github": "0.38.0", "package-generator": "0.40.0", "release-notes": "0.53.0", From 28f157acd909cf263cd355159dc5156031fba91a Mon Sep 17 00:00:00 2001 From: Ross Allen Date: Mon, 24 Aug 2015 14:19:17 -0700 Subject: [PATCH 20/24] Document MenuItem `enabled` and `visible` The Electron MenuItem[1] `enabled` and `visible` options are exposed to Atom context menus in menu_helpers.coffee[2] but are not yet documented. Both options are passed through to Electron. [1] http://electron.atom.io/docs/v0.31.0/api/menu-item/ [2] https://github.com/atom/atom/blob/v1.0.7/src/menu-helpers.coffee#L49 --- src/context-menu-manager.coffee | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/context-menu-manager.coffee b/src/context-menu-manager.coffee index 73bcbf440..0258fedc7 100644 --- a/src/context-menu-manager.coffee +++ b/src/context-menu-manager.coffee @@ -86,9 +86,14 @@ class ContextMenuManager # * `label` (Optional) A {String} containing the menu item's label. # * `command` (Optional) A {String} containing the command to invoke on the # target of the right click that invoked the context menu. + # * `enabled` (Optional) A {Boolean} indicating whether the menu item + # should be clickable. Disabled menu items typically appear grayed out. + # Defaults to `true`. # * `submenu` (Optional) An {Array} of additional items. # * `type` (Optional) If you want to create a separator, provide an item # with `type: 'separator'` and no other keys. + # * `visible` (Optional) A {Boolean} indicating whether the menu item + # should appear in the menu. Defaults to `true`. # * `created` (Optional) A {Function} that is called on the item each time a # context menu is created via a right click. You can assign properties to # `this` to dynamically compute the command, label, etc. This method is From f602a6b726280c5d5c064abbbf950506936ecb01 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 26 Aug 2015 09:21:32 -0700 Subject: [PATCH 21/24] :arrow_up: event-kit Refs atom/event-kit#16 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0b48a855..ec61e6a9e 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "color": "^0.7.3", "delegato": "^1", "emissary": "^1.3.3", - "event-kit": "^1.2.0", + "event-kit": "^1.3.0", "first-mate": "^5.0.0", "fs-plus": "^2.8.0", "fstream": "0.1.24", From fb7c62fd0532f2f1ddd99e44e4a93457493289a9 Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Wed, 26 Aug 2015 12:51:15 -0400 Subject: [PATCH 22/24] :arrow_up: language-javascript@0.90.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ec61e6a9e..73122c03d 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "language-html": "0.41.0", "language-hyperlink": "0.14.0", "language-java": "0.16.0", - "language-javascript": "0.89.0", + "language-javascript": "0.90.0", "language-json": "0.16.0", "language-less": "0.28.2", "language-make": "0.17.0", From 0310ccb6e5983d7bfa8de40d6a3a8ddf55ee98a6 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 26 Aug 2015 12:35:18 -0700 Subject: [PATCH 23/24] :arrow_up: grunt-download-atom-shell Fixes https://github.com/atom/atom/issues/8525 --- build/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.json b/build/package.json index bd0c9a474..acca67b70 100644 --- a/build/package.json +++ b/build/package.json @@ -21,7 +21,7 @@ "grunt-contrib-csslint": "~0.2.0", "grunt-contrib-less": "~0.8.0", "grunt-cson": "0.14.0", - "grunt-download-atom-shell": "~0.14.0", + "grunt-download-atom-shell": "~0.15.0", "grunt-electron-installer": "^0.37.0", "grunt-lesslint": "0.17.0", "grunt-peg": "~1.1.0", From d5e4c01e0aed33e39111e144207ba87c3b769376 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 26 Aug 2015 13:21:02 -0700 Subject: [PATCH 24/24] :arrow_up: tree-view --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 73122c03d..b3e1b1e21 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "symbols-view": "0.103.0", "tabs": "0.82.0", "timecop": "0.31.0", - "tree-view": "0.184.0", + "tree-view": "0.185.0", "update-package-dependencies": "0.10.0", "welcome": "0.30.0", "whitespace": "0.30.0",