Skip to content

Commit aa97d0b

Browse files
authored
Merge branch 'master' into configuratble_bullet_styles
2 parents fdcc2d1 + d3a75d6 commit aa97d0b

6 files changed

Lines changed: 206 additions & 56 deletions

File tree

.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,24 @@
147147
"contributions": [
148148
"doc"
149149
]
150+
},
151+
{
152+
"login": "clarkshaeffer",
153+
"name": "Clark",
154+
"avatar_url": "https://avatars.githubusercontent.com/u/58539767?v=4",
155+
"profile": "https://github.com/clarkshaeffer",
156+
"contributions": [
157+
"doc"
158+
]
159+
},
160+
{
161+
"login": "wenzel-hoffman",
162+
"name": "Wenzel",
163+
"avatar_url": "https://avatars.githubusercontent.com/u/111205756?v=4",
164+
"profile": "https://github.com/wenzel-hoffman",
165+
"contributions": [
166+
"code"
167+
]
150168
}
151169
],
152170
"contributorsPerLine": 7,

.github/workflows/test.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# This workflow uses actions that are not certified by GitHub.
2+
# They are provided by a third-party and are governed by
3+
# separate terms of service, privacy policy, and support
4+
# documentation.
5+
# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
6+
# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
7+
8+
name: Test
9+
10+
on:
11+
push:
12+
branches: [ master ]
13+
pull_request:
14+
branches: [ master ]
15+
16+
jobs:
17+
test:
18+
19+
runs-on: ubuntu-latest
20+
strategy:
21+
matrix:
22+
ruby-version: ["3.0"]
23+
24+
steps:
25+
- name: Checkout Code
26+
uses: actions/checkout@v2
27+
28+
- name: Install dependencies
29+
run: sudo apt install vim-gtk3 xvfb
30+
31+
- name: Set up Ruby
32+
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
33+
# change this to (see https://github.com/ruby/setup-ruby#versioning):
34+
# uses: ruby/setup-ruby@v1
35+
uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
36+
with:
37+
ruby-version: ${{ matrix.ruby-version }}
38+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
39+
40+
- name: Run headless tests
41+
uses: GabrielBB/xvfb-action@v1
42+
with:
43+
run: bundle exec rspec

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 2.7.0
1+
ruby 3.1.0

README.md

Lines changed: 71 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
![Bullets.vim](img/bullets-vim-logo.svg)
22

