Skip to content

Add Doxygen injection into C and C++ comments#43581

Merged
osiewicz merged 1 commit intozed-industries:mainfrom
Clement-Lap:main
Dec 1, 2025
Merged

Add Doxygen injection into C and C++ comments#43581
osiewicz merged 1 commit intozed-industries:mainfrom
Clement-Lap:main

Conversation

@Clement-Lap
Copy link
Contributor

@Clement-Lap Clement-Lap commented Nov 26, 2025

Release Notes:

  • C/C++ files now support Doxygen grammars.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Nov 26, 2025
@Clement-Lap
Copy link
Contributor Author

Release Notes:

  • Updated crates/languages/src/c/injections.scm to inject Doxygen language into C comments
  • Updated crates/languages/src/cpp/injections.scm to inject Doxygen language into C++ comments

@osiewicz osiewicz merged commit fd14675 into zed-industries:main Dec 1, 2025
26 checks passed
@katie-z-geer katie-z-geer moved this from Community PRs to Done in Quality Week – December 2025 Dec 2, 2025
@osiewicz
Copy link
Member

Ugh, this was an oversight on my end, but this should not have been merged in the current state.

osiewicz added a commit that referenced this pull request Dec 15, 2025
osiewicz added a commit that referenced this pull request Dec 15, 2025
Reverts #43581

Release notes:
- Fixed comment injections not working with C and C++.
github-actions bot pushed a commit that referenced this pull request Dec 15, 2025
Reverts #43581

Release notes:
- Fixed comment injections not working with C and C++.
@Clement-Lap
Copy link
Contributor Author

Sorry, I developed an extension to support doxygen in C and C++ files, and I have been told to directly add this feature into zed. I have been very busy since, and did not pursue the development of my extension. I however plan to resume it soon.

@osiewicz
Copy link
Member

This isn't your fault - it's on me. Feel free to resubmit a PR when you feel that your extension is in a good place.
Either way, we need to have two injections; one for comments in general (in this case the language will be set to comment) and another one for when a comment is a Doxygen comment.
So tl;dr: we shouldn't change existing injection, but add a new one instead.

MrSubidubi pushed a commit that referenced this pull request Dec 15, 2025
Reverts #43581

Release notes:
- Fixed comment injections not working with C and C++.
MrSubidubi pushed a commit that referenced this pull request Dec 15, 2025
…ry-pick to preview) (#44897)

Cherry-pick of #44883 to preview

----
Reverts #43581

Release notes:
- Fixed comment injections not working with C and C++.

Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
CherryWorm pushed a commit to CherryWorm/zed that referenced this pull request Dec 16, 2025
…s#44883)

Reverts zed-industries#43581

Release notes:
- Fixed comment injections not working with C and C++.
someone13574 pushed a commit to someone13574/zed that referenced this pull request Dec 16, 2025
Release Notes:

- C/C++ files now support Doxygen grammars (if a Doxygen extension is installed).
@niekdomi
Copy link
Contributor

niekdomi commented Jan 7, 2026

fwiw, clangd 22 supports doxygen https://clangd.llvm.org/config.html#documentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

Development

Successfully merging this pull request may close these issues.

3 participants