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 EXCLUDE_QUERY_DIR for cms/cmt files #104

Merged
merged 5 commits into from
Oct 15, 2024
Merged

Conversation

liam923
Copy link
Contributor

@liam923 liam923 commented Oct 7, 2024

Resolve a bug where Merlin does not respect the EXCLUDE_QUERY_DIR directive for cmt/cms files. I believe this bug is present upstream, so I intend to upstream this PR.

@liam923
Copy link
Contributor Author

liam923 commented Oct 7, 2024

I've created a PR upstream: ocaml/merlin#1854

Copy link
Contributor

@ncik-roberts ncik-roberts left a comment

Choose a reason for hiding this comment

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

Meta remark: when adding a regression test, it is best to first add a commit showing the test's old behavior, then a second commit fixing it (and updating the test's output).

src/kernel/mconfig.ml Outdated Show resolved Hide resolved
tests/test-dirs/config/exclude-query-dir.t Outdated Show resolved Hide resolved
@liam923 liam923 merged commit 3b90a60 into main Oct 15, 2024
2 checks passed
@liam923 liam923 deleted the exclude-query-dir-fix branch October 15, 2024 13:18
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.

2 participants