Commit Graph

34955 Commits

Author SHA1 Message Date
Max Brunsfeld
0a39d8fee3 Use specific version of focus-trap
Some PanelContainerElement specs seem to have started failing
after a new version of this module was published.
2018-06-13 10:30:52 -07:00
Jason Rudolph
e352b2f107 Revert "⬆️ metrics@1.2.7"
This reverts commit b81e33c372.

b81e33c372 *seems* to be causing some
tests to time-out on CI:

https://circleci.com/gh/atom/atom/7707
https://circleci.com/gh/atom/atom/7708
https://circleci.com/gh/atom/atom/7709

Let's revert that change for now so that we can get CI green again while
we search for the exact cause of those time-outs.
2018-06-12 18:00:08 -04:00
Max Brunsfeld
b78a0e80a3 ⬆️ language-html 2018-06-12 14:21:28 -07:00
Jason Rudolph
b81e33c372 ⬆️ metrics@1.2.7 2018-06-12 10:35:03 -04:00
Wliu
e658a4e5a8 Merge pull request #17499 from atom/wl-update-languages
Update languages
2018-06-11 14:05:23 -04:00
Wliu
3035938e40 ⬆️ language-html@0.49.2 2018-06-11 09:51:58 -04:00
Wliu
4ca3a6770e ⬆️ language-php@0.44.0 2018-06-11 09:51:00 -04:00
Wliu
abd92aacdb ⬆️ language-python@0.50.0 2018-06-11 09:50:10 -04:00
Wliu
d8f97df584 ⬆️ language-shellscript@0.26.5 2018-06-11 09:48:49 -04:00
Wliu
917486e8f6 ⬆️ language-css@0.42.11 2018-06-11 09:47:51 -04:00
Wliu
b5e133ea2d ⬆️ language-java@0.30.0 2018-06-11 09:47:41 -04:00
Max Brunsfeld
0422e0d61f 🚱 Fix leak when switching between tree-sitter languages 2018-06-07 17:03:45 -07:00
Max Brunsfeld
6346f5ec9e Grammar scoring, weigh grammar type higher than content regex match
This fixes another regression introduces in #17468
2018-06-07 16:17:23 -07:00
Max Brunsfeld
6c4c47a810 Merge pull request #17474 from atom/editor-scrollbar-style
Don't allow vertical scrollbar to affect soft wrap column
2018-06-07 15:37:32 -07:00
Max Brunsfeld
0148ee7d9b Always leave room for scrollbars 2018-06-07 14:42:06 -07:00
Max Brunsfeld
70cf900ac0 Make TextEditorComponent tests reliably pass on retina screens 2018-06-07 14:09:31 -07:00
Thomas Johansen
9e0065c8f8 Merge pull request #17481 from atom/blacklist-yauzl-from-snapshot
Blacklist `yauzl` from snapshot
2018-06-07 00:32:28 +02:00
Thomas Johansen
5072e4b54f Remove decompress-zip from the snapshot blacklist 2018-06-06 23:30:20 +02:00
Thomas Johansen
c57c4b96a1 ⬆️ archive-view@0.65.0 2018-06-06 23:17:12 +02:00
Thomas Johansen
fcb8ca7441 Add yauzl to the snapshot blacklist 2018-06-06 22:29:55 +02:00
David Wilson
d745ea7c25 Merge pull request #17479 from atom/dw-update-electron-link
⬆️ electron-link
2018-06-06 10:31:51 -07:00
David Wilson
a18a239c54 ⬆️ electron-link 2018-06-06 09:40:30 -07:00
Max Brunsfeld
463a7f4b72 Merge pull request #17475 from atom/mb-another-grammar-scoring-fix
Don't boost tree-sitter grammars' score unless they match in some way
2018-06-05 17:13:46 -07:00
Max Brunsfeld
31f511aae7 Don't boost tree-sitter grammars' score unless they match in some way 2018-06-05 16:00:03 -07:00
Thomas Johansen
40f102919b ⬆️ archive-view@0.64.6 2018-06-06 00:37:27 +02:00
Max Brunsfeld
c59ebdf609 Silence bash's output before reading from pipe in atom.sh 2018-06-05 10:00:14 -07:00
Max Brunsfeld
41bbac7bb1 Merge pull request #17469 from atom/mb-wait-fifo-fixes
Atom.sh - identify and create atom home dir regardless of platform
2018-06-04 18:07:00 -07:00
Max Brunsfeld
ebf15ef050 Merge pull request #17468 from atom/mb-fix-content-regexes
Make Tree-sitter grammars' contentRegExp work as intended
2018-06-04 18:06:46 -07:00
Max Brunsfeld
81088b6c16 Atom.sh - identify and create atom home dir regardless of platform 2018-06-04 17:22:59 -07:00
Max Brunsfeld
4dbfadd0d5 Make Tree-sitter grammars' contentRegExp work as intended 2018-06-04 17:17:37 -07:00
David Wilson
ba9616506f Merge pull request #17464 from atom/extended-color-profile-bits
Extend the color profile PR (#17380)
2018-06-04 14:22:25 -07:00
David Wilson
fceb6b0063 Merge pull request #17380 from atom/fix-color-problems-using-electron-2.0
Restore color rendering following Electron 2.0 update
2018-06-04 12:40:50 -07:00
Max Brunsfeld
05e072286f ⬆️ find-and-replace 2018-06-04 12:25:16 -07:00
Max Brunsfeld
6d9549b639 ⬆️ underscore-plus to revert escapeRegExp fix 2018-06-03 14:59:14 -07:00
Max Brunsfeld
9710dea25f ⬆️ underscore-plus for escapeRegExp fix 2018-06-01 17:41:57 -07:00
Jason Rudolph
c3d38ed360 Support configuring color profile via settings UI 2018-06-01 16:32:31 -04:00
Jason Rudolph
f9ba602c6c Gracefully handle missing config file
https://circleci.com/gh/atom/atom/7630
2018-06-01 16:21:04 -04:00
Jason Rudolph
266e0111b8 Decaffienate ScopeDescriptor
Oddly, I expect this to resolve the CI failure seen in 
https://travis-ci.org/atom/atom/builds/386819124#L1200.
2018-06-01 15:33:28 -04:00
Jason Rudolph
b67f8ac2ce 👕 2018-06-01 15:04:46 -04:00
Jason Rudolph
6985fb0ff3 Use Atom's standard config file to set custom color profile 2018-06-01 14:26:33 -04:00
Landon Abney
064fcce3f6 Merge pull request #17057 from atom/la/generate-api-docs
Add --generate-api-docs to build script
2018-06-01 10:55:07 -07:00
Landon Abney
5e49917c56 Wrap binariesPromise handling in an if
Instead of forcing an immediate exit with process.exit(), wrap the
handling of binariesPromise in an `if` statement, allowing the script to
exit on its own if passed the new option.
2018-06-01 09:31:03 -07:00
Landon Abney
bb7046830a Revert moving of dependencies
This change isn't necessary for adding the option.
2018-06-01 09:29:29 -07:00
Jason Rudolph
c71de84962 Look for .electron-switches in ATOM_HOME 2018-06-01 11:02:00 -04:00
Jason Rudolph
82ba358aa9 Read user's custom Electron switches from config file 2018-06-01 09:50:16 -04:00
Max Brunsfeld
f342201b19 ⬆️ tree-sitter 2018-05-31 19:37:16 -07:00
Ash Wilson
e31c972d38 Merge pull request #17439 from atom/aw/github-up-stable
Upgrade atom/github on dev
2018-05-31 07:50:02 -04:00
Ash Wilson
08f6929c0d ⬆️ atom/github 2018-05-30 21:07:41 -04:00
David Wilson
4de2cd8d1d ⬆️ whitespace 2018-05-30 16:13:53 -07:00
Ash Wilson
f7de8ca7f5 Merge pull request #17434 from atom/aw/github-up-stable
Upgrade atom/github on dev
2018-05-30 16:10:16 -04:00