Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some bug fixes from my fork #9

Merged
merged 4 commits into from
Jul 28, 2021
Merged

Some bug fixes from my fork #9

merged 4 commits into from
Jul 28, 2021

Conversation

ful1e5
Copy link
Collaborator

@ful1e5 ful1e5 commented Jul 28, 2021

Fixes

Nested colors overide ful1e5/onedark.nvim#6
Minimal Status Line Bug ful1e5/onedark.nvim#2

@ful1e5 ful1e5 added the enhancement New feature or request label Jul 28, 2021
@ful1e5 ful1e5 requested a review from monsonjeremy July 28, 2021 06:38
Comment on lines +361 to +370
if vim.o.statusline ~= nil and string.find(vim.o.statusline, "lualine") then
-- Fix VertSplit & StatusLine crossover when lualine is active
-- https://github.com/ful1e5/onedark.nvim/issues/2
-- https://github.com/hoob3rt/lualine.nvim/issues/274
theme.base.StatusLine = { bg = c.bg }

-- LuaLine
for _, section in pairs({ "a", "b", "c" }) do
theme.plugins["lualine_" .. section .. "_inactive"] = inactive
end
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this the code that you changed in order to fix the inactiveStatusLine still showing a different background?

I just tried this one my local and I'm still seeing the issue. I feel like it's somewhere else in my package. If I use master of your repository it works fine for me but as soon as I switch to mine the status line doesn't hide properly 😭

@ful1e5 ful1e5 requested a review from monsonjeremy July 28, 2021 10:04
@ful1e5
Copy link
Collaborator Author

ful1e5 commented Jul 28, 2021

Now fixed

Comment on lines +204 to +209
-- load syntax for plugins and terminal async
vim.defer_fn(function()
util.terminal(theme.colors)
util.syntax(theme.plugins)
util.autocmds(theme.config)
end, 0)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is awesome, I believe this is the fix for the bug! Do you know why this works? I assume it prevents a race condition with overriding the lualine inactive config?

Copy link
Owner

@monsonjeremy monsonjeremy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a ton for doing this. Looks great!

@monsonjeremy monsonjeremy merged commit 53713a9 into monsonjeremy:master Jul 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants