Commit Graph

14170 Commits

Author SHA1 Message Date
joshaber
08513e2f6e Merge branch 'master' into less-disk-io 2016-03-28 14:54:06 -04:00
Antonio Scandurra
584cf41901 Merge pull request #11251 from atom/as-fallback-to-storage-folder
Fallback to ~/.atom/storage when no state is found in IndexedDb
2016-03-28 20:29:34 +02:00
joshaber
414a424ae8 Merge branch 'master' into remove-old-git-status 2016-03-28 10:44:28 -04:00
Antonio Scandurra
ae277c685f Merge branch 'master' into as-fallback-to-storage-folder 2016-03-28 15:50:14 +02:00
Lee Dohm
5fc111a104 📝 Add standard global notation 2016-03-26 15:50:07 -07:00
joshaber
fdebbf12ac If we're been destroyed then we won't have an async anymore. 2016-03-25 17:14:09 -04:00
joshaber
8ee1c3274b Always update the cached status path. 2016-03-25 17:13:06 -04:00
joshaber
fff1e8f3d1 Cache the results of calling getPathStatus so we're consistent across calls. 2016-03-25 15:36:44 -04:00
joshaber
f001c83263 Bring back some synchronous event emitting.
Preserve the previous behavior of emitting synchronously with observed
change.
2016-03-25 15:26:18 -04:00
joshaber
380df72808 All emissions will propagate out from the async layer. 2016-03-25 15:15:24 -04:00
joshaber
c9ff5db064 Don't update status anymore in the sync layer. 2016-03-25 15:15:10 -04:00
joshaber
4ecc6aac90 Grab the branch from the async layer. 2016-03-25 15:14:32 -04:00
joshaber
3aae2054f7 Grab status from the underlying async layer. 2016-03-25 15:14:12 -04:00
joshaber
2f58c40472 Pass subscriptions through to the async layer. 2016-03-25 15:12:06 -04:00
joshaber
952f4aae0e Revert "Skip the first reload event."
This reverts commit 7294b95b70.
2016-03-25 14:33:43 -04:00
joshaber
aee053dc10 Whoops. Bring back pathIsIgnored. 2016-03-25 12:46:49 -04:00
joshaber
b2b8370166 Merge branch 'master' into less-disk-io 2016-03-25 10:49:26 -04:00
joshaber
7294b95b70 Skip the first reload event. 2016-03-25 10:49:22 -04:00
joshaber
694d288e16 Cache the workdir and path. 2016-03-25 10:31:13 -04:00
Mark H. Wilkinson
e0f41d1af4 Fix typo in error message. 2016-03-25 00:05:10 +00:00
Damien Guard
8b8e81efce Merge pull request #10862 from PaulAik/master
Fix for Default Directory Provider incorrectly identifying file paths as URLs on Windows
2016-03-23 15:45:15 -07:00
Antonio Scandurra
f69c5bdee4 Oops. 2016-03-23 12:11:27 +01:00
Antonio Scandurra
25a4c4c293 Clear StorageFolder when --clear-window-state is supplied 2016-03-23 10:53:37 +01:00
Antonio Scandurra
80146ae631 Assign the supplied configDirPath to an instance variable 2016-03-23 10:52:34 +01:00
Antonio Scandurra
c2242e46c2 Read state from StorageFolder when it can’t be found in StateStore 2016-03-23 10:31:26 +01:00
Antonio Scandurra
137af38798 Add back screen row to block decorations nodes 2016-03-22 14:08:25 +01:00
Antonio Scandurra
cf22334455 Add invisible class to invisible block decorations 2016-03-22 11:50:54 +01:00
Antonio Scandurra
34f9ad8710 Add top/bottom ruler before/after a block decoration 2016-03-22 11:20:55 +01:00
Michelle Tilley
64308bbacb Revert "Revert "Allow pasting white space when autoIndentOnPaste is enabled""
This reverts commit 5c03894227.
2016-03-21 16:27:48 -07:00
Michelle Tilley
5c03894227 Revert "Allow pasting white space when autoIndentOnPaste is enabled"
This reverts commit 0088053de4.
2016-03-20 22:22:33 -07:00
Michael Bolin
bb8f114dcb Remove an unnecessary call to then().
I see that this file has a little use of async/await and many uses of `then()`.
Things would be much less verbose and much more linear if async/await were used throughout.
Would Atom be open to a PR that changes this?

For bonus points, we could also replace `'use babel'` with `/* @flow */` at the top of the file :)
2016-03-18 09:56:33 -07:00
joshaber
15b13e3ddc Note the changes to GitRepository. 2016-03-15 10:49:36 -04:00
joshaber
8f9ab771a7 Revert "Match GitRepository's responses to null paths."
This reverts commit 50f8f8e7e9.
2016-03-15 10:44:00 -04:00
joshaber
34698d5768 Revert "And again."
This reverts commit a2a6ed05c5.
2016-03-15 10:43:57 -04:00
joshaber
a2a6ed05c5 And again. 2016-03-14 16:40:55 -04:00
joshaber
50f8f8e7e9 Match GitRepository's responses to null paths.
Fixes https://github.com/atom/git-diff/issues/93.
2016-03-14 16:28:36 -04:00
Josh Abernathy
2b5a540a91 Merge pull request #11162 from atom/pr/10930
BufferedProcess: search only new data for new lines rather than entire buffer, take 2
2016-03-14 15:59:23 -04:00
joshaber
d1c8fff86c Pull line length out into its own variable. 2016-03-14 13:42:05 -04:00
joshaber
2a2e22a759 Merge branch 'master' into pr/10930 2016-03-14 13:34:03 -04:00
Lee Dohm
ed744c12a9 Move location of call to environmentHelpers.normalize 2016-03-14 08:43:16 -07:00
Lee Dohm
430a0e049a Merge pull request #11054 from atom/ld-osx-environment
Patch Environment On OSX And Allow A Different Environment Per Window
2016-03-11 20:25:19 -08:00
Lee Dohm
63ec054161 Rename environment -> environmentHelpers 2016-03-11 16:51:50 -08:00
Nathan Sobo
2ad2f161fa Merge pull request #11078 from wvanlint/opt_in_registration
Add TextEditors to the registry only when opting in
2016-03-11 15:37:07 -07:00
Michelle Tilley
e4ab2c9b6a Merge branch 'ku-load-git-packages' 2016-03-11 10:25:51 -08:00
Willem Van Lint
466e554ee1 Add TextEditors to the registry on opt-in only 2016-03-10 22:51:51 -08:00
Michelle Tilley
383174d380 Load apm path from config
Signed-off-by: Katrina Uychaco <kuychaco@github.com>
2016-03-10 21:28:40 -08:00
Joe Fitzgerald
87c20bd095 Remove Cruft 2016-03-10 15:46:25 -07:00
Joe Fitzgerald
6b38049b8d Remove Project API, Work With process.env Directly
- Convert environment.coffee and environment-spec.coffee to JavaScript
- Pass the process's environment across the wire when launching atom multiple times from the command line
2016-03-10 15:30:04 -07:00
Lee Dohm
b98388fa76 Fix broken command parameter 2016-03-10 15:27:38 -07:00
Lee Dohm
a3ba15c8a1 Update Project to use new environment module 2016-03-10 15:27:38 -07:00