From 1dbab06fe333de6f8c3ee5761a735157d15025ea Mon Sep 17 00:00:00 2001 From: Machiste Quintana Date: Thu, 23 Apr 2015 18:16:29 -0400 Subject: [PATCH 01/18] Replace optimist with yargs --- package.json | 4 ++-- src/browser/main.coffee | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f94ea35a5..504eb05fa 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "mixto": "^1", "nslog": "^2.0.0", "oniguruma": "^4.1", - "optimist": "0.4.0", "pathwatcher": "^4.4", "property-accessors": "^1.1.3", "q": "^1.1.2", @@ -67,7 +66,8 @@ "text-buffer": "^5.2", "theorist": "^1.0.2", "typescript-simple": "1.0.0", - "underscore-plus": "^1.6.6" + "underscore-plus": "^1.6.6", + "yargs": "^3.7.2" }, "packageDependencies": { "atom-dark-syntax": "0.26.0", diff --git a/src/browser/main.coffee b/src/browser/main.coffee index 469d53fae..908501a1c 100644 --- a/src/browser/main.coffee +++ b/src/browser/main.coffee @@ -4,7 +4,7 @@ crashReporter = require 'crash-reporter' app = require 'app' fs = require 'fs-plus' path = require 'path' -optimist = require 'optimist' +yargs = require 'yargs' nslog = require 'nslog' console.log = nslog @@ -85,7 +85,7 @@ setupCoffeeCache = -> parseCommandLine = -> version = app.getVersion() - options = optimist(process.argv[1..]) + options = yargs(process.argv[1..]) options.usage """ Atom Editor v#{version} From b2613f94b4e5f9c18d24beedf17b0506955d74fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Machist=C3=A9=20N=2E=20Quintana?= Date: Wed, 29 Apr 2015 12:22:25 -0400 Subject: [PATCH 02/18] Update yargs semver version range --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 504eb05fa..42e39c463 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "theorist": "^1.0.2", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", - "yargs": "^3.7.2" + "yargs": ">=3.7.2 <4.0" }, "packageDependencies": { "atom-dark-syntax": "0.26.0", From 0db34d519296e6f2d6652b495cb2fe6f71f021bf Mon Sep 17 00:00:00 2001 From: Mostafa Eweda Date: Tue, 19 May 2015 10:35:07 -0700 Subject: [PATCH 03/18] Update language-php to 0.24.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c905f1d24..996f1d4e4 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "language-mustache": "0.11.0", "language-objective-c": "0.15.0", "language-perl": "0.24.0", - "language-php": "0.23.0", + "language-php": "0.24.0", "language-property-list": "0.8.0", "language-python": "0.35.0", "language-ruby": "0.54.0", From 622a18a6c56637be0e3785c192327ac4d8f0f03d Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 19 May 2015 13:16:38 -0700 Subject: [PATCH 04/18] :arrow_up: text-buffer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 996f1d4e4..d330a31e2 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "space-pen": "3.8.2", "stacktrace-parser": "0.1.1", "temp": "0.8.1", - "text-buffer": "6.0.0", + "text-buffer": "6.0.1", "theorist": "^1.0.2", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6" From 3ddc105d6ae1f8cfafb2e836780ed256b0d08325 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 19 May 2015 14:27:08 -0700 Subject: [PATCH 05/18] :arrow_up: keybinding-resolver@0.33 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d330a31e2..851dbf24b 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "grammar-selector": "0.47.0", "image-view": "0.54.0", "incompatible-packages": "0.24.0", - "keybinding-resolver": "0.32.0", + "keybinding-resolver": "0.33.0", "link": "0.30.0", "markdown-preview": "0.149.0", "metrics": "0.49.0", From 171fb275820e4ec72982043d29c4ee528359ec01 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Tue, 19 May 2015 14:54:14 -0700 Subject: [PATCH 06/18] :arrow_up: notifications@0.49.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 851dbf24b..67235d654 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "link": "0.30.0", "markdown-preview": "0.149.0", "metrics": "0.49.0", - "notifications": "0.48.0", + "notifications": "0.49.0", "open-on-github": "0.37.0", "package-generator": "0.39.0", "release-notes": "0.52.0", From a1cc35b270fb0890b6a61de46a63bfe91e996228 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 19 May 2015 15:18:20 -0700 Subject: [PATCH 07/18] Fix DisplayBuffer spec Marker updates now happen after all buffer changes --- spec/display-buffer-spec.coffee | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee index 23c4840bc..27a538464 100644 --- a/spec/display-buffer-spec.coffee +++ b/spec/display-buffer-spec.coffee @@ -1023,11 +1023,14 @@ describe "DisplayBuffer", -> expect(markerChangedHandler).not.toHaveBeenCalled() expect(marker2ChangedHandler).not.toHaveBeenCalled() expect(marker3ChangedHandler).not.toHaveBeenCalled() - # but still updates the markers + + # markers positions are updated based on the text change expect(marker.getScreenRange()).toEqual [[5, 4], [5, 10]] expect(marker.getHeadScreenPosition()).toEqual [5, 10] expect(marker.getTailScreenPosition()).toEqual [5, 4] - expect(marker2.isValid()).toBeTruthy() + + # but marker snapshots are not restored until the end of the undo. + expect(marker2.isValid()).toBeFalsy() expect(marker3.isValid()).toBeFalsy() buffer.undo() @@ -1035,6 +1038,8 @@ describe "DisplayBuffer", -> expect(markerChangedHandler).toHaveBeenCalled() expect(marker2ChangedHandler).toHaveBeenCalled() expect(marker3ChangedHandler).toHaveBeenCalled() + expect(marker2.isValid()).toBeTruthy() + expect(marker3.isValid()).toBeFalsy() # Redo change ---- @@ -1048,18 +1053,23 @@ describe "DisplayBuffer", -> expect(markerChangedHandler).not.toHaveBeenCalled() expect(marker2ChangedHandler).not.toHaveBeenCalled() expect(marker3ChangedHandler).not.toHaveBeenCalled() - # but still updates the markers + + # markers positions are updated based on the text change expect(marker.getScreenRange()).toEqual [[5, 7], [5, 13]] expect(marker.getHeadScreenPosition()).toEqual [5, 13] expect(marker.getTailScreenPosition()).toEqual [5, 7] + + # but marker snapshots are not restored until the end of the undo. expect(marker2.isValid()).toBeFalsy() - expect(marker3.isValid()).toBeTruthy() + expect(marker3.isValid()).toBeFalsy() buffer.redo() expect(changeHandler).toHaveBeenCalled() 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 e2f757ea01a7986a463839cf675811bc5adeb58b Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Tue, 19 May 2015 15:25:58 -0700 Subject: [PATCH 08/18] :arrow_up: settings-view@0.203.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67235d654..29192daf0 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "open-on-github": "0.37.0", "package-generator": "0.39.0", "release-notes": "0.52.0", - "settings-view": "0.202.0", + "settings-view": "0.203.0", "snippets": "0.89.0", "spell-check": "0.58.0", "status-bar": "0.72.0", From 23f2a6a58f8a7560cdcc65d4ed4f23bb6f8b4bf2 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 19 May 2015 15:51:45 -0700 Subject: [PATCH 09/18] Prepare 0.201 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 29192daf0..ff54ca11c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "0.200.0", + "version": "0.201.0", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From fcf7f77bf21e22f58783c6c74eb8bf11f96605a9 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Tue, 19 May 2015 16:35:52 -0700 Subject: [PATCH 10/18] :arrow_up: metrics@0.50.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff54ca11c..52411da96 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "keybinding-resolver": "0.33.0", "link": "0.30.0", "markdown-preview": "0.149.0", - "metrics": "0.49.0", + "metrics": "0.50.0", "notifications": "0.49.0", "open-on-github": "0.37.0", "package-generator": "0.39.0", From db920468abadf1599e245c5e59d88319942735c1 Mon Sep 17 00:00:00 2001 From: Machiste Quintana Date: Tue, 19 May 2015 19:38:37 -0400 Subject: [PATCH 11/18] Wrap CLI columns at 100 --- src/browser/main.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/main.coffee b/src/browser/main.coffee index 68b57a88e..1af0526dd 100644 --- a/src/browser/main.coffee +++ b/src/browser/main.coffee @@ -85,7 +85,7 @@ setupCoffeeCache = -> parseCommandLine = -> version = app.getVersion() - options = yargs(process.argv[1..]) + options = yargs(process.argv[1..]).wrap(100) options.usage """ Atom Editor v#{version} From f22daa42b535ee22fa87b3297d1ada62d4f24620 Mon Sep 17 00:00:00 2001 From: Machiste Quintana Date: Tue, 19 May 2015 19:40:31 -0400 Subject: [PATCH 12/18] :art: Update semver version range --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98d763eb9..c1fadae46 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "theorist": "^1.0.2", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", - "yargs": ">=3.7.2 <4.0" + "yargs": "^3.7.2" }, "packageDependencies": { "atom-dark-syntax": "0.27.0", From ba98013eebcbe590820a6159fabd98338ca4fc6a Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Tue, 19 May 2015 16:40:39 -0700 Subject: [PATCH 13/18] :arrow_up: language-gfm@0.76.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52411da96..fe27e5181 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "language-coffee-script": "0.40.0", "language-csharp": "0.5.0", "language-css": "0.29.0", - "language-gfm": "0.75.0", + "language-gfm": "0.76.0", "language-git": "0.10.0", "language-go": "0.26.0", "language-html": "0.37.0", From 2bfbb7619e1b52f1f9ae39ed59f61bc85d543333 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 19 May 2015 17:48:53 -0700 Subject: [PATCH 14/18] Fix bug w/ markers mutated inside of change listeners --- spec/display-buffer-spec.coffee | 15 +++++++++++++++ src/marker.coffee | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee index 27a538464..6389f8105 100644 --- a/spec/display-buffer-spec.coffee +++ b/spec/display-buffer-spec.coffee @@ -1085,6 +1085,21 @@ describe "DisplayBuffer", -> expect(changeHandler).toHaveBeenCalled() expect(markerChangedHandler).toHaveBeenCalled() + it "emits the correct events when markers are mutated inside event listeners", -> + marker.onDidChange -> + if marker.getHeadScreenPosition().isEqual([5, 9]) + marker.setHeadScreenPosition([5, 8]) + + marker.setHeadScreenPosition([5, 9]) + + headChanges = for [event] in markerChangedHandler.argsForCall + {old: event.oldHeadScreenPosition, new: event.newHeadScreenPosition} + + expect(headChanges).toEqual [ + {old: [5, 10], new: [5, 9]} + {old: [5, 9], new: [5, 8]} + ] + describe "::findMarkers(attributes)", -> it "allows the startBufferRow and endBufferRow to be specified", -> marker1 = displayBuffer.markBufferRange([[0, 0], [3, 0]], class: 'a') diff --git a/src/marker.coffee b/src/marker.coffee index 942e25606..a0d8bda00 100644 --- a/src/marker.coffee +++ b/src/marker.coffee @@ -346,15 +346,15 @@ class Marker isValid } - @emit 'changed', changeEvent if Grim.includeDeprecatedAPIs - @emitter.emit 'did-change', changeEvent - @oldHeadBufferPosition = newHeadBufferPosition @oldHeadScreenPosition = newHeadScreenPosition @oldTailBufferPosition = newTailBufferPosition @oldTailScreenPosition = newTailScreenPosition @wasValid = isValid + @emit 'changed', changeEvent if Grim.includeDeprecatedAPIs + @emitter.emit 'did-change', changeEvent + getPixelRange: -> @displayBuffer.pixelRangeForScreenRange(@getScreenRange(), false) From 98dc253541680935745aa646317ce45af7961f92 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 19 May 2015 18:44:49 -0700 Subject: [PATCH 15/18] :arrow_up: apm@0.168 --- apm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm/package.json b/apm/package.json index 1dce7e90b..64f937169 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "0.167.0" + "atom-package-manager": "0.168.0" } } From 526055cd70fa8ea58ab5657a402c0e1cd5c2820d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 19 May 2015 18:47:55 -0700 Subject: [PATCH 16/18] :arrow_up: yargs@3.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b2da54fc2..ae6f06540 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "theorist": "^1.0.2", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", - "yargs": "^3.7.2" + "yargs": "^3.9" }, "packageDependencies": { "atom-dark-syntax": "0.27.0", From cf893225c4a10080ceb80af184069e40d431265f Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 19 May 2015 19:33:34 -0700 Subject: [PATCH 17/18] :arrow_up: text-buffer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ae6f06540..154141443 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "space-pen": "3.8.2", "stacktrace-parser": "0.1.1", "temp": "0.8.1", - "text-buffer": "6.0.1", + "text-buffer": "6.0.2", "theorist": "^1.0.2", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", From 5ae0ae7f83dcdf7da8dde101d30930f8d9083c89 Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 20 May 2015 21:42:34 +0900 Subject: [PATCH 18/18] :arrow_up: deprecation-cop@v0.51.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 154141443..56d263a50 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "bookmarks": "0.35.0", "bracket-matcher": "0.74.0", "command-palette": "0.36.0", - "deprecation-cop": "0.50.0", + "deprecation-cop": "0.51.0", "dev-live-reload": "0.46.0", "encoding-selector": "0.20.0", "exception-reporting": "0.24.0",