From f26110a81b5424f8bcf7c88bc8c3e9e7750130fd Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Fri, 1 Nov 2013 15:02:59 -0700 Subject: [PATCH 01/17] Remove empty collaboration menu --- menus/base.cson | 5 ----- 1 file changed, 5 deletions(-) diff --git a/menus/base.cson b/menus/base.cson index cbe8769de..3ce0c3438 100644 --- a/menus/base.cson +++ b/menus/base.cson @@ -154,11 +154,6 @@ ] } - { - label: 'Collaboration' - submenu: [] - } - { label: 'Packages' submenu: [] From e70f87dfc76f8a7e7938b209e9900836e54e1110 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 1 Nov 2013 16:39:06 -0600 Subject: [PATCH 02/17] Upgrade to telepath 0.20.0 so simple selection changes aren't undone This version of telepath adds an `undo: 'combine'` option which becomes the default for marker changes. With an undo strategy of 'combine', the operation is only undone when combined in a transaction with other operations that are undone. This prevents simple marker updates from getting pushed to the undo stack. --- package.json | 2 +- src/editor.coffee | 4 ++-- src/selection.coffee | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a1dbf08d0..06159c52f 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "season": "0.14.0", "semver": "1.1.4", "space-pen": "2.0.0", - "telepath": "0.19.0", + "telepath": "0.20.0", "temp": "0.5.0", "underscore-plus": "0.2.0" }, diff --git a/src/editor.coffee b/src/editor.coffee index a422d8a77..e657781dc 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -720,9 +720,9 @@ class Editor extends View selectedText = @getSelectedText() @hiddenInput.css('width', '100%') @hiddenInput.on 'compositionupdate', (e) => - @insertText(e.originalEvent.data, {select: true, skipUndo: true}) + @insertText(e.originalEvent.data, {select: true, undo: 'skip'}) @hiddenInput.on 'compositionend', => - @insertText(selectedText, {select: true, skipUndo: true}) + @insertText(selectedText, {select: true, undo: 'skip'}) @hiddenInput.css('width', '1px') lastInput = '' diff --git a/src/selection.coffee b/src/selection.coffee index 483f9d32f..f0103e164 100644 --- a/src/selection.coffee +++ b/src/selection.coffee @@ -1,5 +1,6 @@ {Range} = require 'telepath' {Emitter} = require 'emissary' +{pick} = require 'underscore' # Public: Represents a selection in the {EditSession}. module.exports = @@ -297,8 +298,8 @@ class Selection # + autoDecreaseIndent: # if `true`, decreases indent level appropriately (for example, when a # closing bracket is inserted) - # + skipUndo: - # if `true`, skips the undo stack for this operation. + # + undo: + # if `skip`, skips the undo stack for this operation. insertText: (text, options={}) -> oldBufferRange = @getBufferRange() @editSession.destroyFoldsContainingBufferRow(oldBufferRange.end.row) @@ -309,7 +310,7 @@ class Selection if options.indentBasis? and not options.autoIndent text = @normalizeIndents(text, options.indentBasis) - newBufferRange = @editSession.buffer.change(oldBufferRange, text, skipUndo: options.skipUndo) + newBufferRange = @editSession.buffer.change(oldBufferRange, text, pick(options, 'undo')) if options.select @setBufferRange(newBufferRange, isReversed: wasReversed) else From 3b52a6a0407b8485c1674ecbba344dbb44cb0434 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 15:50:38 -0700 Subject: [PATCH 03/17] Use underscore-plus --- src/selection.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selection.coffee b/src/selection.coffee index f0103e164..22223aa03 100644 --- a/src/selection.coffee +++ b/src/selection.coffee @@ -1,6 +1,6 @@ {Range} = require 'telepath' {Emitter} = require 'emissary' -{pick} = require 'underscore' +{pick} = require 'underscore-plus' # Public: Represents a selection in the {EditSession}. module.exports = From 621058aa9ee833863be89d6910686551f1cb55ec Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 15:51:27 -0700 Subject: [PATCH 04/17] Register copied edit sessions on the project Without this any split edit sessions won't be passed to package listeners that register using project.eachEditSession() Closes #1065 --- spec/project-spec.coffee | 16 ++++++++++++++++ src/edit-session.coffee | 1 + 2 files changed, 17 insertions(+) diff --git a/spec/project-spec.coffee b/spec/project-spec.coffee index b12d8683e..fc48ca191 100644 --- a/spec/project-spec.coffee +++ b/spec/project-spec.coffee @@ -62,6 +62,22 @@ describe "Project", -> expect(project.getEditSessions()[0]).toBe editSession1 expect(project.getEditSessions()[1]).toBe editSession2 + describe "when an edit session is copied", -> + it "emits an 'edit-session-created' event and stores the edit session", -> + handler = jasmine.createSpy('editSessionCreatedHandler') + project.on 'edit-session-created', handler + + editSession1 = project.openSync("a") + expect(handler.callCount).toBe 1 + expect(project.getEditSessions().length).toBe 1 + expect(project.getEditSessions()[0]).toBe editSession1 + + editSession2 = editSession1.copy() + expect(handler.callCount).toBe 2 + expect(project.getEditSessions().length).toBe 2 + expect(project.getEditSessions()[0]).toBe editSession1 + expect(project.getEditSessions()[1]).toBe editSession2 + describe ".openSync(path)", -> [fooOpener, barOpener, absolutePath, newBufferHandler, newEditSessionHandler] = [] beforeEach -> diff --git a/src/edit-session.coffee b/src/edit-session.coffee index a23427ce2..2cc8397e2 100644 --- a/src/edit-session.coffee +++ b/src/edit-session.coffee @@ -162,6 +162,7 @@ class EditSession newEditSession.setScrollLeft(@getScrollLeft()) for marker in @findMarkers(editSessionId: @id) marker.copy(editSessionId: newEditSession.id, preserveFolds: true) + project.addEditSession(newEditSession) newEditSession # Public: Retrieves the filename of the open file. From 05867bc889fec6422517627fce1160efa2cf3fa8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 16:27:44 -0700 Subject: [PATCH 05/17] Default error code to 1 Apparently not all errors passed to the callback have a code so default it to zero when missing. The 'stdout maxBuffer exceeded.' is once such error that has no code. --- script/utils/child-process-wrapper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/utils/child-process-wrapper.js b/script/utils/child-process-wrapper.js index c31f80b10..e7b0df6c1 100644 --- a/script/utils/child-process-wrapper.js +++ b/script/utils/child-process-wrapper.js @@ -9,7 +9,7 @@ exports.safeExec = function(command, options, callback) { } var child = childProcess.exec(command, options, function(error, stdout, stderr) { if (error) - process.exit(error.code); + process.exit(error.code || 1); else callback(null); }); From 875e9c886c179d26bc0c7c106fee230d132eadd4 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 16:33:50 -0700 Subject: [PATCH 06/17] Increase max buffer to 1MB --- script/utils/child-process-wrapper.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/script/utils/child-process-wrapper.js b/script/utils/child-process-wrapper.js index e7b0df6c1..7a401af8e 100644 --- a/script/utils/child-process-wrapper.js +++ b/script/utils/child-process-wrapper.js @@ -7,6 +7,13 @@ exports.safeExec = function(command, options, callback) { callback = options; options = {}; } + if (!options) + options = {}; + + // This needed to be increase for `apm test` runs that generate tons of failures + // The default is 200KB. + options.maxBuffer = 1024 * 1024; + var child = childProcess.exec(command, options, function(error, stdout, stderr) { if (error) process.exit(error.code || 1); From c9db0f14edea5e20f29d83cace08cc0d11607483 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 16:42:50 -0700 Subject: [PATCH 07/17] Disable colored output in script/cibuild --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index 39082cb5e..8ca3bf46a 100755 --- a/script/cibuild +++ b/script/cibuild @@ -32,7 +32,7 @@ cp.safeExec.bind(global, 'node script/bootstrap', function(error) { async.series([ require('rimraf').bind(global, path.join(homeDir, '.atom')), cp.safeExec.bind(global, 'git clean -dff'), - cp.safeExec.bind(global, 'node node_modules/atom-package-manager/bin/apm clean'), + cp.safeExec.bind(global, 'node node_modules/atom-package-manager/bin/apm clean --no-color'), cp.safeExec.bind(global, 'node node_modules/grunt-cli/bin/grunt ci --stack --no-color'), ], function(error) { process.exit(error ? 1 : 0); From 0c87f0edf8cf7afad1f73ae0a6eeb0a203a8337d Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 1 Nov 2013 17:49:16 -0600 Subject: [PATCH 08/17] Make ctrl-Z/ctrl-y invoke 'core:redo' instead of 'corey:redo' --- keymaps/default.cson | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keymaps/default.cson b/keymaps/default.cson index de0c1362b..1b1b24051 100644 --- a/keymaps/default.cson +++ b/keymaps/default.cson @@ -43,8 +43,8 @@ 'meta-w': 'core:close' 'meta-ctrl-f': 'window:toggle-full-screen' 'meta-z': 'core:undo' - 'meta-Z': 'corey:redo' - 'meta-y': 'corey:redo' + 'meta-Z': 'core:redo' + 'meta-y': 'core:redo' 'meta-x': 'core:cut' 'meta-c': 'core:copy' 'meta-v': 'core:paste' From 13c374845fe9f02a35633c6c3f7c3ebd9bd1daa0 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 16:53:53 -0700 Subject: [PATCH 09/17] Upgrade to bracket-matcher@0.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06159c52f..65b2f092e 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "autoflow": "0.5.0", "autosave": "0.6.0", "bookmarks": "0.10.0", - "bracket-matcher": "0.8.0", + "bracket-matcher": "0.9.0", "command-logger": "0.6.0", "command-palette": "0.7.0", "dev-live-reload": "0.13.0", From 0eb4704f5ef1edc9766314b1a9fcc22f3826f3de Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 17:15:32 -0700 Subject: [PATCH 10/17] Remove empty CHANGELOG --- CHANGELOG.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index e69de29bb..000000000 From 9482e9b3979ae5b658fb643ae85414ceded4fcda Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 17:22:47 -0700 Subject: [PATCH 11/17] Upgrade to package-generator@0.15.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65b2f092e..45962b765 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "link": "0.7.0", "markdown-preview": "0.15.0", "metrics": "0.8.0", - "package-generator": "0.14.0", + "package-generator": "0.15.0", "release-notes": "0.11.0", "settings-view": "0.37.0", "snippets": "0.13.0", From 4c5fdbce933e716db813272cde7839f16f1a0853 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 17:29:36 -0700 Subject: [PATCH 12/17] Upgrade to package-generator@0.16.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 45962b765..03855477d 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "link": "0.7.0", "markdown-preview": "0.15.0", "metrics": "0.8.0", - "package-generator": "0.15.0", + "package-generator": "0.16.0", "release-notes": "0.11.0", "settings-view": "0.37.0", "snippets": "0.13.0", From f05eb671252274950d5604aab6f9c31bd7aad10d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 1 Nov 2013 17:34:52 -0700 Subject: [PATCH 13/17] Upgrade to package-generator@0.17.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03855477d..12c501349 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "link": "0.7.0", "markdown-preview": "0.15.0", "metrics": "0.8.0", - "package-generator": "0.16.0", + "package-generator": "0.17.0", "release-notes": "0.11.0", "settings-view": "0.37.0", "snippets": "0.13.0", From 2333b53d0539c809d7558576be06a087fb728ed9 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Sat, 2 Nov 2013 17:27:00 +0800 Subject: [PATCH 14/17] Update to atom-shell v0.6.7. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 12c501349..8aa5b4262 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "bugs": { "url": "https://github.com/atom/atom/issues" }, - "atomShellVersion": "0.6.6", + "atomShellVersion": "0.6.7", "dependencies": { "async": "0.2.6", "bootstrap": "git://github.com/twbs/bootstrap.git#v3.0.0", From 8443db6630b62c60cb6040067f30a6d951405221 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Sat, 2 Nov 2013 19:00:18 -0700 Subject: [PATCH 15/17] Upgrade to language-coffee-script@0.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8aa5b4262..b3f9b2613 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "language-c": "0.2.0", "language-clojure": "0.1.0", - "language-coffee-script": "0.1.0", + "language-coffee-script": "0.2.0", "language-css": "0.2.0", "language-gfm": "0.8.0", "language-git": "0.2.0", From b0da17701b725ba500af2d74a174fb02e3bb6fc9 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Sat, 2 Nov 2013 19:29:47 -0700 Subject: [PATCH 16/17] Run apm clean during bootstrap Closes #905 --- script/bootstrap | 1 + script/cibuild | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 609a7305c..ec14cfa49 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -24,6 +24,7 @@ var commands = [ joinCommands('cd vendor/apm', 'npm install --silent .'), 'npm install --silent vendor/apm', echoNewLine, + 'node node_modules/atom-package-manager/bin/apm clean', 'node node_modules/atom-package-manager/bin/apm install --silent', ]; diff --git a/script/cibuild b/script/cibuild index 8ca3bf46a..c83d01c45 100755 --- a/script/cibuild +++ b/script/cibuild @@ -32,7 +32,6 @@ cp.safeExec.bind(global, 'node script/bootstrap', function(error) { async.series([ require('rimraf').bind(global, path.join(homeDir, '.atom')), cp.safeExec.bind(global, 'git clean -dff'), - cp.safeExec.bind(global, 'node node_modules/atom-package-manager/bin/apm clean --no-color'), cp.safeExec.bind(global, 'node node_modules/grunt-cli/bin/grunt ci --stack --no-color'), ], function(error) { process.exit(error ? 1 : 0); From 3d99e580b9b727d68118b972656d7c88dff72d09 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 4 Nov 2013 14:30:38 -0800 Subject: [PATCH 17/17] Upgrade to tabs@0.6.0 and atom-light-ui@0.6.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b3f9b2613..a23576549 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "unzip": "~0.1.9" }, "packageDependencies" : { - "atom-light-ui": "0.5.0", + "atom-light-ui": "0.6.0", "atom-light-syntax": "0.5.0", "atom-dark-ui": "0.5.0", "atom-dark-syntax": "0.5.0", @@ -99,7 +99,7 @@ "status-bar": "0.15.1", "styleguide": "0.9.0", "symbols-view": "0.18.0", - "tabs": "0.7.2", + "tabs": "0.8.0", "terminal": "0.15.0", "timecop": "0.9.0", "to-the-hubs": "0.8.0",