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.

Sign up for GitHub

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

Jump to bottom

fix(filetype.lua): escape expansion of ~ when used as a pattern #18353

Merged
merged 1 commit into from May 2, 2022
Merged

fix(filetype.lua): escape expansion of ~ when used as a pattern #18353

merged 1 commit into from May 2, 2022

Conversation

jamessan
Copy link
Member

@jamessan jamessan commented May 2, 2022 •
edited

No description provided.

@github-actions github-actions bot added filetype filetype detection, filetype.lua lua stdlib labels May 2, 2022
@github-actions github-actions bot requested review from clason and gpanders May 2, 2022 04:16
@jamessan
Copy link
Member Author

jamessan commented May 2, 2022

@dundargoc regen-api-docs failed:

Switched to a new branch 'marvim/api-doc-update/refs/pull/18353/merge'
Traceback (most recent call last):
  File "/home/runner/work/neovim/neovim/scripts/gen_vimdoc.py", line 62, in <module>
    doxygen_version = tuple([int(i) for i in subprocess.check_output(["doxygen", "-v"],
  File "/home/runner/work/neovim/neovim/scripts/gen_vimdoc.py", line 62, in <listcomp>
    doxygen_version = tuple([int(i) for i in subprocess.check_output(["doxygen", "-v"],
ValueError: invalid literal for int() with base 10: '2 (ee54ebd4f0ad83d9c44f19a459146de64d0ffba2*)\n'
Error: Process completed with exit code 1.

clason
clason reviewed May 2, 2022
View reviewed changes
runtime/lua/vim/filetype.lua Outdated Show resolved Hide resolved
gpanders
gpanders approved these changes May 2, 2022
View reviewed changes
runtime/lua/vim/filetype.lua Outdated Show resolved Hide resolved
@jamessan jamessan merged commit a1542b0 into neovim:master May 2, 2022
@jamessan jamessan deleted the ft-match-fix branch May 2, 2022 15:01
@github-actions
Copy link
Contributor

github-actions bot commented May 2, 2022

Cannot read property 'match' of null

@jamessan jamessan mentioned this pull request May 2, 2022
Merged
@github-actions
Copy link
Contributor

github-actions bot commented May 2, 2022

Git push to origin failed for release-0.7 with exitcode 1

justinmk
justinmk reviewed May 2, 2022
View reviewed changes
runtime/lua/vim/filetype.lua
if as_pattern then
-- Escape Lua's metacharacters when $HOME is used in a pattern.
-- The rest of path should already be properly escaped.
normal = vim.env.HOME:gsub('[-^$()%%.%[%]+?]', '%%%0') .. normal:sub(2)
Copy link
Member

Choose a reason for hiding this comment

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

is vim.pesc useful here?

neovim/runtime/lua/vim/shared.lua

Line 507 in b470ff0

function vim.pesc(s)

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, that would have been useful to notice. :)

Copy link
Member

Choose a reason for hiding this comment

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

There will be more than one opportunity to refactor filetype.lua (e.g., as part of #18241) ;)

@jamessan jamessan mentioned this pull request May 4, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinmk justinmk justinmk left review comments

@clason clason clason left review comments

@zeertzjq zeertzjq zeertzjq left review comments

@gpanders gpanders gpanders approved these changes

Assignees
No one assigned
Labels
filetype filetype detection, filetype.lua lua stdlib
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jamessan @justinmk @clason @gpanders @zeertzjq