Merge branch 'master' into stable

Author: bryphe

.github/config.yml

@@ -1,3 +1,18 @@
 # Comment to be posted to on first time issues
 newIssueWelcomeComment: >
   Hello and welcome to the Oni repository! Thanks for opening your first issue here. To help us out, please make sure to include as much detail as possible - including screenshots and logs, if possible.
+backers:
+- 13532591
+- 5097613
+- 22454918
+- 347552
+- 977348
+- 28748
+- 2835826
+- 515720
+- 124171
+- 230476
+- 10102132
+- 10038688
+- 817509
+- 163128

.gitignore

@@ -16,6 +16,7 @@ $LOCALAPPDATA
 lib
 lib_test
 dist
+s3_dist
 
 ### https://raw.github.com/github/gitignore/2b3b1f428fb84dc4ba3ad2307ec44af3c5799848/Node.gitignore
 

.nvmrc

@@ -0,0 +1 @@
+9

.prettierignore

@@ -0,0 +1,2 @@
+package.json
+vim/core/oni-plugin-typescript/package.json

.travis.yml

@@ -29,13 +29,11 @@ install:
 - yarn install
 script:
 - ./build/script/travis-build.sh
-after_success:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .nyc_output/lcov.info; fi
 deploy:
     - provider: s3
-      access_key_id: AKIAIPVCKNWKWB2XULQQ
+      access_key_id: AKIAIYMATI2CEFTHPBOQ
       secret_access_key:
-        secure: IKLeZsM1R8pq/eBqBCnsFe6iSF+ZHaokY6yBf6FtxaqHw7qJR3RQ9XI9N7mooKXOAsp7prDBNW6sdciGmzXpDW7myDz5eEfmVOIZxb6zq0XUwsikkgrzgS22bMkj32CZuRzR8agzF7US+G6OfVo+MIhChOPKBfqkbUbQdWm0tYX0NJsNyt8Ax8GdyzAj98cazw5tV2HWT7M11EKQCssc1CiFWqR51Zqmy34d/jEWJEe+P3avRDpNCJf6uuzfrtpn1swCb0EY7aZGDischXwRJDyZ6GXrjECxazN2T7JwcwKw/Y+XOeiwp5H+ell+1C/tZMXcn8OyOZurVQdG7MNGHil0Jt/t4QL6XpNXXF8I1k1LQDty7SPnZRKaAYo8rNyDFqGt5oVLvTm8GD9KjI4rGPt7VvzUQS5SITRnI1m6wq0YDdVqcR9/Z2cLmXHmzhOmB3FLCTKQXXCMaG1dAzlYQDOspo9RKr+nuDpherNMSiqSeVUM97UrfRQ2pC/JfoL/f6j2jt88Y7XfF9x48h+6Pm8ny5rlSaU4otnVpgAeoMEMED5s93zZrVxF7ydyZ0ZvBLKfK13mJwleCq3R1DbYStp1bor0MFwVoVRRRLcxIo6bhlmJsd0qhIFXL8BcE1wLzDITnXVxAxg9izRPYPcSgRLyjJ1SqaxoT89cO0YlNEU=
+        secure: S4f/aczEABGAMKk2tmVSkoGx+T2TLPmz5z6x6RKaM+eDmAaVSAELlIj1eAz6Tu2lv3jz+cpyAIISZNC/phORsJWwzbSZHVycLrMG0N3fDTqKFxu1fl6L3b3exRe9SiKXug73ZvHfktzd/XfRcgZKop4qgrwGiM57m0ZuZb/j1LkgjytTuvNAUxXbA84I8LZs/NhY17XuXq+KPlGElIHy3UFoGqQ8pBnTypkIU5rQTsoeAxXLBE8JAFfz+nBGZ7dx6OMbQcKX5jKh/gR3vk+4aTgV8gNE2Zp24ErjSqF2zly/gP9nE2DpfR7jqpZVHnb/v+OEjRDS80tLhPo8Dbibzwt2ZZNADpYBjSGtphwAmq4DCvJ7ORExOB5+O3wmXKQGdItyBTS7sW44n6BTyv87WxWuCaSDQ9QaO9PrbJdN5YGEYeRxSTM7Mn0t72IILkfFCUeSg6fl6tFs9iWIj5zltbxH1GQsRpA8j1Idg4O+894KnQABtw/YKh6rrdeYS9y/100qAjtV6qYyiP2IdPqMWGuasOiz87q3CQ8Ejd7uhiTjAaINVqos+0k04Yf5+rT4MqkeXnYFzjXuXcqDlpq6yJIZv3aD+PMSlZi2WmTYnPJXQFndHo/x9FhEh90UF9WdO5S27ySRSo8XQT4DyL3ToPkqz8y0slNmaNqiqMouQAU=
       bucket: oni-media
       local-dir: dist/media
       acl: public_read
