Skip to content
This repository was archived by the owner on Apr 1, 2020. It is now read-only.

Commit 5a68ac0

Browse files
committed
Merge branch 'master' into stable
2 parents 4aaffa7 + 82faff6 commit 5a68ac0

File tree

192 files changed

+4631
-1400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+4631
-1400
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,14 @@
11
<!-- Want this issue prioritized? Please consider supporting the project and becoming an insider!
22
👉 https://www.onivim.io/Insiders -->
3+
4+
**Oni Version:**
5+
**Neovim Version (Linux only):**
6+
**Operating System:**
7+
8+
**Issue:**
9+
10+
**Expected behavior:**
11+
12+
**Actual behavior:**
13+
14+
**Steps to reproduce:**

.github/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ backers:
3030
- 1718128
3131
- 2042893
3232
- 14060883
33+
- 244396
34+
- 8832878
35+
- 5127194

@types/classnames/index.d.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Custom type definitions for classnames master branch
2+
// Project: https://github.com/JedWatson/classnames
3+
4+
declare module "classnames" {
5+
type ClassValue = string | number | ClassDictionary | ClassArray | undefined | null | false
6+
7+
interface ClassDictionary {
8+
[id: string]: boolean | undefined | null
9+
}
10+
11+
// This is the only way I found to break circular references between ClassArray and ClassValue
12+
// https://github.com/Microsoft/TypeScript/issues/3496#issuecomment-128553540
13+
interface ClassArray extends Array<ClassValue> {} // tslint:disable-line no-empty-interface
14+
15+
type ClassNamesFn = (...classes: ClassValue[]) => string
16+
17+
const classNames: ClassNamesFn
18+
19+
export default classNames
20+
}

BACKERS.md

Lines changed: 65 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Oni is an MIT-licensed open-source project. It's an independent project without
44

55
If you use Oni, please consider joining them via the following options:
66

