diff options
| -rw-r--r-- | runtime/doc/nvim_terminal_emulator.txt | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 7 | ||||
| -rw-r--r-- | scripts/lintcommit.lua | 5 | ||||
| -rw-r--r-- | test/old/testdir/test_filetype.vim | 6 |
4 files changed, 17 insertions, 3 deletions
diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt index 50a241f515..b98c96ec87 100644 --- a/runtime/doc/nvim_terminal_emulator.txt +++ b/runtime/doc/nvim_terminal_emulator.txt @@ -115,7 +115,7 @@ You can change the defaults with a TermOpen autocommand: >vim TERMINAL COLORS ~ The `{g,b}:terminal_color_x` variables control the terminal color palette, -where `x` is the color index between 0 and 255 inclusive. The variables are +where `x` is the color index between 0 and 15 inclusive. The variables are read during |TermOpen|. The value must be a color name or hexadecimal string. Example: >vim let g:terminal_color_4 = '#ff0000' diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 69fcb01e8c..fa4208e2a4 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -265,6 +265,7 @@ local extension = { end, cql = 'cqlang', crm = 'crm', + cr = 'crystal', csx = 'cs', cs = 'cs', csc = 'csc', @@ -349,6 +350,7 @@ local extension = { yaws = 'erlang', erb = 'eruby', rhtml = 'eruby', + esdl = 'esdl', ec = 'esqlc', EC = 'esqlc', strl = 'esterel', @@ -591,6 +593,7 @@ local extension = { lte = 'latte', ld = 'ld', ldif = 'ldif', + lean = 'lean', journal = 'ledger', ldg = 'ledger', ledger = 'ledger', @@ -906,6 +909,7 @@ local extension = { builder = 'ruby', rake = 'ruby', rs = 'rust', + sage = 'sage', sas = 'sas', sass = 'sass', sa = 'sather', @@ -1104,6 +1108,7 @@ local extension = { wdl = 'wdl', wm = 'webmacro', wbt = 'winbatch', + wit = 'wit', wml = 'wml', wsml = 'wsml', ad = 'xdefaults', @@ -1541,6 +1546,8 @@ local filename = { NEWS = function(path, bufnr) return require('vim.filetype.detect').news(bufnr) end, + ['env.nu'] = 'nu', + ['config.nu'] = 'nu', ['.ocamlinit'] = 'ocaml', ['.octaverc'] = 'octave', octaverc = 'octave', diff --git a/scripts/lintcommit.lua b/scripts/lintcommit.lua index 7e08ca4ea0..92b07c4f73 100644 --- a/scripts/lintcommit.lua +++ b/scripts/lintcommit.lua @@ -69,7 +69,7 @@ local function validate_commit(commit_message) end local before_colon = commit_split[1] - local after_colon = commit_split[2] + local after_colon = commit_split[#commit_split] -- Check if commit introduces a breaking change. if vim.endswith(before_colon, "!") then @@ -90,7 +90,7 @@ local function validate_commit(commit_message) -- Check if scope is appropriate if before_colon:match("%(") then - local scope = vim.trim(before_colon:match("%((.*)%)")) + local scope = vim.trim(commit_message:match("%((.-)%)")) if scope == '' then return [[Scope can't be empty]] @@ -234,6 +234,7 @@ function M._test() ['ci: Capitalized first word'] = false, ['ci: UPPER_CASE First Word'] = true, ['unknown: using unknown type'] = false, + ['feat(:grep): read from pipe'] = true, ['ci: you\'re saying this commit message just goes on and on and on and on and on and on for way too long?'] = false, } diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim index db2c7e1913..3c47c7eefa 100644 --- a/test/old/testdir/test_filetype.vim +++ b/test/old/testdir/test_filetype.vim @@ -133,6 +133,7 @@ let s:filename_checks = { \ 'cqlang': ['file.cql'], \ 'crm': ['file.crm'], \ 'crontab': ['crontab', 'crontab.file', '/etc/cron.d/file', 'any/etc/cron.d/file'], + \ 'crystal': ['file.cr'], \ 'cs': ['file.cs', 'file.csx'], \ 'csc': ['file.csc'], \ 'csdl': ['file.csdl'], @@ -191,6 +192,7 @@ let s:filename_checks = { \ 'epuppet': ['file.epp'], \ 'erlang': ['file.erl', 'file.hrl', 'file.yaws'], \ 'eruby': ['file.erb', 'file.rhtml'], + \ 'esdl': ['file.esdl'], \ 'esmtprc': ['anyesmtprc', 'esmtprc', 'some-esmtprc'], \ 'esqlc': ['file.ec', 'file.EC'], \ 'esterel': ['file.strl'], @@ -320,6 +322,7 @@ let s:filename_checks = { \ 'latte': ['file.latte', 'file.lte'], \ 'ld': ['file.ld'], \ 'ldif': ['file.ldif'], + \ 'lean': ['file.lean'], \ 'ledger': ['file.ldg', 'file.ledger', 'file.journal'], \ 'less': ['file.less'], \ 'lex': ['file.lex', 'file.l', 'file.lxx', 'file.l++'], @@ -410,6 +413,7 @@ let s:filename_checks = { \ 'nqc': ['file.nqc'], \ 'nroff': ['file.tr', 'file.nr', 'file.roff', 'file.tmac', 'file.mom', 'tmac.file'], \ 'nsis': ['file.nsi', 'file.nsh'], + \ 'nu': ['env.nu', 'config.nu'], \ 'obj': ['file.obj'], \ 'obse': ['file.obl', 'file.obse', 'file.oblivion', 'file.obscript'], \ 'ocaml': ['file.ml', 'file.mli', 'file.mll', 'file.mly', '.ocamlinit', 'file.mlt', 'file.mlp', 'file.mlip', 'file.mli.cppo', 'file.ml.cppo'], @@ -537,6 +541,7 @@ let s:filename_checks = { \ 'skill': ['file.il', 'file.ils', 'file.cdf'], \ 'cdc': ['file.cdc'], \ 'slang': ['file.sl'], + \ 'sage': ['file.sage'], \ 'slice': ['file.ice'], \ 'slpconf': ['/etc/slp.conf', 'any/etc/slp.conf'], \ 'slpreg': ['/etc/slp.reg', 'any/etc/slp.reg'], @@ -659,6 +664,7 @@ let s:filename_checks = { \ 'wget': ['.wgetrc', 'wgetrc'], \ 'wget2': ['.wget2rc', 'wget2rc'], \ 'winbatch': ['file.wbt'], + \ 'wit': ['file.wit'], \ 'wml': ['file.wml'], \ 'wsh': ['file.wsf', 'file.wsc'], \ 'wsml': ['file.wsml'], |