@@ -44,6 +42,18 @@ deploy:
       on:
         condition: $TRAVIS_OS_NAME = osx
         repo: onivim/oni
+    - provider: s3
+      access_key_id: AKIAIYMATI2CEFTHPBOQ
+      secret_access_key:
+        secure: S4f/aczEABGAMKk2tmVSkoGx+T2TLPmz5z6x6RKaM+eDmAaVSAELlIj1eAz6Tu2lv3jz+cpyAIISZNC/phORsJWwzbSZHVycLrMG0N3fDTqKFxu1fl6L3b3exRe9SiKXug73ZvHfktzd/XfRcgZKop4qgrwGiM57m0ZuZb/j1LkgjytTuvNAUxXbA84I8LZs/NhY17XuXq+KPlGElIHy3UFoGqQ8pBnTypkIU5rQTsoeAxXLBE8JAFfz+nBGZ7dx6OMbQcKX5jKh/gR3vk+4aTgV8gNE2Zp24ErjSqF2zly/gP9nE2DpfR7jqpZVHnb/v+OEjRDS80tLhPo8Dbibzwt2ZZNADpYBjSGtphwAmq4DCvJ7ORExOB5+O3wmXKQGdItyBTS7sW44n6BTyv87WxWuCaSDQ9QaO9PrbJdN5YGEYeRxSTM7Mn0t72IILkfFCUeSg6fl6tFs9iWIj5zltbxH1GQsRpA8j1Idg4O+894KnQABtw/YKh6rrdeYS9y/100qAjtV6qYyiP2IdPqMWGuasOiz87q3CQ8Ejd7uhiTjAaINVqos+0k04Yf5+rT4MqkeXnYFzjXuXcqDlpq6yJIZv3aD+PMSlZi2WmTYnPJXQFndHo/x9FhEh90UF9WdO5S27ySRSo8XQT4DyL3ToPkqz8y0slNmaNqiqMouQAU=
+      bucket: oni-builds
+      local-dir: s3_dist
+      upload-dir: $TRAVIS_BRANCH
+      acl: public_read
+      region: us-west-2
+      skip_cleanup: true
+      on:
+        repo: onivim/oni
     - provider: releases
       api_key:
         secure: AjQUeQNockqkBrVQCOQGyKq+sZ9C4SabSqp/bmXayKTB+7AmM8oohenxC09Sc4/dmIW1PQnDYL/4fjclJSRaywV5oiPqUnfhTveALkKFErmYnhA8oFi3VJYg4Tbszb2lYGITLOluuuAZGw67JZIuuiXzw/yOUfdWTmRCAVGzTmqkPsusYg56L4iRBWDwYQ3mhHsuNKFO7SIx1nJatj5hK9AkDJlcVilpA5IuWLWOHLY7nplFPUPUwMkRd99nifB7ITycbaAX4zLwp2U2wCb2uSTOzsFNfXykksf8AlreH0615Jb+T39/dDwQurDAQE3h+KUH5QhEvRJ1uphkGvx/x6Vn0LkJuSqS5DLeSATmVOVRK2f6AXcymvn/64qxizjlBR7bBoUxM55311qWJNKKk2FYFTAIW5fMzN0MRbaulpnpBwmhnBvd03rOMIghnvClHv2m8Eh5A6ppPnLcl2Vn7jsrqTmMm+PM1ppIWhCpvC7xn4digx1GGHXlYzfHkDxtnHwHcbj+WOkc+j4ha8Os+1ctdT3OJXz5rwW4viorSIhWryK+G36beguXe5YaoeMcK9Vzmb+S0lHdA7RuCWiJ31i/9ZMbzBhLkdcf/wfj9n3mkqmzvc4Uc1NM8FHQ23URsodSHpTdDi7q25Eqge/JP82AqJ2zAWA+QKVg54xCQQc=

