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

fix: errors from single ' or | #31

Merged
merged 3 commits into from
Oct 9, 2022
Merged

fix: errors from single ' or | #31

merged 3 commits into from
Oct 9, 2022

Conversation

justinmk
Copy link
Member

@justinmk justinmk commented Oct 9, 2022

Problem:

  1. single ' causes errors, it should be plaintext
  2. single | causes errors, it should be plaintext

Solution:
Remove explicit whitespace patterns from the related $.word patterns. This
also fixes #23 because it
turns out that defining a $.word choice that captures (leading) whitespace causes
treesitter to include whitespace in all/most nodes in the tree?

Single apostrophes are found in various :help documents such as ":help
'fillchars'". They should be treated as plaintext.
@justinmk justinmk changed the title fix: single ' and single | cause errors fix: single ' and | cause errors Oct 9, 2022
@justinmk justinmk changed the title fix: single ' and | cause errors fix: errors from single ' or | Oct 9, 2022
@justinmk justinmk merged commit c03640a into neovim:master Oct 9, 2022
@justinmk justinmk deleted the fixes branch October 9, 2022 18:18
justinmk added a commit to justinmk/neovim that referenced this pull request Oct 9, 2022
- Improve generated HTML by updating parser which includes fixes for
  single "'" and single "|":
  neovim/tree-sitter-vimdoc#31
- Updated parser also fixes the conceal issue for "help" highlight
  queries neovim/tree-sitter-vimdoc#23 by
  NOT including whitespace in nodes.
  - But this means we need to restore the getws() function which scrapes
    leading whitespace from the original input (buffer).
justinmk added a commit to justinmk/neovim that referenced this pull request Oct 9, 2022
- Improve generated HTML by updating parser which includes fixes for
  single "'" and single "|":
  neovim/tree-sitter-vimdoc#31
- Updated parser also fixes the conceal issue for "help" highlight
  queries neovim/tree-sitter-vimdoc#23 by
  NOT including whitespace in nodes.
  - But this means we need to restore the getws() function which scrapes
    leading whitespace from the original input (buffer).
justinmk added a commit to justinmk/neovim that referenced this pull request Oct 9, 2022
- Improve generated HTML by updating parser which includes fixes for
  single "'" and single "|":
  neovim/tree-sitter-vimdoc#31
- Updated parser also fixes the conceal issue for "help" highlight
  queries neovim/tree-sitter-vimdoc#23 by
  NOT including whitespace in nodes.
  - But this means we need to restore the getws() function which scrapes
    leading whitespace from the original input (buffer).
github-actions bot pushed a commit to neovim/neovim that referenced this pull request Oct 12, 2022
- Improve generated HTML by updating parser which includes fixes for
  single "'" and single "|":
  neovim/tree-sitter-vimdoc#31
- Updated parser also fixes the conceal issue for "help" highlight
  queries neovim/tree-sitter-vimdoc#23 by
  NOT including whitespace in nodes.
  - But this means we need to restore the getws() function which scrapes
    leading whitespace from the original input (buffer).

(cherry picked from commit a7a83bc)
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.

Conceal eats adjacent whitespace
1 participant