Skip to content

Commit 65307cf

Browse files
authored
Merge branch 'master' into fix_mark_for_chekbox_parent
2 parents 3329a75 + 4ed0785 commit 65307cf

13 files changed

Lines changed: 464 additions & 142 deletions

.all-contributorsrc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,42 @@
129129
"code",
130130
"bug"
131131
]
132+
},
133+
{
134+
"login": "cpence",
135+
"name": "Charles Pence",
136+
"avatar_url": "https://avatars.githubusercontent.com/u/297075?v=4",
137+
"profile": "https://codeberg.org/cpence",
138+
"contributions": [
139+
"code"
140+
]
141+
},
142+
{
143+
"login": "mstojanovic",
144+
"name": "Marko Stojanovic",
145+
"avatar_url": "https://avatars.githubusercontent.com/u/3449343?v=4",
146+
"profile": "https://github.com/mstojanovic",
147+
"contributions": [
148+
"doc"
149+
]
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+
]
132168
}
133169
],
134170
"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

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
doc/tags
12
vendor/
23
spec/examples.txt
4+
doc/tags

.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

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ group :test do
77
gem 'pry-byebug'
88
gem 'rake', '~> 12.3.3'
99
gem 'rspec'
10+
gem 'rspec-retry'
1011
gem 'vimrunner'
1112
end

Gemfile.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ GEM
2424
rspec-mocks (3.8.0)
2525
diff-lcs (>= 1.2.0, < 2.0)
2626
rspec-support (~> 3.8.0)
27+
rspec-retry (0.6.2)
28+
rspec-core (> 3.3)
2729
rspec-support (3.8.0)
2830
vimrunner (0.3.4)
2931

@@ -35,6 +37,7 @@ DEPENDENCIES
3537
pry-byebug
3638
rake (~> 12.3.3)
3739
rspec
40+
rspec-retry
3841
vimrunner
3942

4043
BUNDLED WITH

README.md

