Commit Graph

28423 Commits

Author SHA1 Message Date
Max Brunsfeld
3827b19da4 Merge pull request #9687 from atom/mb-deprecate-load-time-package-code
Provide package.json fields so we can defer requiring packages' main modules
2015-11-30 15:53:37 -08:00
joshaber
8697bdaf67 1.3.0-beta7 2015-11-30 17:11:13 -05:00
Josh Abernathy
d34fec20d0 Merge pull request #9729 from atom/upload-to-s3
Upload releases to s3
2015-11-30 16:01:25 -05:00
Josh Abernathy
7a8e43673a Merge pull request #9729 from atom/upload-to-s3
Upload releases to s3
2015-11-30 16:00:30 -05:00
Nathan Sobo
c0bc38aabf Merge pull request #9878 from atom/ns-mb-fix-prepare-stack-trace-recursion
Avoid infinite recursion in Error.prepareStackTrace
2015-11-30 12:32:06 -08:00
Nathan Sobo
f139992585 Avoid infinite recursion in Error.prepareStackTrace
Previously, prepareStackTraceWithStackAssignment could end up calling
itself when third-party code assigned Error.prepareStackTrace back
to its original value. Now, we short-circuit this process if the
rawStack property has already been assigned.

Signed-off-by: Max Brunsfeld <maxbrunsfeld@github.com>
2015-11-30 10:51:21 -08:00
Max Brunsfeld
a36fc301f9 Merge branch 'master' into mb-deprecate-load-time-package-code 2015-11-30 10:51:14 -08:00
Max Brunsfeld
228e67838c Suppress false coffeelint error 2015-11-30 10:51:03 -08:00
joshaber
6cd31f94e9 Use logError instead of console.log. 2015-11-30 13:21:25 -05:00
Max Brunsfeld
d058814957 Merge remote-tracking branch 'origin/master' into mb-deprecate-load-time-package-code
Conflicts:
	package.json
