Skip to content

Conversation

bfredl
Copy link
Member

@bfredl bfredl commented Nov 9, 2019

#5031 PR thread is too long, so lets open a new one. Tests passes locally after some small adjustments, lets hope for the best.

@bfredl bfredl mentioned this pull request Nov 9, 2019
31 tasks
@bfredl bfredl added this to the 0.5 milestone Nov 9, 2019
// If throw == true then an error will be raised if nothing
// was found
// Returns NULL if something went wrong
ExtendedMark *extmark_from_id_or_pos(Buffer buffer,
Copy link
Member Author

Choose a reason for hiding this comment

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

not used, but keep anyway for future API usage?

@bfredl
Copy link
Member Author

bfredl commented Nov 10, 2019

I've done some revisions, might do a few more (like a few more obsolete TODO comments and such) but this is pretty much mergable from my point of view. We have the 0.5 cycle to fix bugs/edge cases (which will be reported by master testers after merge :) . This is is pretty much "do nothing unless invoked", so it should not affect stability in general.

Docs can and will be improved after merge (but of course point out already if there is something obviously wrong/misleading).

I also plan to heavily refactor the internal implementation based on #9404 (a more efficient kbtree that don't need two separate layers for columns/lines) at some point, but this is not critical. There is no catastrophe if this happens after 0.5 (or never).

@bfredl
Copy link
Member Author

bfredl commented Nov 10, 2019

@zgpio updated to your suggestions (and a bit more).

Copy link

@ashfinal ashfinal left a comment

Choose a reason for hiding this comment

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

Some typos in docs.
Update: just wanted a peek of extmarks feature, saw some typos and felt the urge to correct them.
Feel free not to reply, reducing some noises :) @justinmk
And thanks for your hint @bfredl

@justinmk
Copy link
Member

Some typos in docs.

Thanks, but I have a doc update pending anyway. There are many typos, but we want to avoid lots of typo comments in this PR.

@bfredl
Copy link
Member Author

bfredl commented Nov 11, 2019

@ashfinal Thanks, but note that method-specific documentation in api.txt is generated, so some of those will be overwritten anyway. Method documentation should be reviewed in src/nvim/api/*.c.

@bfredl
Copy link
Member Author

bfredl commented Nov 11, 2019

I added comments for the Adjust* structs, but did no changes now. Will try to reduce them later.

Also fixed the segfault on buffer wipe.

@bfredl bfredl merged commit 1224269 into neovim:master Nov 11, 2019
@bfredl
Copy link
Member Author

bfredl commented Nov 11, 2019

Merged. Thanks @timeyyy for this great contribution.

As mentioned before, this just the start of "extmark" feature. Apart from doc/implementation improvements, an follow-up will be to integrate bufhl/virttext into it, which I hope to look into soon.

@timeyyy
Copy link
Contributor

timeyyy commented Nov 11, 2019

Thanks for getting this slotted in.

@justinmk
Copy link
Member

I have a doc update pending anyway.

#11376

@justinmk justinmk added the marks marks, extmarks, decorations, virtual text label Nov 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
marks marks, extmarks, decorations, virtual text
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants