We want information messages to have orange color and warning messages
to have pink color.
Also fix the syntax highlighting for LspDiagnostics. While migrating
away from diagnostic-nvim, we did not specify the syntax highlight for
virtual text correctly, which resulted in them having just plain white
text on black background.
- TSStructure was deprecated
- TSVariable/TSVariableBuiltin/TSNamespace/TSComment seem to be newly
introduced
- Use a different color for functions and identifiers
- Reorder alphabetically. Easier to compare against upstream doc
Not sure what changed in recent releases for either nvim, packer or
lspconfig plugins, but, our custom LSP configuration file seems to
not be loaded or have any effect when specified via packer's config
directive. So load it manually in init.
While we dropped diffconflicts earlier and switch to vanilla vimdiff,
two way merges are definitely better than three way merges. 3 way merge
as in gina or vimdiff is extremely confusing except for may be the
simplest of merge conflicts.
conflict-marker and diffconflicts should let us handle all cases.
We added edita to be able to do interactive rebase inside neovim
terminal which Gina does not support by default.
See issue
https://github.com/lambdalisue/gina.vim/issues/276
Mostly haven't been using this, just relying on spawning a separate pane
in tmux or kitty window to do the rebase. So drop this.
With this commit upstream
a68b21be60
packer can handle finding default branches by itself and does not error
out like earlier for anything named other than master.
We can move between conflict markers using functionality from the
conflict markers plugin and we also have gina. If required just
introduce the command mapping later.
Currently there is an observable bug where this doesn't play well with
gina buffers. Perhaps it should be disabled for any gina buffers or
something similar.
The undo hunk feature is complete garbage at the moment. Also it seems
whenever we have changes and thus signs in gutter, sometimes there is
an observable sluggishness.