.vscode/launch.json

@@ -12,9 +12,7 @@
             "windows": {
                 "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
             },
-            "runtimeArgs": [
-                "--enable-logging"
-            ],
+            "runtimeArgs": ["--enable-logging"],
             "console": "internalConsole"
         },
         {
@@ -27,15 +25,12 @@
             "windows": {
                 "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
             },
-            "runtimeArgs": [
-                "--enable-logging",
-                "${workspaceRoot}/lib/main/src/main.js"
-            ],
+            "runtimeArgs": ["--enable-logging", "${workspaceRoot}/lib/main/src/main.js"],
             "webRoot": "${workspaceRoot}",
             "sourceMaps": true,
             "sourceMapPathOverrides": {
                 "webpack:///./*": "${webRoot}/*"
             }
         }
     ]
-}
+}

ACCOUNTING.md

@@ -1,15 +1,18 @@
 # ONI
+
 ## Accounting
 
 This file will contain a monthly report including:
-- Incoming contributions
-- How the contributions are distributed, in accordance with the project's goals
+
+* Incoming contributions
+* How the contributions are distributed, in accordance with the project's goals
 
 The initial plan for allocation is as follows:
-- 10% - Vim - Contribute to Bram's charity of choice
-- 20% - Neovim Development
-- 35% - Paid to contributors via bounties
-- 35% - Paid to maintainer
+
+* 10% - Vim - Contribute to Bram's charity of choice
+* 20% - Neovim Development
+* 35% - Paid to contributors via bounties
+* 35% - Paid to maintainer
 
 Your contributions help keep this project alive!
 

BACKERS.md

@@ -4,10 +4,10 @@ Oni is an MIT-licensed open-source project. It's an independent project without
 
 If you use Oni, please consider joining them via the following options:
 