Lines changed: 81 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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)
4-
53
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
6-
[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors-)
4+
[![All Contributors](https://img.shields.io/badge/all_contributors-16-orange.svg?style=flat-square)](#contributors-)
75
<!-- ALL-CONTRIBUTORS-BADGE:END -->
86

7+
> :information_source: Looking for help/maintainers https://github.com/dkarter/bullets.vim/issues/126
8+
99
# Description
1010

1111
Bullets.vim is a Vim plugin for automated bullet lists.
@@ -22,10 +22,17 @@ Renumbering lines:
2222

2323
# Installation
2424

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

2734
```vim
28-
Plug 'dkarter/bullets.vim'
35+
Plug 'bullets-vim/bullets.vim'
2936
```
3037

3138
Then source your bundle file and run `:PlugInstall`.
@@ -70,6 +77,36 @@ Add a leader key before default mappings:
7077
let g:bullets_mapping_leader = '<M-b>' " default = ''
7178
```
7279

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

75112
```vim
@@ -101,6 +138,15 @@ let g:bullets_pad_right = 0
101138
" ^ no extra space between bullet and text
102139
```
103140

141+
Indent new bullets when the previous bullet ends with a colon:
142+
143+
```vim
144+
let g:bullets_auto_indent_after_colon = 1 " default = 1
145+
" a. text
146+
" b. text:
147+
" i. text
148+
```
149+
104150
Maximum number of alphabetic characters to use for bullets:
105151

106152
```vim
@@ -129,7 +175,7 @@ let g:bullets_outline_levels = ['ROM', 'ABC', 'num', 'abc', 'rom', 'std-', 'std*
129175
" std[-/*/+] = standard bullets using a hyphen (-), asterisk (*), or plus (+) as the marker.
130176
" chk = checkbox (- [ ])
131177
132-
let g:bullets_outline_levels = ['num', 'abc', 'std*']
178+
let g:bullets_outline_levels = ['num', 'abc', 'std-']
133179
" Example [keys pressed to get this bullet]:
134180
" 1. first parent
135181
" a. child bullet [ <cr><C-t> ]
@@ -175,7 +221,7 @@ let g:bullets_nested_checkboxes = 1 " default = 1
175221
" - [ ] child bullet [ type <leader>x ]
176222
" - [ ] sub-child
177223
" - [ ] child bullet
178-
"
224+
"
179225
" Result:
180226
" - [o] first bullet [ <- indicates partial completion of sub-tasks ]
181227
" - [X] child bullet
@@ -216,18 +262,18 @@ let g:bullets_checkbox_partials_toggle = 1 " default = 1
216262
" - [o] partially checked [ type <leader>x ]
217263
" - [x] sub bullet
218264
" - [ ] sub bullet
219-
"
265+
"
220266
" Result:
221267
" - [x] checked
222268
" - [x] sub bullet
223269
" - [x] sub bullet
224-
"
270+
"
225271
" Example 2:
226272
let g:bullets_checkbox_partials_toggle = 0
227273
" - [o] partially checked [ type <leader>x ]
228274
" - [x] sub bullet
229275
" - [ ] sub bullet
230-
"
276+
"
231277
" Result:
232278
" - [ ] checked
233279
" - [ ] sub bullet
@@ -260,7 +306,7 @@ let g:bullets_set_mappings = 0
260306
Add a leader key before default mappings:
261307

262308
```vim
263-
let g:bullets_mapping_leader = '<M-b>'
309+
let g:bullets_mapping_leader = '<M-b>'
264310
" Set <M-b> to the leader before all default mappings:
265311
" Example: renumbering becomes `<M-b>gN` instead of just `gN`
266312
```
@@ -338,22 +384,30 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
338384
<!-- prettier-ignore-start -->
339385
<!-- markdownlint-disable -->
340386
<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-
</tr>
387+
<tbody>
388+
<tr>
389+
<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/bullets-vim/bullets.vim/commits?author=dkarter" title="Code">💻</a> <a href="https://github.com/bullets-vim/bullets.vim/commits?author=dkarter" title="Tests">⚠️</a> <a href="https://github.com/bullets-vim/bullets.vim/commits?author=dkarter" title="Documentation">📖</a> <a href="#maintenance-dkarter" title="Maintenance">🚧</a></td>
390+
<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/bullets-vim/bullets.vim/commits?author=cormacrelf" title="Code">💻</a> <a href="https://github.com/bullets-vim/bullets.vim/issues?q=author%3Acormacrelf" title="Bug reports">🐛</a></td>
391+
<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/bullets-vim/bullets.vim/commits?author=kaymmm" title="Code">💻</a> <a href="https://github.com/bullets-vim/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>
392+
<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/bullets-vim/bullets.vim/commits?author=yous" title="Code">💻</a> <a href="https://github.com/bullets-vim/bullets.vim/commits?author=yous" title="Documentation">📖</a></td>
393+
<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/bullets-vim/bullets.vim/commits?author=adriaanzon" title="Code">💻</a></td>
394+
<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/bullets-vim/bullets.vim/commits?author=eater" title="Code">💻</a></td>
395+
<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/bullets-vim/bullets.vim/commits?author=hut" title="Code">💻</a> <a href="https://github.com/bullets-vim/bullets.vim/commits?author=hut" title="Documentation">📖</a></td>
396+
</tr>
397+
<tr>
398+
<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/bullets-vim/bullets.vim/commits?author=mykoza" title="Code">💻</a> <a href="#ideas-mykoza" title="Ideas, Planning, & Feedback">🤔</a></td>
399+
<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/bullets-vim/bullets.vim/commits?author=noodlor" title="Code">💻</a></td>
400+
<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/bullets-vim/bullets.vim/commits?author=harshad1" title="Code">💻</a> <a href="https://github.com/bullets-vim/bullets.vim/issues?q=author%3Aharshad1" title="Bug reports">🐛</a></td>
401+
<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>
402+
<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/bullets-vim/bullets.vim/commits?author=samgriesemer" title="Code">💻</a> <a href="https://github.com/bullets-vim/bullets.vim/issues?q=author%3Asamgriesemer" title="Bug reports">🐛</a></td>
403+
<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/bullets-vim/bullets.vim/commits?author=cpence" title="Code">💻</a></td>
404+
<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/bullets-vim/bullets.vim/commits?author=mstojanovic" title="Documentation">📖</a></td>
405+
</tr>
406+
<tr>
407+
<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/bullets-vim/bullets.vim/commits?author=clarkshaeffer" title="Documentation">📖</a></td>
408+
<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/bullets-vim/bullets.vim/commits?author=wenzel-hoffman" title="Code">💻</a></td>
409+
</tr>
410+
</tbody>
357411
</table>
358412

359413
<!-- markdownlint-restore -->

doc/bullets.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
*bullets.txt* Automated Bullet Lists in Vim
22

33
Author: Dorian Karter <https://doriankarter.com>
4-
License: MIT (see LICENSE.md in https://github.com/dkarter/bullets.vim)
4+
License: MIT (see LICENSE.md in https://github.com/bullets-vim/bullets.vim)
55

66
TABLE OF CONTENTS *bullets-toc*
77

0 commit comments

Comments
 (0)