Conditionally override cursor for props when "&cursorline" is set

diff --git a/autoload/lsp/diag.vim b/autoload/lsp/diag.vim
index e7aa84bf94f6da4b216eb8f97e5bd682126024e1..ec3f971e4548f1d41662eafff6d8d6abb41c7526 100644 (file)
--- a/autoload/lsp/diag.vim
+++ b/autoload/lsp/diag.vim
@@ -58,14 +58,26 @@ export def InitOnce()
   hlset([{name: 'LspDiagInlineWarning', default: true, linksto: 'SpellCap'}])
   hlset([{name: 'LspDiagInlineInfo', default: true, linksto: 'SpellRare'}])
   hlset([{name: 'LspDiagInlineHint', default: true, linksto: 'SpellLocal'}])
+
+  var override = &cursorline
+      && &cursorlineopt =~ '\<line\>\|\<screenline\>\|\<both\>'
+
   prop_type_add('LspDiagInlineError',
-                      { highlight: 'LspDiagInlineError', priority: 10 })
+                      { highlight: 'LspDiagInlineError',
+                        priority: 10,
+                        override: override })
   prop_type_add('LspDiagInlineWarning',
-                      { highlight: 'LspDiagInlineWarning', priority: 9 })
+                      { highlight: 'LspDiagInlineWarning',
+                        priority: 9,
+                        override: override })
   prop_type_add('LspDiagInlineInfo',
-                      { highlight: 'LspDiagInlineInfo', priority: 8 })
+                      { highlight: 'LspDiagInlineInfo',
+                        priority: 8,
+                        override: override })
   prop_type_add('LspDiagInlineHint',
-                      { highlight: 'LspDiagInlineHint', priority: 7 })
+                      { highlight: 'LspDiagInlineHint',
+                        priority: 7,
+                        override: override })
 
   hlset([{name: 'LspDiagVirtualText', default: true, linksto: 'LineNr'}])
   prop_type_add('LspDiagVirtualText', {highlight: 'LspDiagVirtualText',

diff --git a/autoload/lsp/lsp.vim b/autoload/lsp/lsp.vim
index 12549a076a66b74b4a810520c7414ad41e1e7910..d3f5e33eed37bdc5cb2587aad872361f8a8026f5 100644 (file)
--- a/autoload/lsp/lsp.vim
+++ b/autoload/lsp/lsp.vim
@@ -35,9 +35,12 @@ def LspInitOnce()
   hlset([{name: 'LspReadRef', default: true, linksto: 'DiffChange'}])
   hlset([{name: 'LspWriteRef', default: true, linksto: 'DiffDelete'}])
 
-  prop_type_add('LspTextRef', {highlight: 'LspTextRef'})
-  prop_type_add('LspReadRef', {highlight: 'LspReadRef'})
-  prop_type_add('LspWriteRef', {highlight: 'LspWriteRef'})
+  var override = &cursorline
+      && &cursorlineopt =~ '\<line\>\|\<screenline\>\|\<both\>'
+
+  prop_type_add('LspTextRef', {highlight: 'LspTextRef', override: override})
+  prop_type_add('LspReadRef', {highlight: 'LspReadRef', override: override})
+  prop_type_add('LspWriteRef', {highlight: 'LspWriteRef', override: override})
 
   diag.InitOnce()
   inlayhints.InitOnce()