7-
* Become a backer on [Patreon](https://patreon.com/onivim)
8-
* Become a backer on [OpenCollective](https://opencollective.com/oni#backer)
9-
* Become a backer on [Bountysource](https://salt.bountysource.com/teams/oni)
10-
* Make a donation via [PayPal](https://www.paypal.me/bryphe/25)
11-
* Make a donation via Bitcoin / Ethereum (coming soon)
7+
* Become a backer on [Patreon](https://patreon.com/onivim)
8+
* Become a backer on [OpenCollective](https://opencollective.com/oni#backer)
9+
* Become a backer on [Bountysource](https://salt.bountysource.com/teams/oni)
10+
* Make a donation via [PayPal](https://www.paypal.me/bryphe/25)
11+
* Make a donation via Bitcoin / Ethereum (coming soon)
1212

1313
Thanks you to all our backers for making Oni possible!
1414

@@ -55,67 +55,81 @@ Thanks you to all our backers for making Oni possible!
5555

5656
## VIP Backers via BountySource
5757

58-
* @jordwalke
59-
* @mhartington
60-
* @MikaAK
61-
* @emolitor
58+
* @jordwalke
59+
* @mhartington
60+
* @MikaAK
61+
* @emolitor
6262

6363
## VIP Backers via Patreon
6464

65-
* @mikl
66-
* Tom Boland
65+
* @mikl
66+
* Tom Boland
6767

6868
## Backers via BountySource
6969

70-
* @adambard
71-
* @akin_so
72-
* @ayohan
73-
* @badosu
74-
* @josemarluedke
75-
* @napcode
76-
* @robtrac
77-
* @rrichardson
78-
* @sbuljac
79-
* @parkerault
80-
* @city41
81-
* @nithesh
82-
* @erandac
83-
* @appelgriebsch
70+
* @adambard
71+
* @akin_so
72+
* @ayohan
73+
* @badosu
74+
* @josemarluedke
75+
* @napcode
76+
* @robtrac
77+
* @rrichardson
78+
* @sbuljac
79+
* @parkerault
80+
* @city41
81+
* @nithesh
82+
* @erandac
83+
* @appelgriebsch
8484

8585
## Backers via PayPal
8686

87-
* @mchalkley
88-
* @am2605
89-
* Nathan Ensmenger
87+
* @mchalkley
88+
* @am2605
89+
* Nathan Ensmenger
9090

9191
## Backers via OpenCollective
9292

93-
* Tal Amuyal
94-
* Akinola Sowemimo
95-
* Martijn Arts
96-
* Amadeus Folego
97-
* Kiyoshi Murata
98-
* @Himura2la
93+
* Tal Amuyal
94+
* Akinola Sowemimo
95+
* Martijn Arts
96+
* Amadeus Folego
97+
* Kiyoshi Murata
98+
* @Himura2la
9999

100100
## Backers via Patreon
101101

102-
* @bennettrogers
103-
* @muream
104-
* Johnnie Hård
105-
* @robin-pham
106-
* Ryan Campbell
107-
* Balint Fulop
108-
* Quasar Jarosz
109-
* Channing Conger
110-
* Clinton Bloodworth
111-
* Lex Song
112-
* Paul Baumgart
113-
* Kaiden Sin
114-
* Troy Vitullo
115-
* Leo Critchley
116-
* Patrick Massot
117-
* Jerome Pellois
118-
* Wesley Moore
102+
* @bennettrogers
103+
* @muream
104+
* Johnnie Hård
105+
* @robin-pham
106+
* Ryan Campbell
107+
* Balint Fulop
108+
* Quasar Jarosz
109+
* Channing Conger
110+
* Clinton Bloodworth
111+
* Lex Song
112+
* Paul Baumgart
113+
* Kaiden Sin
114+
* Troy Vitullo
115+
* Leo Critchley
116+
* Patrick Massot
117+
* Jerome Pellois
118+
* Wesley Moore
119+
* Kim Fiedler
120+
* Nicolaus Hepler
121+
* Nick Price
122+
* Domenico Maisano
123+
* Daniel Polanco
124+
* Eric Hall
125+
* Dimas Cyriaco
126+
* Carlos Coves Prieto
127+
* Bryan Germann
128+
* James Herdman
129+
* Wayan Jimmy
130+
* Alex
131+
* Phil Plückthun
132+
* Norikazu Hayashi
119133

120134
<a href="https://opencollective.com/oni/tiers/backer/0/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/0/avatar.png"></a>
121135
<a href="https://opencollective.com/oni/tiers/backer/1/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/1/avatar.png"></a>

README.md

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
Oni is an independent, MIT-licensed open source project. Please consider supporting Oni by:
1313

14-
* [Become a backer or sponsor on Patreon](https://www.patreon.com/onivim)
15-
* [Become a backer or sponsor on Open Collective](https://opencollective.com/oni)
16-
* [Become a backer on BountySource](https://www.bountysource.com/teams/oni)
14+
* [Become a backer or sponsor on Patreon](https://www.patreon.com/onivim)
15+
* [Become a backer or sponsor on Open Collective](https://opencollective.com/oni)
16+
* [Become a backer on BountySource](https://www.bountysource.com/teams/oni)
1717

1818
<h3 align="center">Sponsors via OpenCollective</h3>
1919

@@ -65,13 +65,13 @@ Check out [Releases](https://github.com/onivim/oni/releases) for the latest bina
6565

6666
Oni brings several IDE-like integrations to neovim:
6767

68-
* [Embedded Browser](https://github.com/onivim/oni/wiki/Features#embedded-browser)
69-
* [Quick Info](https://github.com/onivim/oni/wiki/Features#quick-info)
70-
* [Code Completion](https://github.com/onivim/oni/wiki/Features#code-completion)
71-
* [Syntax / Compilation Errors](https://github.com/onivim/oni/wiki/Features#syntax--compilation-errors)
72-
* [Fuzzy Finding](https://github.com/onivim/oni/wiki/Features#fuzzy-finder)
73-
* [Status Bar](https://github.com/onivim/oni/wiki/Features#status-bar)
74-
* [Interactive Tutorial](https://github.com/onivim/oni/wiki/Features#interactive-tutorial)
68+
* [Embedded Browser](https://github.com/onivim/oni/wiki/Features#embedded-browser)
69+
* [Quick Info](https://github.com/onivim/oni/wiki/Features#quick-info)
70+
* [Code Completion](https://github.com/onivim/oni/wiki/Features#code-completion)
71+
* [Syntax / Compilation Errors](https://github.com/onivim/oni/wiki/Features#syntax--compilation-errors)
72+
* [Fuzzy Finding](https://github.com/onivim/oni/wiki/Features#fuzzy-finder)
73+
* [Status Bar](https://github.com/onivim/oni/wiki/Features#status-bar)
74+
* [Interactive Tutorial](https://github.com/onivim/oni/wiki/Features#interactive-tutorial)
7575

7676
And more coming - check out our [Roadmap](https://github.com/onivim/oni/wiki/Roadmap)
7777

@@ -83,22 +83,22 @@ Oni is cross-platform and supports Windows, Mac, and Linux.
8383

8484
We have installation guides for each platform:
8585

86-
* [Windows](https://github.com/onivim/oni/wiki/Installation-Guide#windows)
87-
* [Mac](https://github.com/onivim/oni/wiki/Installation-Guide#mac)
88-
* [Linux](https://github.com/onivim/oni/wiki/Installation-Guide#linux)
86+
* [Windows](https://github.com/onivim/oni/wiki/Installation-Guide#windows)
87+
* [Mac](https://github.com/onivim/oni/wiki/Installation-Guide#mac)
88+
* [Linux](https://github.com/onivim/oni/wiki/Installation-Guide#linux)
8989

9090
The latest binaries are available on our [Releases](https://github.com/onivim/oni/releases) page, and if you'd prefer to build from source, check out our [Development](https://github.com/onivim/oni/wiki/Development) guide.
9191

9292
## Goals
9393

9494
The goal of this project is to provide both the full-fledged Vim experience, with no compromises, while pushing forward to enable new productivity scenarios.
9595

96-
* **Modern UX** - The Vim experience should not be compromised by terminal limitations.
97-
* **Rich plugin development** - using JavaScript, instead of VimL.
98-
* **Cross-platform support** - across Windows, OS X, and Linux.
99-
* **Batteries included** - rich features are available out of the box - minimal setup needed to be productive.
100-
* **Performance** - no compromises, Vim is fast, and Oni should be fast too.
101-
* **Ease Learning Curve** - without sacrificing the Vim experience.
96+
* **Modern UX** - The Vim experience should not be compromised by terminal limitations.
97+
* **Rich plugin development** - using JavaScript, instead of VimL.
98+
* **Cross-platform support** - across Windows, OS X, and Linux.
99+
* **Batteries included** - rich features are available out of the box - minimal setup needed to be productive.
100+
* **Performance** - no compromises, Vim is fast, and Oni should be fast too.
101+
* **Ease Learning Curve** - without sacrificing the Vim experience.
102102

103103
Vim is an incredible tool for manipulating _text_ at the speed of thought. With a composable, modal command language, it is no wonder that Vim usage is still prevalent today.
104104

@@ -108,41 +108,44 @@ The goal of this project is to give an editor that gives the best of both worlds
108108

109109
## Documentation
110110

111-
* Check out the [Wiki](https://github.com/onivim/oni/wiki) for documentation on how to use and modify Oni.
112-
* [FAQ](https://github.com/onivim/oni/wiki/FAQ)
113-
* [Roadmap](https://github.com/onivim/oni/wiki/Roadmap)
111+
* Check out the [Wiki](https://github.com/onivim/oni/wiki) for documentation on how to use and modify Oni.
112+
* [FAQ](https://github.com/onivim/oni/wiki/FAQ)
113+
* [Roadmap](https://github.com/onivim/oni/wiki/Roadmap)
114114

115115
## Contributing
116116

117117
There many ways to get involved & contribute to Oni:
118118

119-
* Support Oni financially by making a donation via:
120-
* [Patreon](https://patreon.com/onivim)
121-
* [OpenCollective](https://opencollective.com/oni)
122-
* [Bountysource](https://salt.bountysource.com/teams/oni)
123-
* Thumbs up existing [issues](https://github.com/onivim/oni/issues) if they impact you.
124-
* [Create an issue](https://github.com/onivim/oni/issues) for bugs or new features.
125-
* Review and update our [documentation](https://github.com/onivim/oni/wiki).
126-
* Try out the latest [released build](https://github.com/onivim/oni/releases).
127-
* Help us [develop](https://github.com/onivim/oni/wiki/Development):
128-
* Review [PRs](https://github.com/onivim/oni/pulls)
129-
* Submit a bug fix or feature
130-
* Add test cases
131-
* Create a blog post or YouTube video
132-
* Follow us on [Twitter](https://twitter.com/oni_vim)
119+
* Support Oni financially by making a donation via:
120+
* [Patreon](https://patreon.com/onivim)
121+
* [OpenCollective](https://opencollective.com/oni)
122+
* [Bountysource](https://salt.bountysource.com/teams/oni)
123+
* Thumbs up existing [issues](https://github.com/onivim/oni/issues) if they impact you.
124+
* [Create an issue](https://github.com/onivim/oni/issues) for bugs or new features.
125+
* Review and update our [documentation](https://github.com/onivim/oni/wiki).
126+
* Try out the latest [released build](https://github.com/onivim/oni/releases).
127+
* Help us [develop](https://github.com/onivim/oni/wiki/Development):
128+
* Review [PRs](https://github.com/onivim/oni/pulls)
129+
* Submit a bug fix or feature
130+
* Add test cases
131+
* Create a blog post or YouTube video
132+
* Follow us on [Twitter](https://twitter.com/oni_vim)
133133

134134
## Acknowledgements
135135

136136
Oni is an independent project and is made possible by the support of some exceptional people. Big thanks to the following people for helping to realize this project:
137137

138-
* the [neovim team](https://neovim.io/), especially [justinmk](https://github.com/justinmk) and [tarruda](https://github.com/tarruda) - Oni would not be possible without their vision
139-
* [jordwalke](https://github.com/jordwalke) for his generous support, inspiration, and ideas. And React ;)
140-
* [keforbes](https://github.com/keforbes) for helping to get this project off the ground
141-
* [tillarnold](https://github.com/tillarnold) for giving us the `oni` npm package name
142-
* [mhartington](https://github.com/mhartington) for his generous support
143-
* [badosu](https://github.com/badosu) for his support, contributions, and managing the AUR releases
144-
* All our current monthly [sponsors](https://salt.bountysource.com/teams/oni/supporters) and [backers](BACKERS.md)
145-
* All of our [contributors](https://github.com/onivim/oni/graphs/contributors) - thanks for helping to improve this project!
138+
* the [neovim team](https://neovim.io/), especially [justinmk](https://github.com/justinmk) and [tarruda](https://github.com/tarruda) - Oni would not be possible without their vision
139+
* [jordwalke](https://github.com/jordwalke) for his generous support, inspiration, and ideas. And React ;)
140+
* [keforbes](https://github.com/keforbes) for helping to get this project off the ground
141+
* [Akin909](https://github.com/Akin909) for his extensive contributions
142+
* [CrossR](https://github.com/CrossR) for polishing features and configurations
143+
* [Cryza](https://github.com/Cryza) for the webgl renderer
144+
* [tillarnold](https://github.com/tillarnold) for giving us the `oni` npm package name
145+
* [mhartington](https://github.com/mhartington) for his generous support
146+
* [badosu](https://github.com/badosu) for his support, contributions, and managing the AUR releases
147+
* All our current monthly [sponsors](https://salt.bountysource.com/teams/oni/supporters) and [backers](BACKERS.md)
148+
* All of our [contributors](https://github.com/onivim/oni/graphs/contributors) - thanks for helping to improve this project!
146149

147150
Several other great neovim front-end UIs [here](https://github.com/neovim/neovim/wiki/Related-projects) served as a reference, especially [NyaoVim](https://github.com/rhysd/NyaoVim) and [VimR](https://github.com/qvacua/vimr). I encourage you to check those out!
148151

@@ -163,9 +166,9 @@ Windows and OSX have a bundled version of Neovim, which is covered under [Neovim
163166

164167
Bundled plugins have their own license terms. These include:
165168

166-
* [typescript-vim](https://github.com/leafgarland/typescript-vim) (`oni/vim/core/typescript.vim`)
167-
* [targets.vim](https://github.com/wellle/targets.vim) (`oni/vim/default/bundle/targets.vim`)
168-
* [vim-commentary](https://github.com/tpope/vim-commentary) (`oni/vim/default/bundle/vim-commentary`)
169-
* [vim-unimpaired](https://github.com/tpope/vim-unimpaired) (`oni/vim/default/bundle/vim-unimpaired`)
170-
* [vim-surround](https://github.com/tpope/vim-surround) (`oni/vim/default/bundle/vim-surround`)
171-
* [vim-reasonml](https://github.com/reasonml-editor/vim-reason) (`.vim` files in `oni/vim/core/oni-plugin-reasonml`)
169+
* [typescript-vim](https://github.com/leafgarland/typescript-vim) (`oni/vim/core/typescript.vim`)
170+
* [targets.vim](https://github.com/wellle/targets.vim) (`oni/vim/default/bundle/targets.vim`)
171+
* [vim-commentary](https://github.com/tpope/vim-commentary) (`oni/vim/default/bundle/vim-commentary`)
172+
* [vim-unimpaired](https://github.com/tpope/vim-unimpaired) (`oni/vim/default/bundle/vim-unimpaired`)
173+
* [vim-surround](https://github.com/tpope/vim-surround) (`oni/vim/default/bundle/vim-surround`)
174+
* [vim-reasonml](https://github.com/reasonml-editor/vim-reason) (`.vim` files in `oni/vim/core/oni-plugin-reasonml`)

appveyor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ branches:
99
- master
1010
- /^release.*/
1111

12+
# Skip CI build if the changes match these rules exactly.
13+
# Ie, if the BACKERS.md file is changed, we don't need to build.
14+
skip_commits:
15+
files:
16+
- '**/*.md'
17+
1218
cache:
1319
- .oni_build_cache -> package.json
1420

0 commit comments

Comments
 (0)