Skip to content

Commit

Permalink
commit 077e470
Browse files Browse the repository at this point in the history
077e470 fix(format): onTypeFormatting position (#3472)
d5a4ee8 fix(float): check nvim 0.5.1 for zindex
f59f77c fix(source-language): fix range of textEdit
b532597 chore(handler): fix types for openCommand
4913238 chore(doc): add coc.preferences.semanticTokensHighlights
cbd326b feat(typings): export SemanticTokensBuilder (#3357)
2ff2029 fix(api): preserve register content
19446d6 feat(sources): avoid \ as trigger character
69e8750 fix: typos in schema & docs (#3446)
8175e7a fix(highlight.vim): use default value for compose_hlgroup (#3514)
  • Loading branch information
chemzqm committed Dec 21, 2021
1 parent ef04d1f commit 37559aa
Show file tree
Hide file tree
Showing 6 changed files with 167 additions and 151 deletions.
6 changes: 6 additions & 0 deletions autoload/coc/api.vim
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,10 @@ function! s:funcs.buf_set_lines(bufnr, start, end, strict, ...) abort
if delCount
let start = startLnum + len(replacement)
let saved_reg = @"
let system_reg = @*
silent execute start . ','.(start + delCount - 1).'d'
let @" = saved_reg
let @* = system_reg
endif
endif
call winrestview(storeView)
Expand All @@ -396,8 +398,12 @@ function! s:funcs.buf_set_lines(bufnr, start, end, strict, ...) abort
endif
if delCount
let start = startLnum + len(replacement)
let saved_reg = @"
let system_reg = @*
"8.1.0039
silent call deletebufline(a:bufnr, start, start + delCount - 1)
let @" = saved_reg
let @* = system_reg
endif
endif
endif
Expand Down
8 changes: 4 additions & 4 deletions autoload/coc/float.vim
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ function! coc#float#nvim_close_btn(config, winid, border, hlgroup, winblend, rel
\ 'focusable': v:true,
\ 'style': 'minimal',
\ }
if has('nvim-0.5.0')
if has('nvim-0.5.1')
let config['zindex'] = 300
endif
if winid
Expand Down Expand Up @@ -318,7 +318,7 @@ function! coc#float#nvim_right_pad(config, winid, hlgroup, winblend, related) ab
\ 'focusable': v:false,
\ 'style': 'minimal',
\ }
if has('nvim-0.5.0')
if has('nvim-0.5.1')
let config['zindex'] = 300
endif
if winid && nvim_win_is_valid(winid)
Expand Down Expand Up @@ -359,7 +359,7 @@ function! coc#float#nvim_buttons(config, winid, buttons, borderbottom, pad, hlgr
\ 'focusable': 1,
\ 'style': 'minimal',
\ }
if has('nvim-0.5.0')
if has('nvim-0.5.1')
let config['zindex'] = 300
if a:shadow
let config['border'] = 'shadow'
Expand Down Expand Up @@ -447,7 +447,7 @@ function! coc#float#nvim_scrollbar(winid) abort
\ 'focusable': v:false,
\ 'style': 'minimal',
\ }
if has('nvim-0.5.0')
if has('nvim-0.5.1')
let opts['zindex'] = 300
endif
if id
Expand Down
3 changes: 3 additions & 0 deletions autoload/coc/highlight.vim
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,9 @@ function! coc#highlight#compose_hlgroup(fgGroup, bgGroup) abort
elseif underline
let cmd .= ' cterm=underline gui=underline'
endif
if cmd ==# 'silent hi ' . hlGroup
return 'Normal'
endif
execute cmd
return hlGroup
endfunction
Expand Down
282 changes: 141 additions & 141 deletions build/index.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions data/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"formatterPriority": {
"type": "number",
"default": 0,
"description": "Priority of this languageserver's fomatter."
"description": "Priority of this languageserver's formatter."
},
"env": {
"type": "object",
Expand Down Expand Up @@ -467,12 +467,12 @@
"default": 5000,
"minimum": 500,
"maximum": 15000,
"description": "Timeout for completion, in miliseconds."
"description": "Timeout for completion, in milliseconds."
},
"suggest.minTriggerInputLength": {
"type": "integer",
"default": 1,
"description": "Mininal input length for trigger completion, default 1"
"description": "Minimal input length for trigger completion, default 1"
},
"suggest.triggerCompletionWait": {
"type": "integer",
Expand Down Expand Up @@ -583,7 +583,7 @@
},
"diagnostic.highlighLimit": {
"type": "number",
"description": "Limit count for highlighted diagnostics, too many diagnostic highlights could make vim stop responsing",
"description": "Limit count for highlighted diagnostics, too many diagnostic highlights could make vim stop responding",
"default": 1000
},
"diagnostic.autoRefresh": {
Expand Down Expand Up @@ -752,7 +752,7 @@
"default": 500,
"minimum": 200,
"maximum": 1000,
"description": "Timeout for trigger signature help, in miliseconds."
"description": "Timeout for trigger signature help, in milliseconds."
},
"signature.target": {
"type": "string",
Expand Down
9 changes: 8 additions & 1 deletion doc/coc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ Built-in configurations:~
"diagnostic.highlighLimit":~

Limit count for highlighted diagnostics, too many diagnostic
highlights could make vim stop responsing.
highlights could make vim stop responding.

default: `1000`

Expand Down Expand Up @@ -900,6 +900,13 @@ Built-in configurations:~

Will save handler timeout, default: `500`

"coc.preferences.semanticTokensHighlights"~

Enable semanticTokens highlight if language server support it.
Default: `true`

Note: this configuration is expected to change in the future.

*coc-config-cursors*

"cursors.cancelKey":~
Expand Down

0 comments on commit 37559aa

Please sign in to comment.