Remove option checks around prop_ declarations

There is no reason not supporting enabling these options about
initialization instead.

diff --git a/autoload/lsp/diag.vim b/autoload/lsp/diag.vim
index b6daa3e16fd9e50e7a5a7ef6457a6fbdb9724f46..f812c401aaf0e89cd44b82c37bb6df22b10479b3 100644 (file)
--- a/autoload/lsp/diag.vim
+++ b/autoload/lsp/diag.vim
@@ -54,26 +54,22 @@ export def InitOnce()
     }
   ])
 
-  if opt.lspOptions.highlightDiagInline
-    hlset([{name: 'LspDiagInlineError', default: true, linksto: 'SpellBad'}])
-    hlset([{name: 'LspDiagInlineWarning', default: true, linksto: 'SpellCap'}])
-    hlset([{name: 'LspDiagInlineInfo', default: true, linksto: 'SpellRare'}])
-    hlset([{name: 'LspDiagInlineHint', default: true, linksto: 'SpellLocal'}])
-    prop_type_add('LspDiagInlineError',
-                       { highlight: 'LspDiagInlineError' })
-    prop_type_add('LspDiagInlineWarning',
-                       { highlight: 'LspDiagInlineWarning' })
-    prop_type_add('LspDiagInlineInfo',
-                       { highlight: 'LspDiagInlineInfo' })
-    prop_type_add('LspDiagInlineHint',
-                       { highlight: 'LspDiagInlineHint' })
-  endif
-
-  if opt.lspOptions.showDiagWithVirtualText
-    hlset([{name: 'LspDiagVirtualText', default: true, linksto: 'LineNr'}])
-    prop_type_add('LspDiagVirtualText', {highlight: 'LspDiagVirtualText',
-                                        override: true})
-  endif
+  hlset([{name: 'LspDiagInlineError', default: true, linksto: 'SpellBad'}])
+  hlset([{name: 'LspDiagInlineWarning', default: true, linksto: 'SpellCap'}])
+  hlset([{name: 'LspDiagInlineInfo', default: true, linksto: 'SpellRare'}])
+  hlset([{name: 'LspDiagInlineHint', default: true, linksto: 'SpellLocal'}])
+  prop_type_add('LspDiagInlineError',
+                      { highlight: 'LspDiagInlineError' })
+  prop_type_add('LspDiagInlineWarning',
+                      { highlight: 'LspDiagInlineWarning' })
+  prop_type_add('LspDiagInlineInfo',
+                      { highlight: 'LspDiagInlineInfo' })
+  prop_type_add('LspDiagInlineHint',
+                      { highlight: 'LspDiagInlineHint' })
+
+  hlset([{name: 'LspDiagVirtualText', default: true, linksto: 'LineNr'}])
+  prop_type_add('LspDiagVirtualText', {highlight: 'LspDiagVirtualText',
+                                       override: true})
 enddef
 
 # Sort diagnostics ascending based on line and character offset