Comments (4)
I just pulled the latest and this fixes the issue for me! Great job!
from mini.nvim.
Thanks for the issue!
Indeed, 'mini.diff' does not account for different eol, mostly because I do not have experience (and hence problems) with them. It is good to have some example which I can rely on to potentially fix the issue. I'll take a look.
from mini.nvim.
I have finally had the energy to look at this. As it is quite a confusing topic for me right now.
I think you are right and the issue is indeed "the diff algorithm is assuming LF eol when compairing against the git index". @bockel, would you mind confirming it?
Could you replace this line in your installed copy of 'mini.nvim' / 'mini.diff' with the following:
H.vimdiff_opts = { result_type = 'indices', ctxlen = 0, interhunkctxlen = 0, ignore_cr_at_eol = true }
... and try to reproduce the issue? This seems to solve it when I try to emulate i/crlf
with MiniDiff.set_ref_text()
directly, but I want to be sure.
from mini.nvim.
I managed to reproduce locally and the latest main
should fix this issue. It also now should work properly for staging hunks.
from mini.nvim.
Related Issues (20)
- Everything is good HOT 2
- `mini.surround`: typo in docs HOT 1
- Inconsistent spaces in mini.splitjoin HOT 1
- mini.pairs: Triple quotes / backticks HOT 1
- Potential Issue with Windows OS Paths on opening COMMIT_EDITMSG buffers - Mini.Git HOT 4
- Beta-testing 'mini.icons' HOT 91
- Work with motions HOT 1
- When opening mini.files in a buffer deep into a project, I want mini.files to show that file. HOT 4
- mini.breadcrumbs plugin to show breadcrumbs of current cursor position using treesitter. HOT 1
- mini.files content.postfix HOT 1
- Add git conflict resolution HOT 1
- docs improvement (`mini.surround`) HOT 1
- [mini.sessions] Session management based on git branches HOT 3
- [mini.ai] Allow to return a different region depending on the operator. HOT 2
- mini.eolmark to show eol mark at cursor line? HOT 2
- unsure how to make the tests pass again after headless update HOT 6
- Surround arround motion HOT 1
- How to load 3rd party colour schemes to properly override default highlight rules? HOT 2
- Option to change what keys are mapped to fix macros HOT 1
- Terminal Color Synchronization with OSC 10 and 11 HOT 4
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from mini.nvim.