Baipyrus/nvim-config
1
0
Fork 0
mirror of https://github.com/Baipyrus/nvim-config.git synced 2024-11-14 21:13:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure highlighting during plugin config

Browse Source
This commit is contained in:
Baipyrus 2024-08-01 11:10:08 +02:00
parent 69c8790f6e
commit 9a4a5f31ae
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lua/custom/plugins/conflictmarker.lua
View File

@ -5,6 +5,10 @@ vim.g.conflict_marker_highlight_group = ''
vim.g.conflict_marker_begin = '^<<<<<<< .*$' vim.g.conflict_marker_begin = '^<<<<<<< .*$'
vim.g.conflict_marker_end = '^>>>>>>> .*$' vim.g.conflict_marker_end = '^>>>>>>> .*$'
-- Git conflict marker management plugin
return {
'rhysd/conflict-marker.vim',
config = function()
-- Highlight groups -- Highlight groups
vim.cmd 'highlight ConflictMarkerBegin guibg=#2f7366' vim.cmd 'highlight ConflictMarkerBegin guibg=#2f7366'
vim.cmd 'highlight ConflictMarkerOurs guibg=#2e5049' vim.cmd 'highlight ConflictMarkerOurs guibg=#2e5049'
@ -12,10 +16,6 @@ vim.cmd 'highlight ConflictMarkerTheirs guibg=#344f69'
vim.cmd 'highlight ConflictMarkerEnd guibg=#2f628e' vim.cmd 'highlight ConflictMarkerEnd guibg=#2f628e'
vim.cmd 'highlight ConflictMarkerCommonAncestorsHunk guibg=#754a81' vim.cmd 'highlight ConflictMarkerCommonAncestorsHunk guibg=#754a81'
-- Git conflict marker management plugin
return {
'rhysd/conflict-marker.vim',
config = function()
-- Read all lines in buffer, check if there is any conflict marker -- Read all lines in buffer, check if there is any conflict marker
function git_conflict_detection() function git_conflict_detection()
local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false) local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false)