Linus Eriksson
2d6cc4f172
Use a different name depending on channel
...
This makes Atom beta install in %LOCALAPPDATA%\atom-beta and stable in
%LOCALAPPDATA%\atom so that installs are side by side
2019-06-25 17:58:50 +02:00
Linus Eriksson
0ac07e7f32
Specify exe in the metadata
...
Because we changed it to be atom-beta.exe on beta for example this is
required for electron-winstaller to find the executable
2019-06-25 17:58:28 +02:00
Rafael Oleza
b6644dfad8
Merge branch 'master' into dw-windows-separate-channels
2019-06-25 15:49:34 +02:00
Winston Liu
fe213072f2
Merge pull request #19590 from UziTech/patch-8
...
fix comment docs
2019-06-25 07:44:10 -04:00
Tony Brix
c96b4a9774
fix comment docks
2019-06-24 14:47:40 -05:00
Max Brunsfeld
28a17d7b41
Merge pull request #19586 from atom/mb-tree-sitter-0-15-6-test-travis
...
Update Tree-sitter to 0.15.6
2019-06-21 10:26:02 -07:00
Nathan Sobo
9fdcc95902
Merge pull request #18738 from Aerijo/master
...
Show Tree-sitter grammars in grammar selector
2019-06-21 09:37:34 -07:00
Max Brunsfeld
2d78a1fdf2
⬆️ tree-sitter for incremental parsing bugfix
2019-06-21 09:26:51 -07:00
Benjamin Gray
5f220a8224
fix spec
2019-06-21 19:44:24 +10:00
Benjamin Gray
9e1e647ec7
fix lint
2019-06-21 16:32:16 +10:00
Benjamin Gray
166d968daa
adjust specs
2019-06-21 16:11:50 +10:00
Benjamin Gray
cec3b058fb
restore tree-sitter in grammar iterator
2019-06-21 15:19:36 +10:00
Benjamin Gray
a92c86f194
Default to no Tree-sitter grammars
2019-06-21 14:57:31 +10:00
Nathan Sobo
3e1097ff22
Merge remote-tracking branch 'origin/master' into Aerijo
2019-06-20 14:44:13 -06:00
Nathan Sobo
37c954b44a
Merge pull request #19580 from atom/as/upgrade-npm-for-macos-tests
...
Upgrade npm on Azure Pipelines when running macOS tests
2019-06-20 13:42:32 -07:00
Nathan Sobo
f65475d855
⬆️ find-and-replace@0.218.14 to fix flaky tests
2019-06-20 14:38:53 -06:00
Nathan Sobo
a4cfd8494b
Merge pull request #19579 from atom/ns/update-git-utils
...
Upgrade git-utils to 5.6.1 to fix .gitignore edge cases
2019-06-20 12:12:04 -07:00
Antonio Scandurra
ed75930d21
Upgrade npm on Azure Pipelines when running macOS tests
2019-06-20 18:17:50 +02:00
Nathan Sobo
e4add632d6
⬆️ git-utils@5.6.1 to fix .gitignore edge cases
...
Incorporates changes in https://github.com/atom/git-utils/pull/97
2019-06-20 09:52:47 -06:00
Antonio Scandurra
639a126eb8
Merge pull request #19578 from atom/as/fix-policy-files
...
Use a different polkit policy name for each Atom channel on Linux
2019-06-20 17:46:27 +02:00
Benjamin Gray
4bcb51984e
Merge branch 'master' of github.com:atom/atom
2019-06-21 01:34:41 +10:00
Antonio Scandurra
7e763a2af6
Merge pull request #19577 from atom/as/fix-ci-for-forked-pull-requests
...
Run script/bootstrap for pull requests originated from forks
2019-06-20 16:55:08 +02:00
Antonio Scandurra
85567ff70e
Pass policyFileName variable to RPM spec template
2019-06-20 15:11:15 +02:00
Antonio Scandurra
c52399b043
Update policy filename for RPM spec.in
2019-06-20 15:10:05 +02:00
Antonio Scandurra
6dcc0f1f74
Use a different polkit policy name for each Atom channel on Linux
...
Using the same name would generate an exception when trying to install
more than one version of Atom at the same time.
2019-06-20 14:29:23 +02:00
Antonio Scandurra
73274fb70a
Run script/bootstrap for pull requests originated from forks
2019-06-20 14:20:31 +02:00
Rafael Oleza
2a2e3f0289
Merge pull request #19576 from atom/nighlies-on-linux
...
Publish nightly releases to atom repo on packagecloud.io
2019-06-20 12:04:41 +02:00
Rafael Oleza
a6c21292be
Publish nightly releases to atom repo on packagecloud.io
2019-06-20 11:13:19 +02:00
Benjamin Gray
2cc3bff1be
fix lint
2019-06-20 14:29:01 +10:00
Benjamin Gray
4cc1afbb68
imitate public interface
2019-06-20 14:09:55 +10:00
Benjamin Gray
5b344aea6d
fix lint
2019-06-20 12:02:18 +10:00
Benjamin Gray
7d5a52f755
clean up duplicate removal
2019-06-20 11:47:15 +10:00
Max Brunsfeld
4027b0b655
Merge pull request #19575 from atom/mb-fix-tree-sitter-highlight-exception
...
Fix exception when multiple language layers are not yet highlighted
2019-06-19 11:05:45 -07:00
Rafael Oleza
95f8cf80fe
Merge pull request #19573 from atom/custom-electron-winstaller
...
⬆️ electron-winstaller
2019-06-19 19:24:21 +02:00
Max Brunsfeld
288cd124b7
Fix exception when multiple language layers are not yet highlighted
2019-06-19 10:11:22 -07:00
Rafael Oleza
2c516fb705
⬆️ electron-winstaller
...
With this PR Atom uses a custom version of `electron-winstaller` named
`@atom/electron-winstaller` which contains a custom version of `Squirrel.Windows`
built from https://github.com/Squirrel/Squirrel.Windows/pull/149
This should fix the issues when upgrading from e.g nightly-9 to
nightly-10
2019-06-19 17:06:44 +02:00
Rafael Oleza
354a432e5f
Merge pull request #19570 from atom/fix-nightly-warnings
...
Generate delta nightly updaters for windows
2019-06-19 11:16:51 +02:00
Rafael Oleza
4ff07c2e7f
Merge pull request #19569 from atom/fix-nightlies
...
Fix generation of release notes for nightly builds
2019-06-19 10:22:06 +02:00
Rafael Oleza
ef8e5bc12a
Generate delta nightly updaters for windows
...
We've recently updated to electron-winstaller@3.0.4, which includes a
new version of Squirrel.Windows with the following fix:
https://github.com/anaisbetts/NuGet/pull/1
Thanks to that fix we don't need anymore to disable delta nuget
updaters, since that won't fail anymore.
2019-06-19 09:42:45 +02:00
Rafael Oleza
136ec1474e
Fix generation of release notes for nightly builds
2019-06-19 09:16:19 +02:00
Max Brunsfeld
1299c05eac
Merge pull request #19566 from atom/mb-upgrade-tree-sitter-languages-to-0-15
...
Update all language packages with Tree-sitter languages
2019-06-18 19:12:50 -07:00
Max Brunsfeld
dbdff0f56c
⬆️ language packages
2019-06-18 17:49:20 -07:00
Max Brunsfeld
5e418c3467
Merge pull request #19556 from atom/mb-rust-macro-injection
...
Add a new injection point setting to support parsing Rust macros via language injection
2019-06-18 16:08:30 -07:00
Max Brunsfeld
5e6770bb3f
Implement scope boundary deduping by detecting each duplicate
2019-06-18 14:35:40 -07:00
Rafael Oleza
7f5899e261
Merge pull request #19561 from atom/update-fuzzy-finder
...
⬆️ fuzzy-finder@1.13 .8
2019-06-18 19:34:58 +02:00
Rafael Oleza
e05bb34d4a
Merge pull request #19553 from atom/release-notes-on-nightly
...
Improve logic to generate nightly release notes
2019-06-18 18:50:13 +02:00
Rafael Oleza
afeee24f9b
⬆️ fuzzy-finder@1.13.8
2019-06-18 18:08:49 +02:00
Rafael Oleza
940693458f
Merge pull request #19534 from atom/tweak-package-lock
...
Tweak package-lock to avoid loading `fs-extra` twice on main-process
2019-06-18 09:29:16 +02:00
Max Brunsfeld
f7b8e5f12f
Implement .compare on NullHighlightIterator
2019-06-17 17:52:55 -07:00
Max Brunsfeld
ea6d06152b
Load language-rust at snapshot-generation time
2019-06-17 17:29:18 -07:00
