Skip to content

Conversation

danilshvalov
Copy link
Contributor

See neovim/neovim#22761 (maybe we should wait for the 0.9 release)

@jgollenz
Copy link
Contributor

maybe we should wait for the 0.9 release

That depends on whether we want to ... um ... depend on it 😁 Sooner or later we will, but I let @kristijanhusak decide that.

Copy link
Contributor

@mcepl mcepl left a comment

Choose a reason for hiding this comment

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

Works for me (and fixes #536 for me).

@jgollenz
Copy link
Contributor

@danilshvalov do you mind squashing your commits? I'm not sure why the tests are not re-running after I changed the target branch, but a force push from you should do the trick.

@danilshvalov
Copy link
Contributor Author

@danilshvalov do you mind squashing your commits? I'm not sure why the tests are not re-running after I changed the target branch, but a force push from you should do the trick.

Done

@kristijanhusak
Copy link
Member

We are usually trying to support two latest versions + nightly, which will be 0.8.3, 0.9 and nightly, once the 0.9 is released. I'm ok with this, but we should probably make some wrapper around these and use appropriate one depending on the Neovim version.

@ranjithshegde
Copy link
Contributor

As this plugin already has nvim-treesitter as a dependency, using the shims from this commit seems ideal. Then there is no need for local wrappers

@danilshvalov
Copy link
Contributor Author

I added the orgmode.treesitter.compat module. Unfortunately, there is no get_node_text function in nvim-treesitter, so I created a separate module.

@jgollenz
Copy link
Contributor

@danilshvalov in this case you can set the base branch back to master

@danilshvalov danilshvalov changed the base branch from nvim-0.9.0 to master March 27, 2023 17:32
Copy link
Contributor

@jgollenz jgollenz left a comment

Choose a reason for hiding this comment

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

  • On 0.8.[0|3] I also need

    • a shim for set_query (used in todo_highlighter.lua:55)
    • use ts.get_qery in markup_highlighter.lua:230
    • use ts.get_query_files in todo_highlighter.lua:8

    in order to not get errors.

  • On nightly I get a notice about deprecation of vim.treesitter.query.get_query() upon every startup. Can we avoid that?

@danilshvalov
Copy link
Contributor Author

  • On 0.8.[0|3] I also need

    • a shim for set_query (used in todo_highlighter.lua:55)
    • use ts.get_qery in markup_highlighter.lua:230
    • use ts.get_query_files in todo_highlighter.lua:8

Done

in order to not get errors.

  • On nightly I get a notice about deprecation of vim.treesitter.query.get_query() upon every startup. Can we avoid that?

I can't reproduce it. Could you provide a log please?

@danilshvalov
Copy link
Contributor Author

@jgollenz, is there anything else?

@jgollenz
Copy link
Contributor

@danilshvalov when I run the minimal_init with your branch I don't get the error, so it looks like it's just on my side. I'll investigate further, but let's merge this in the meantime 👍

@jgollenz jgollenz dismissed their stale review March 30, 2023 21:25

Error not reproducible

@jgollenz jgollenz merged commit 12a669f into nvim-orgmode:master Mar 30, 2023
SlayerOfTheBad pushed a commit to SlayerOfTheBad/orgmode that referenced this pull request Aug 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants