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

Further enhanced the syntax support #4

Merged
merged 61 commits into from
Jan 15, 2023

Conversation

mclaughlinconnor
Copy link

Force pushed to #3 and now I can't reopen


I realise this is a pretty hefty PR, but I'm not sure what your thoughts are on this repo, or if you're planning on keeping in maintained.

I've added syntax support for nearly everything (I think anyway) -- there are a few small problems with some of the JS style attributes, etc., but I hope to have them sorted soon-ish.

If you'd rather, though (and I'm guessing this will be the case seeing as I've rewritten most of it, and to avoid any upstreaming requests), I can just "unfork" my repo to be maintained separately by me.

Let me know what your thoughts are :)

@mclaughlinconnor mclaughlinconnor changed the title Further enhanced the syntax suppor Further enhanced the syntax support Dec 22, 2022
@JulesNP
Copy link

JulesNP commented Jan 2, 2023

I don't think this is being maintained by @zealot128 anymore, as I've had a pull request pending since May 2022 with no response. Your best bet is to put in a pull request with the nvim-treesitter project itself to switch to your fork.

@zealot128
Copy link
Owner

@JulesNP @mclaughlinconnor ups, I didn't noticed this PR. The default notification was only on for Mentions/watched threads for both of your PR's. (Maybe because this is a fork itself...?)

Will check out if it works for "my" pug files, and if yes, I see no issues to give you commit rights. I only forked it myself to make it work for my use cases anyway. It would be best for this repo to be part of @pugjs group, but I am not in contact with anyone from that team.

@zealot128
Copy link
Owner

On cursory glance it parses most of the vue-pug files that I took a look on. Will use the fork for a couple of workdays.
Maybe @JulesNP can also check out, if this PR fixes the quotation issue, because I think that merging both will be hard because of conflicts.

@mclaughlinconnor
Copy link
Author

@JulesNP No, my code doesn't fix your string quoting issue. I probably could have, but I didn't want to shamelessly steal your code :)

I haven't tested the code, but I know for sure it will have conflicts.

I think you'll also want to use the same code for quoted_javascript nodes

@mclaughlinconnor
Copy link
Author

Re living under @pugjs, I agree, but there doesn't seem to be much activity in the group. I'm not in contact with anyone either, but @ForbesLindesay is pretty active on Github, so maybe we'll get a response with his thoughts on moving this into the group.

@JulesNP
Copy link

JulesNP commented Jan 7, 2023

On cursory glance it parses most of the vue-pug files that I took a look on. Will use the fork for a couple of workdays. Maybe @JulesNP can also check out, if this PR fixes the quotation issue, because I think that merging both will be hard because of conflicts.

It doesn't fix my quoting issue, but everything else with this version is working well. I'll withdraw my pull request and resubmit an updated version once @mclaughlinconnor's changes are merged.

README.md Outdated Show resolved Hide resolved
@zealot128
Copy link
Owner

Haven't noticed any regression in the highlighting of my Vue/pug files.
Great work!!

Only some wording in the README is Angular only. Can you adjust that please? Now the grammar is not only useful for us Vue or Angular folks, but almost general purpose.

@zealot128 zealot128 merged commit 148608f into zealot128:master Jan 15, 2023
@zealot128
Copy link
Owner

Awesome! Thanks for the huge contribution.

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.

3 participants