github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 23:08:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
35,329 Commits 140 Branches 571 Tags
02ca43db02b63e9b4b9e161a800075877e98d5bd
Commit Graph

35329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Brunsfeld
02ca43db02 ⬆️ language packages 2018-08-10 14:46:55 -07:00
Max Brunsfeld
9072e58ea7 Merge pull request #17816 from atom/mb-tree-sitter-grammar-regex-tweaks 
Support two different content-matching regexes for tree-sitter grammars
 2018-08-10 13:33:24 -07:00
Max Brunsfeld
6d54578daa Use setTimeout instead of setImmediate in MenuManager 
This should fix the flaky test failures that have been occurring on windows VSTS builds
 2018-08-10 12:33:00 -07:00
Max Brunsfeld
87784989ad Merge pull request #17750 from atom/mb-reduce-test-noise 
Fix errors causing tests to fail when run from the UI
 2018-08-10 12:22:54 -07:00
Max Brunsfeld
858071d54e 👕 2018-08-09 17:48:08 -07:00
Max Brunsfeld
8107be3b74 ⬆️ language-shellscript 2018-08-09 17:24:56 -07:00
Max Brunsfeld
6f41353e9f Support two different content-matching regexes for tree-sitter grammars 
* firstLineRegex is only tested against the first line of the file, and
  if it matches, it allows the grammar to be used for the file.
* contentRegex is only tested if the grammar matched the file name
  or the grammar's firstLineRegex matched. It is used to break ties
  between grammars like C and C++, Flow and JS
 2018-08-09 17:19:32 -07:00
David Wilson
c568c53609 Merge pull request #17815 from atom/dw-electron-2.0.7 
⬆️ electron@2.0.7
 2018-08-09 16:28:40 -07:00
Winston Liu
f1434cb66a 🔒 2018-08-09 19:02:23 -04:00
David Wilson
1484adea1d ⬆️ electron@2.0.7 2018-08-09 15:25:42 -07:00
Max Brunsfeld
36bb4d51e9 ⬆️ markdown-preview, styleguide 2018-08-09 13:40:45 -07:00
Max Brunsfeld
12875c1939 ⬇️ git-utils because of libgit2 performance regression 2018-08-09 12:21:46 -07:00
David Wilson
0e9f465888 Merge pull request #17804 from atom/dw-fix-pr-auth-error 
Only set VSTS build number in non-PR builds to avoid auth errors
 2018-08-08 12:53:08 -07:00
David Wilson
46ac543dd5 Only set VSTS build number in non-PR builds to avoid auth errors 2018-08-08 11:14:48 -07:00
Ash Wilson
6367f82cc6 Merge pull request #17803 from atom/aw/build-ci 
Use npm and apm ci in CI builds
 2018-08-08 13:51:01 -04:00
Ash Wilson
c7aaa880fb Always use install for apm 2018-08-08 12:36:15 -04:00
Max Brunsfeld
fe7df52a5e Merge pull request #17801 from atom/mb-tree-sitter-onDidTokenize 
Emit onDidTokenize event from TreeSitterLanguageMode
 2018-08-08 09:11:34 -07:00
Ash Wilson
96e563555c Pick up CI from the environment 2018-08-08 10:47:31 -04:00
Ash Wilson
ed47bf7fd5 Set --ci implicitly if CI is set to "true" 2018-08-08 10:47:18 -04:00
Ash Wilson
b804efcbcd 🔒 🔒 :lock 2018-08-08 10:07:41 -04:00
Ash Wilson
fd955a69a7 Upgrade npm to get "ci" 2018-08-08 09:31:08 -04:00
Ash Wilson
690b23cee4 Use --ci on CI builds 2018-08-08 08:58:41 -04:00
Ash Wilson
a4a9b150d2 🔒 2018-08-08 08:54:17 -04:00
Ash Wilson
347da770dc Don't use the npm binary you're about to delete 2018-08-08 08:41:30 -04:00
Ash Wilson
d0811b82ed Add a --ci option to script/build 2018-08-08 08:41:30 -04:00
Max Brunsfeld
826844c7e0 Emit onDidTokenize event from TreeSitterLanguageMode 2018-08-07 21:03:03 -07:00
David Wilson
cdd6fc52d2 Merge pull request #17800 from atom/dw-apm-2.1 
⬆️ apm@2.1.0
 2018-08-07 15:36:13 -07:00
David Wilson
4e82720eb9 Update out-of-date package{-lock}.json files 2018-08-07 14:37:38 -07:00
David Wilson
531e412672 ⬆️ apm@2.1.0 2018-08-07 14:36:51 -07:00
Lee Dohm
00efcbbd51 ⬆️ find-and-replace@0.215.13 2018-08-07 12:12:15 -07:00
Max Brunsfeld
e467de023e Merge pull request #17792 from atom/mb-tree-sitter-stack-overflow 
Avoid stack overflows due to spread args in Array.splice call
 2018-08-06 16:45:32 -07:00
Max Brunsfeld
fce7360cdd Avoid stack overflows due to spread in Array.splice call 2018-08-06 15:32:18 -07:00
Max Brunsfeld
29ef7d7024 ⬆️ languages 2018-08-06 15:10:50 -07:00
David Wilson
4c43c071b1 Ensure that Nightly builds are built as release branches 2018-08-06 13:18:46 -07:00
David Wilson
d625e855c8 Merge pull request #17789 from atom/dw-apm-2.0.1 
⬆️ apm@2.0.1
 2018-08-06 12:26:50 -07:00
Lee Dohm
823b7d2371 ⬆️ image-view@0.63.1 2018-08-06 11:57:51 -07:00
Max Brunsfeld
53218b921b Merge pull request #17774 from atom/fb-mdt-atomic-config-saves 
Write config file atomically
 2018-08-06 11:36:44 -07:00
David Wilson
3eca4f6ff3 Fix outdated package-lock.json files 2018-08-06 08:49:14 -07:00
Jason Rudolph
078a6efd41 Merge pull request #17788 from atom/remove-circleci 
Remove CircleCI configuration
 2018-08-06 11:01:43 -04:00
David Wilson
6b323c3d79 Re-enable Windows builds in the release build definition 2018-08-06 07:33:47 -07:00
David Wilson
f925937a14 ⬆️ npm@6.2.0 2018-08-06 07:33:47 -07:00
David Wilson
a5f1cf4a87 ⬆️ apm@2.0.1 2018-08-06 07:33:37 -07:00
Jason Rudolph
44f0a0175b Remove CircleCI configuration 2018-08-06 09:39:59 -04:00
Jason Rudolph
4a0332b7b4 Merge pull request #17775 from atom/dw-vsts-badge 
Add VSTS CI badge to README.md
 2018-08-06 09:34:08 -04:00
Max Brunsfeld
554f1ba758 Merge pull request #17781 from atom/mb-commas-in-scope-mapping-selectors 
Allow comma-separated selectors as keys in Tree-sitter scope mappings
 2018-08-04 19:44:15 -07:00
Max Brunsfeld
058e2b82dc Allow comma-separated selectors as keys in Tree-sitter scope mappings 2018-08-04 17:17:43 -07:00
Matthew Dapena-Tretter
f77391b158 Write config file atomically (write and replace) 2018-08-03 10:38:12 -07:00
David Wilson
2f15551ec2 Add VSTS CI badge to README.md 
[ci skip]
 2018-08-03 06:15:24 -07:00
Winston Liu
3e97867f3e 📝 correctly link function in docs 
[ci skip]
 2018-08-02 17:24:03 -05:00
David Wilson
8b95226e3c Fix syntax error 2018-08-02 13:31:08 -07:00