2015-11-30 10:20:31 -08:00
Max Brunsfeld
a2f14685fc ⬆️ autocomplete-snippets 2015-11-30 10:15:16 -08:00
joshaber
d223e07389 Revert "Revert "Revert "REVERT ME: Hacks on hacks on hacks to test."""
This reverts commit 1340597c5f.
2015-11-30 12:27:09 -05:00
joshaber
9fabac6fde Revert "REVERT ME: Tests gonna test"
This reverts commit 1fd7267f10.
2015-11-30 12:27:05 -05:00
joshaber
e1aa23b92d Const and comparison fixes.
h/t @YuriSolovyov
2015-11-30 11:47:06 -05:00
joshaber
3a06953820 Merge branch 'master' into dh-async-repo 2015-11-30 11:44:20 -05:00
joshaber
1fd7267f10 REVERT ME: Tests gonna test 2015-11-30 11:34:08 -05:00
joshaber
1340597c5f Revert "Revert "REVERT ME: Hacks on hacks on hacks to test.""
This reverts commit 233e6e4781.
2015-11-30 11:09:45 -05:00
joshaber
2d9517ab67 Merge branch 'master' into upload-to-s3 2015-11-30 10:16:59 -05:00
joshaber
9bd81d00e9 Don't use a zero max age anymore. 2015-11-30 10:16:13 -05:00
Antonio Scandurra
da1fd69a1f Start implementing BlockDecorationsComponent 2015-11-30 15:48:09 +01:00
Antonio Scandurra
526a97562e Include block decorations as a separate object on presenter's state 2015-11-30 15:05:15 +01:00
Antonio Scandurra
8a54a2c15b Use a boolean in each line state object 2015-11-30 14:44:58 +01:00
Antonio Scandurra
539a5b0ae7 🐎 Do as little pixel conversion as possible
We desperately need a tree-based data structure. 😢
2015-11-30 14:34:16 +01:00
Antonio Scandurra
b998e7f2d9 🐎 Incremental updates for block decorations 2015-11-30 14:03:45 +01:00
Antonio Scandurra
0419fb16a0 🎨 Improve names a bit 2015-11-30 10:19:53 +01:00
Antonio Scandurra
ef851a822c 🎨 Move block decoration related stuff into its own presenter 2015-11-30 10:12:44 +01:00
Wliu
d23a285384 ⬆️ language-coffee-script@0.46.0 2015-11-29 11:03:59 -05:00
Wliu
8e6c8b02bb Switch back to ipc-main in atom-portable.coffee 2015-11-27 13:20:22 -05:00
Wliu
e36cf63500 ⬆️ electron@0.35.2 2015-11-27 11:10:31 -05:00
Wliu
936c17e550 Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35
# Conflicts:
#	package.json
2015-11-27 11:10:14 -05:00
Antonio Scandurra
0159d5c31e 🎨 2015-11-27 16:58:08 +01:00
Antonio Scandurra
6ad21307cc Provide blockDecorationsHeight for each line number 2015-11-27 16:27:01 +01:00
Antonio Scandurra
6365c86992 Include blockDecorations inside each line's state 2015-11-27 14:32:01 +01:00
Antonio Scandurra
6611cf8353 Force cursor to be tall as ::lineHeight 2015-11-27 14:05:05 +01:00
Antonio Scandurra
587f862612 Use LinesYardstick consistently 2015-11-27 12:55:09 +01:00
Antonio Scandurra
e1e06580c1 Move position conversion in LinesYardstick 2015-11-27 12:47:47 +01:00
Antonio Scandurra
1a8d7b486d Remove caching by screen rows
Because we cannot use them as a cache key, because markers' position can change
at any time. Performance-wise this is slow with many markers, as we need to do a
lot of buffer-to-screen conversions.
2015-11-27 12:29:14 +01:00
Antonio Scandurra
0b5638f749 Make sure tile positions are computed correctly 2015-11-27 10:47:25 +01:00
Antonio Scandurra
6e2587bc8c 🐎 Cache screen row height
I am trying to defer the usage of fancy algorithms as much as possible. The
current one is linear and should probably be changed, but it performs quite
decently for the time being. Maybe with some more caching we could even avoid to
implement a tree data structure?
2015-11-27 10:30:44 +01:00
Antonio Scandurra
a9cb1bda8d Use ::positionForRow in ::updateTilesState
The algorithm is still super sloooow 🐌, but we'll fix that in a later
commit.
2015-11-27 10:16:38 +01:00
Antonio Scandurra
1b5fd18630 Use ::rowForPosition and ::positionForRow instead of simple math 2015-11-27 09:54:14 +01:00
simurai
f2155fa224 ⬆️ settings-view@v0.232.1 2015-11-27 15:16:02 +09:00
Wliu
5ae2a4a7fc ⬆️ language-javascript@0.102.2 2015-11-26 11:13:26 -05:00
Wliu
237d80fd2c ⬆️ language-c@0.50.1 2015-11-26 11:13:10 -05:00
Antonio Scandurra
02651b7a58 🎨 Rename to ::setBlockDecorationDimensions 2015-11-26 16:10:08 +01:00
Antonio Scandurra
5ac7ffcf48 🎨 Rename to ::blockDecorationsDimensionsById 2015-11-26 16:09:21 +01:00
Antonio Scandurra
96863eef1c Ensure content scrollHeight takes block decorations into account
Seems like all these properties in the presenter's state share a common
contract, which we should probably extract. It could also mean there's an
underlying design problem, because we are testing two dimensions of the same
behavior in a single spec.
2015-11-26 15:44:59 +01:00
Antonio Scandurra
30da4bdb0c Ensure gutter scroll height takes block decorations into account 2015-11-26 15:43:34 +01:00
Antonio Scandurra
89d9a2ce83 🎨 Create block decorations in TextEditor
This is just an experiment, although I like that we can hide some information
(irrelevant to the user) behind a clean API.
2015-11-26 15:40:08 +01:00
Antonio Scandurra
c8254566ef Change verticalScrollbar's height according to block decorations 2015-11-26 15:34:45 +01:00