Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Commit 304bb05

Browse files
Merge pull request #196 from feline-nvim/develop
2 parents 29f5cbf + 8e5a5ac commit 304bb05

File tree

21 files changed

+387
-328
lines changed

21 files changed

+387
-328
lines changed

.github/release.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
changelog:
2+
categories:
3+
- title: New Features
4+
labels:
5+
- 'kind: feature'
6+
- title: Fixed Issues
7+
labels:
8+
- 'kind: fix'
9+
- title: Removes
10+
labels:
11+
- 'kind: deprecated'
12+
- title: Refactor
13+
labels:
14+
- 'kind: refactor'
15+
- title: Dependencies
16+
labels:
17+
- 'kind: dependencies'
18+
- title: Tests
19+
labels:
20+
- 'kind: tests'
21+
- title: Chore
22+
labels:
23+
- 'kind: chore'
24+
- title: CI
25+
labels:
26+
- 'kind: ci'
27+
- title: Documentation
28+
labels:
29+
- 'kind: documentation'
30+
- title: Style
31+
labels:
32+
- 'kind: style'
33+
- title: Performance
34+
labels:
35+
- 'kind: performance'
36+
- title: Test
37+
labels:
38+
- 'kind: test'
39+
- title: Other Changes
40+
labels:
41+
- '*'

.github/workflows/pr_check.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Pull request check
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
format:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- uses: JohnnyMorganz/stylua-action@1.0.0
12+
with:
13+
token: ${{ secrets.GITHUB_TOKEN }}
14+
args: --check .
15+
16+
block-fixup:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
- name: Block Fixup Commit Merge
22+
uses: 13rac1/block-fixup-merge-action@v2.0.0

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,5 @@ Before you make a Pull Request, always make sure to:
6464

6565
### Standards and Styleguides
6666

67-
Feline has no strict coding standards or styleguides that you must follow while making changes. Just
68-
try to make sure that the styling in the new or modified code stays consistent with the old code.
67+
Feline uses [StyLua](https://github.com/JohnnyMorganz/StyLua) to format the code.
6968
For commits, always use [semantic commit messages](https://www.conventionalcommits.org/).

benchmark/startup.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ if not pcall(require, 'profiler') then
1818
vim.opt.packpath:append(tmpdir .. '/nvim/site')
1919

2020
if vim.fn.isdirectory(install_path) == 0 then
21-
vim.fn.system({'git', 'clone', 'https://github.com/norcalli/profiler.nvim', install_path})
21+
vim.fn.system({ 'git', 'clone', 'https://github.com/norcalli/profiler.nvim', install_path })
2222
end
2323
end
2424

2525
-- Setup gitsigns
2626
local ok, gitsigns = pcall(require, 'gitsigns')
27-
if ok then gitsigns.setup() end
27+
if ok then
28+
gitsigns.setup()
29+
end
2830

2931
-- Start benchmark
3032
require('profiler').wrap(require('feline').setup())

benchmark/statusline.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if not pcall(require, 'plenary.benchmark') then
1616
vim.opt.packpath:append(tmpdir .. '/nvim/site')
1717

1818
if vim.fn.isdirectory(install_path) == 0 then
19-
vim.fn.system({'git', 'clone', 'https://github.com/nvim-lua/plenary.nvim', install_path})
19+
vim.fn.system({ 'git', 'clone', 'https://github.com/nvim-lua/plenary.nvim', install_path })
2020
end
2121
end
2222

@@ -28,12 +28,12 @@ local function statusline_generator()
2828
gen.generate_statusline(true)
2929
end
3030

31-
benchmark("Feline statusline generation benchmark", {
31+
benchmark('Feline statusline generation benchmark', {
3232
runs = 10000,
3333
fun = {
3434
{
35-
"Generating statusline",
36-
statusline_generator
37-
}
38-
}
35+
'Generating statusline',
36+
statusline_generator,
37+
},
38+
},
3939
})

lua/feline/defaults.lua

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
return {
99
theme = {
10-
type = {'table', 'string'},
11-
default_value = 'default'
10+
type = { 'table', 'string' },
11+
default_value = 'default',
1212
},
1313
separators = {
1414
type = 'table',
@@ -33,8 +33,8 @@ return {
3333
left_rounded_thin = '',
3434
right_rounded = '',
3535
right_rounded_thin = '',
36-
circle = ''
37-
}
36+
circle = '',
37+
},
3838
},
3939
vi_mode_colors = {
4040
type = 'table',
@@ -54,8 +54,8 @@ return {
5454
['COMMAND'] = 'green',
5555
['SHELL'] = 'green',
5656
['TERM'] = 'green',
57-
['NONE'] = 'yellow'
58-
}
57+
['NONE'] = 'yellow',
58+
},
5959
},
6060
force_inactive = {
6161
type = 'table',
@@ -67,32 +67,32 @@ return {
6767
'^fugitive$',
6868
'^fugitiveblame$',
6969
'^qf$',
70-
'^help$'
70+
'^help$',
7171
},
7272
buftypes = {
73-
'^terminal$'
74-
}
75-
}
73+
'^terminal$',
74+
},
75+
},
7676
},
7777
disable = {
7878
type = 'table',
79-
default_value = {}
79+
default_value = {},
8080
},
8181
highlight_reset_triggers = {
8282
type = 'table',
8383
default_value = {
8484
'SessionLoadPost',
85-
'ColorScheme'
86-
}
85+
'ColorScheme',
86+
},
8787
},
8888
custom_providers = {
8989
type = 'table',
90-
default_value = {}
90+
default_value = {},
9191
},
9292
components = {
93-
type = 'table'
93+
type = 'table',
9494
},
9595
preset = {
96-
type = 'string'
97-
}
96+
type = 'string',
97+
},
9898
}

0 commit comments

Comments
 (0)