3-
[![Build Status](https://travis-ci.org/dkarter/bullets.vim.svg?branch=master)](https://travis-ci.org/dkarter/bullets.vim)
3+
[![Build Status](https://travis-ci.org/dkarter/bullets.vim.svg?branch=master)](https://travis-ci.org/dkarter/bullets.vim)
44

55
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
6-
[![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](#contributors-)
6+
[![All Contributors](https://img.shields.io/badge/all_contributors-16-orange.svg?style=flat-square)](#contributors-)
77
<!-- ALL-CONTRIBUTORS-BADGE:END -->
88

9+
> :information_source: Looking for help/maintainers https://github.com/dkarter/bullets.vim/issues/126
10+
911
# Description
1012

1113
Bullets.vim is a Vim plugin for automated bullet lists.
@@ -22,7 +24,14 @@ Renumbering lines:
2224

2325
# Installation
2426

25-
With VimPlug:
27+
### With Vim 8.1+ native package manager:
28+
Clone into
29+
30+
`.vim/pack/plugins/start`
31+
32+
Make sure to include `packloadall` in your `vimrc`.
33+
34+
### With VimPlug:
2635

2736
```vim
2837
Plug 'dkarter/bullets.vim'
@@ -70,6 +79,36 @@ Add a leader key before default mappings:
7079
let g:bullets_mapping_leader = '<M-b>' " default = ''
7180
```
7281

82+
Customize key mappings:
83+
84+
```vim
85+
let g:bullets_set_mappings = 0 " disable adding default key mappings, default = 1
86+
87+
" default = []
88+
" N.B. You can set these mappings as-is without using this g:bullets_custom_mappings option but it
89+
" will apply in this case for all file types while when using g:bullets_custom_mappings it would
90+
" take into account file types filter set in g:bullets_enabled_file_types, and also
91+
" g:bullets_enable_in_empty_buffers option.
92+
let g:bullets_custom_mappings = [
93+
\ ['imap', '<cr>', '<Plug>(bullets-newline)'],
94+
\ ['inoremap', '<C-cr>', '<cr>'],
95+
\
96+
\ ['nmap', 'o', '<Plug>(bullets-newline)'],
97+
\
98+
\ ['vmap', 'gN', '<Plug>(bullets-renumber)'],
99+
\ ['nmap', 'gN', '<Plug>(bullets-renumber)'],
100+
\
101+
\ ['nmap', '<leader>x', '<Plug>(bullets-toggle-checkbox)'],
102+
\
103+
\ ['imap', '<C-t>', '<Plug>(bullets-demote)'],
104+
\ ['nmap', '>>', '<Plug>(bullets-demote)'],
105+
\ ['vmap', '>', '<Plug>(bullets-demote)'],
106+
\ ['imap', '<C-d>', '<Plug>(bullets-promote)'],
107+
\ ['nmap', '<<', '<Plug>(bullets-promote)'],
108+
\ ['vmap', '<', '<Plug>(bullets-promote)'],
109+
\ ]
110+
```
111+
73112
Enable/disable deleting the last empty bullet when hitting `<cr>` (insert mode) or `o` (normal mode):
74113

75114
```vim
@@ -175,7 +214,7 @@ let g:bullets_nested_checkboxes = 1 " default = 1
175214
" - [ ] child bullet [ type <leader>x ]
176215
" - [ ] sub-child
177216
" - [ ] child bullet
178-
"
217+
"
179218
" Result:
180219
" - [o] first bullet [ <- indicates partial completion of sub-tasks ]
181220
" - [X] child bullet
@@ -216,18 +255,18 @@ let g:bullets_checkbox_partials_toggle = 1 " default = 1
216255
" - [o] partially checked [ type <leader>x ]
217256
" - [x] sub bullet
218257
" - [ ] sub bullet
219-
"
258+
"
220259
" Result:
221260
" - [x] checked
222261
" - [x] sub bullet
223262
" - [x] sub bullet
224-
"
263+
"
225264
" Example 2:
226265
let g:bullets_checkbox_partials_toggle = 0
227266
" - [o] partially checked [ type <leader>x ]
228267
" - [x] sub bullet
229268
" - [ ] sub bullet
230-
"
269+
"
231270
" Result:
232271
" - [ ] checked
233272
" - [ ] sub bullet
@@ -260,7 +299,7 @@ let g:bullets_set_mappings = 0
260299
Add a leader key before default mappings:
261300

262301
```vim
263-
let g:bullets_mapping_leader = '<M-b>'
302+
let g:bullets_mapping_leader = '<M-b>'
264303
" Set <M-b> to the leader before all default mappings:
265304
" Example: renumbering becomes `<M-b>gN` instead of just `gN`
266305
```
@@ -338,24 +377,30 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
338377
<!-- prettier-ignore-start -->
339378
<!-- markdownlint-disable -->
340379
<table>
341-
<tr>
342-
<td align="center"><a href="https://doriankarter.com"><img src="https://avatars3.githubusercontent.com/u/551858?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dorian Karter</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=dkarter" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=dkarter" title="Tests">⚠️</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=dkarter" title="Documentation">📖</a> <a href="#maintenance-dkarter" title="Maintenance">🚧</a></td>
343-
<td align="center"><a href="https://github.com/cormacrelf"><img src="https://avatars3.githubusercontent.com/u/378760?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cormac Relf</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=cormacrelf" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/issues?q=author%3Acormacrelf" title="Bug reports">🐛</a></td>
344-
<td align="center"><a href="http://keithmiyake.info"><img src="https://avatars1.githubusercontent.com/u/2266804?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Keith Miyake</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=kaymmm" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=kaymmm" title="Documentation">📖</a> <a href="#ideas-kaymmm" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-kaymmm" title="Maintenance">🚧</a></td>
345-
<td align="center"><a href="https://yous.be"><img src="https://avatars0.githubusercontent.com/u/853977?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chayoung You</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=yous" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=yous" title="Documentation">📖</a></td>
346-
<td align="center"><a href="https://github.com/adriaanzon"><img src="https://avatars3.githubusercontent.com/u/4326420?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adriaan Zonnenberg</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=adriaanzon" title="Code">💻</a></td>
347-
<td align="center"><a href="https://github.com/eater"><img src="https://avatars3.githubusercontent.com/u/106199?v=4?s=100" width="100px;" alt=""/><br /><sub><b>eater</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=eater" title="Code">💻</a></td>
348-
<td align="center"><a href="https://github.com/hut"><img src="https://avatars1.githubusercontent.com/u/90548?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hut</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=hut" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=hut" title="Documentation">📖</a></td>
349-
</tr>
350-
<tr>
351-
<td align="center"><a href="https://github.com/mykoza"><img src="https://avatars1.githubusercontent.com/u/48719773?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mykoza</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=mykoza" title="Code">💻</a> <a href="#ideas-mykoza" title="Ideas, Planning, & Feedback">🤔</a></td>
352-
<td align="center"><a href="https://github.com/noodlor"><img src="https://avatars3.githubusercontent.com/u/49209345?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noodlor</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=noodlor" title="Code">💻</a></td>
353-
<td align="center"><a href="https://github.com/harshad1"><img src="https://avatars0.githubusercontent.com/u/1940940?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Harshad Srinivasan</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=harshad1" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/issues?q=author%3Aharshad1" title="Bug reports">🐛</a></td>
354-
<td align="center"><a href="https://erickchacon.github.io/"><img src="https://avatars2.githubusercontent.com/u/7862458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Erick A. Chacón Montalván</b></sub></a><br /><a href="#ideas-ErickChacon" title="Ideas, Planning, & Feedback">🤔</a></td>
355-
<td align="center"><a href="https://samgriesemer.com"><img src="https://avatars.githubusercontent.com/u/19940657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Griesemer</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=samgriesemer" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/issues?q=author%3Asamgriesemer" title="Bug reports">🐛</a></td>
356-
<td align="center"><a href="https://codeberg.org/cpence"><img src="https://avatars.githubusercontent.com/u/297075?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Charles Pence</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=cpence" title="Code">💻</a></td>
357-
<td align="center"><a href="https://github.com/mstojanovic"><img src="https://avatars.githubusercontent.com/u/3449343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marko Stojanovic</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=mstojanovic" title="Documentation">📖</a></td>
358-
</tr>
380+
<tbody>
381+
<tr>
382+
<td align="center"><a href="https://doriankarter.com"><img src="https://avatars3.githubusercontent.com/u/551858?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dorian Karter</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=dkarter" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=dkarter" title="Tests">⚠️</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=dkarter" title="Documentation">📖</a> <a href="#maintenance-dkarter" title="Maintenance">🚧</a></td>
383+
<td align="center"><a href="https://github.com/cormacrelf"><img src="https://avatars3.githubusercontent.com/u/378760?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cormac Relf</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=cormacrelf" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/issues?q=author%3Acormacrelf" title="Bug reports">🐛</a></td>
384+
<td align="center"><a href="http://keithmiyake.info"><img src="https://avatars1.githubusercontent.com/u/2266804?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Keith Miyake</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=kaymmm" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=kaymmm" title="Documentation">📖</a> <a href="#ideas-kaymmm" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-kaymmm" title="Maintenance">🚧</a></td>
385+
<td align="center"><a href="https://yous.be"><img src="https://avatars0.githubusercontent.com/u/853977?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chayoung You</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=yous" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=yous" title="Documentation">📖</a></td>
386+
<td align="center"><a href="https://github.com/adriaanzon"><img src="https://avatars3.githubusercontent.com/u/4326420?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adriaan Zonnenberg</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=adriaanzon" title="Code">💻</a></td>
387+
<td align="center"><a href="https://github.com/eater"><img src="https://avatars3.githubusercontent.com/u/106199?v=4?s=100" width="100px;" alt=""/><br /><sub><b>eater</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=eater" title="Code">💻</a></td>
388+
<td align="center"><a href="https://github.com/hut"><img src="https://avatars1.githubusercontent.com/u/90548?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hut</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=hut" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/commits?author=hut" title="Documentation">📖</a></td>
389+
</tr>
390+
<tr>
391+
<td align="center"><a href="https://github.com/mykoza"><img src="https://avatars1.githubusercontent.com/u/48719773?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mykoza</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=mykoza" title="Code">💻</a> <a href="#ideas-mykoza" title="Ideas, Planning, & Feedback">🤔</a></td>
392+
<td align="center"><a href="https://github.com/noodlor"><img src="https://avatars3.githubusercontent.com/u/49209345?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noodlor</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=noodlor" title="Code">💻</a></td>
393+
<td align="center"><a href="https://github.com/harshad1"><img src="https://avatars0.githubusercontent.com/u/1940940?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Harshad Srinivasan</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=harshad1" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/issues?q=author%3Aharshad1" title="Bug reports">🐛</a></td>
394+
<td align="center"><a href="https://erickchacon.github.io/"><img src="https://avatars2.githubusercontent.com/u/7862458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Erick A. Chacón Montalván</b></sub></a><br /><a href="#ideas-ErickChacon" title="Ideas, Planning, & Feedback">🤔</a></td>
395+
<td align="center"><a href="https://samgriesemer.com"><img src="https://avatars.githubusercontent.com/u/19940657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Griesemer</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=samgriesemer" title="Code">💻</a> <a href="https://github.com/dkarter/bullets.vim/issues?q=author%3Asamgriesemer" title="Bug reports">🐛</a></td>
396+
<td align="center"><a href="https://codeberg.org/cpence"><img src="https://avatars.githubusercontent.com/u/297075?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Charles Pence</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=cpence" title="Code">💻</a></td>
397+
<td align="center"><a href="https://github.com/mstojanovic"><img src="https://avatars.githubusercontent.com/u/3449343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marko Stojanovic</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=mstojanovic" title="Documentation">📖</a></td>
398+
</tr>
399+
<tr>
400+
<td align="center"><a href="https://github.com/clarkshaeffer"><img src="https://avatars.githubusercontent.com/u/58539767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Clark</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=clarkshaeffer" title="Documentation">📖</a></td>
401+
<td align="center"><a href="https://github.com/wenzel-hoffman"><img src="https://avatars.githubusercontent.com/u/111205756?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wenzel</b></sub></a><br /><a href="https://github.com/dkarter/bullets.vim/commits?author=wenzel-hoffman" title="Code">💻</a></td>
402+
</tr>
403+
</tbody>
359404
</table>
360405

361406
<!-- markdownlint-restore -->

0 commit comments

Comments
 (0)