-- Become a backer on [OpenCollective](https://opencollective.com/oni#backer)
-- Become a backer on [Bountysource](https://salt.bountysource.com/teams/oni)
-- Make a donation via [PayPal](https://www.paypal.me/bryphe/25)
-- Make a donation via Bitcoin / Ethereum (coming soon)
+* Become a backer on [OpenCollective](https://opencollective.com/oni#backer)
+* Become a backer on [Bountysource](https://salt.bountysource.com/teams/oni)
+* Make a donation via [PayPal](https://www.paypal.me/bryphe/25)
+* Make a donation via Bitcoin / Ethereum (coming soon)
 
 Thanks you to all our backers for making Oni possible!
 
@@ -54,31 +54,31 @@ Thanks you to all our backers for making Oni possible!
 
 ## VIP Backers via BountySource
 
-- @jordwalke
-- @mhartington
+* @jordwalke
+* @mhartington
 
 ## Backers via BountySource
 
-- @adambard
-- @akin_so
-- @ayohan
-- @badosu
-- @josemarluedke
-- @napcode
-- @robtrac
-- @rrichardson
-- @sbuljac
+* @adambard
+* @akin_so
+* @ayohan
+* @badosu
+* @josemarluedke
+* @napcode
+* @robtrac
+* @rrichardson
+* @sbuljac
 
 ## Backers via PayPal
 
-- @mchalkley
+* @mchalkley
 
 ## Backers via OpenCollective
 
-- Tal Amuyal
-- Akinola Sowemimo
-- Martijn Arts
-- Amadeus Folego
+* Tal Amuyal
+* Akinola Sowemimo
+* Martijn Arts
+* Amadeus Folego
 
 <a href="https://opencollective.com/oni/tiers/backer/0/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/0/avatar.png"></a>
 <a href="https://opencollective.com/oni/tiers/backer/1/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/1/avatar.png"></a>

CONTRIBUTING.md

@@ -4,31 +4,64 @@
 
 First, thank you for considering contributing to oni! It's people like you that make the open source community such a great community! 😊
 
-We welcome any type of contribution, not only code. You can help with 
-- **QA**: file bug reports, the more details you can give the better (e.g. screenshots with the console open)
-- **Marketing**: writing blog posts, howto's, printing stickers, ...
-- **Community**: presenting the project at meetups, organizing a dedicated meetup for the local community, ...
-- **Code**: take a look at the [open issues](issues). Even if you can't write code, commenting on them, showing that you care about a given issue matters. It helps us triage them.
-- **Money**: we welcome financial contributions in full transparency on our [open collective](https://opencollective.com/oni).
+We welcome any type of contribution, not only code. You can help with
+
+* **QA**: file bug reports, the more details you can give the better (e.g. screenshots with the console open)
+* **Marketing**: writing blog posts, howto's, printing stickers, ...
+* **Community**: presenting the project at meetups, organizing a dedicated meetup for the local community, ...
+* **Code**: take a look at the [open issues](issues). Even if you can't write code, commenting on them, showing that you care about a given issue matters. It helps us triage them.
+* **Money**: we welcome financial contributions in full transparency on our [open collective](https://opencollective.com/oni).
 
 ## Your First Contribution
 
-Working on your first Pull Request? You can learn how from this *free* series, [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github).
+Working on your first Pull Request? You can learn how from this _free_ series, [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github).
 
 ## Submitting code
 
-Any code change should be submitted as a pull request. The description should explain what the code does and give steps to execute it. The pull request should also contain tests.
+Any code change should be submitted as a pull request. The description should explain what the code does and give steps to execute it. The pull request should also contain tests. We welcome and appreciate pull requests!
+
+## Code review guidelines
 
-## Code review process
+* Keep PRs **small and scoped**. The bigger the pull request, the longer it will take to review and merge. Break down large pull requests into smaller incremental chunks - this will help catch issues earlier and be easier on both you and the maintainer.
+* Following from the previous bullet point, **do not include unrelated changes in a PR**. It can be tempting to include extra styling changes or additional functionality, but these should be added as separate PRs.
+* Think of each PR as **improving the quality of the codebase**. Codebases tend towards entropy and disorder unless actively managed - make sure that your change moves the quality needle in the right direction. This can take a variety of forms, including adding test coverage, reducing coupling, etc. _As we are a small team moving fast, we cannot afford to accumulate technical debt._
+* If there is ambiguity in terms of design, architecture, or implementation, it's best to get **feedback before implementing**, to save both you and the maintainer time. If you're not sure, feel free to ask!
+* For your first few PRs, **don't try and change the world** - pick some small issues and get familiar with the codebase. Then, work your way up to bigger issues - this will set you up for success.
 
-The bigger the pull request, the longer it will take to review and merge. Try to break down large pull requests in smaller chunks that are easier to review and merge.
-It is also always helpful to have some context for your pull request. What was the purpose? Why does it matter to you?
+PRs require approval from one other person, either a maintainer or a contributor. Keep in mind that when you approve code, you are accountable for it, too! Reviewers are the gatekeepers of quality and ensuring adherence to the guidelines above.
 
 ## Financial contributions
 
 We also welcome financial contributions in full transparency on our [open collective](https://opencollective.com/oni).
 Anyone can file an expense. If the expense makes sense for the development of the community, it will be "merged" in the ledger of our open collective by the core contributors and the person who filed the expense will be reimbursed.
 
+### Bounties
+
+The primary allotment of our [open collective](https://opencollective.com/oni) budget is dedicated to bounties. Developing features and fixing bugs is a loit of work, and those go directly to the developers doing this work via bounties. It is the role of the _maintainer_ to set bounties and clear completion criteria. Issues that have a bounty associated with them will have a `bounty` label as well as an amount, ie, `bounty-50` means a $50 bounty.
+
+* Guidelines:
+    * The fix for the bug/feature/issue _MUST_ be complete and _MUST_ be covered by tests to be eligible for a bounty.
+    * If you begin working on an issue with an associated bounty, open a PR with "WIP" and the bug number in the title, as well as reference the issue #. This is important to reduce duplicate work.
+    * Upon completion, bounties are payable via an [open collective expense].
+
+If you questions about the guidelines, please don't hesitate to contact the maintainer.
+
+## Roles
+
+There are various roles and responsibilities in managing an open-source project. Users that are active and have a positive impact on the project and community will be recognized and have the option of assuming additional responsibilities.
+
+* **Maintainer** - A maintainer communicates goals and drives the vision for the project. The maintainer is responsible for breaking down hurdles and supporting contributors. In addition, the maintainer triages issues, produces releases, assigns bounties, and establishes completion criteria. Today, there is one maintainer, but that isn't a strict requirement.
+* **Collaborator** - A collaborator is an established member of the project that is recognized for their impact and contributions. They can triage and close issues, approve PRs from other contributors / collaborators, and can approve expenses on our [open collective](https://opencollective.com/oni)
+* **Contributor** - A contributor is a developer that has submitted a successful PR for the project.
+
+### Becoming a collaborator
+
+A collaborator is a contributor who has been recognized for the impact they've had on the project, over a sustained period of time. In general, this means the following:
+
+* **Supporting the community** - helping others in issues and chat, supporting new developers, creating a positive and supportive environment.
+* **Technical impact** - involvement in a core technical piece of the editor, or a broad impact on the ecosystem.
+* **Positive and collaborative mindset** - creating good vibes, willingness to give and receive constructive feedback, being a team player.
+
 ## Questions
 
 If you have any questions, create an [issue](issue) (protip: do a quick search first to see if someone else didn't ask the same question before!).
@@ -41,14 +74,12 @@ You can also reach us at hello@oni.opencollective.com.
 Thank you to all the people who have already contributed to oni!
 <a href="graphs/contributors"><img src="https://opencollective.com/oni/contributors.svg?width=890" /></a>
 
-
 ### Backers
 
 Thank you to all our backers! [[Become a backer](https://opencollective.com/oni#backer)]
 
 <a href="https://opencollective.com/oni#backers" target="_blank"><img src="https://opencollective.com/oni/backers.svg?width=890"></a>
 
-
 ### Sponsors
 
 Thank you to all our sponsors! (please ask your company to also support this open source project by [becoming a sponsor](https://opencollective.com/oni#sponsor))
@@ -64,4 +95,4 @@ Thank you to all our sponsors! (please ask your company to also support this ope
 <a href="https://opencollective.com/oni/sponsor/8/website" target="_blank"><img src="https://opencollective.com/oni/sponsor/8/avatar.svg"></a>
 <a href="https://opencollective.com/oni/sponsor/9/website" target="_blank"><img src="https://opencollective.com/oni/sponsor/9/avatar.svg"></a>
 
-<!-- This `CONTRIBUTING.md` is based on @nayafia's template https://github.com/nayafia/contributing-template -->
+<!-- This `CONTRIBUTING.md` is based on @nayafia's template https://github.com/nayafia/contributing-template -->