[vim/vim] Add runtime files and filetype detection for jj (PR #14733)

76 views
Skip to first unread message

Gregory Anders

unread,
May 8, 2024, 12:47:27 PM5/8/24
to vim/vim, Subscribed

jj (Jujutsu) is a Git-compatible version control system.

Like git, jj allows the user to write a description of each change in a buffer. These are opened in the editor with a temporary file with a .jjdescription extension. Example:

Add runtime files and filetype detection for jj

JJ: This commit contains the following changes:
JJ:     M runtime/filetype.vim
JJ:     A runtime/ftplugin/jj.vim
JJ:     A runtime/syntax/jj.vim

JJ: Lines starting with "JJ: " (like this one) will be removed.

The format of the file is similar to a Git commit file. There is some plain text at the top of the file describing the change and some comments showing which files changed. The comment character is JJ: (indicated by the text in the buffer).

The included syntax plugin highlights comments with the Comment highlight group, and highlights each of the individual changed files using the builtin Added, Changed, and Removed highlight groups.

The include filetype plugin is copied almost verbatim from the gitcommit filetype plugin, though I dropped the Git commands and adapted for the updated comment strings.


You can view, comment on, or merge this pull request online at:

  https://github.com/vim/vim/pull/14733

Commit Summary

  • d03a694 Add runtime files and filetype detection for jj

File Changes

(3 files)

Patch Links:


Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733@github.com>

Christian Brabandt

unread,
May 8, 2024, 1:06:28 PM5/8/24
to vim/vim, Subscribed

Thanks, can you please add your email or github handle at the maintainer line? And perhaps update https://github.com/vim/vim/blob/master/.github/CODEOWNERS ?


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/c2101028195@github.com>

Christian Clason

unread,
May 8, 2024, 1:14:57 PM5/8/24
to vim/vim, Subscribed

Just a small comment: Users in CODEOWNERS actually have to be members of the org; otherwise this will not work properly and Github will complain that "This file has errors".

Of course, you can still use that file for your own tracking purposes, but I wonder if a different name and format (MAINTAINERS.{md,txt}) wouldn't be more useful then (and shut Github up)?


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/c2101042258@github.com>

dkearns

unread,
May 8, 2024, 1:30:13 PM5/8/24
to vim/vim, Subscribed

Can you please add a filetype detection test?


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/c2101067139@github.com>

dkearns

unread,
May 8, 2024, 1:31:58 PM5/8/24
to vim/vim, Subscribed

Just a small comment: Users in CODEOWNERS actually have to be members of the org; otherwise this will not work properly and Github will complain that "This file has errors".

Of course, you can still use that file for your own tracking purposes, but I wonder if a different name and format (MAINTAINERS.{md,txt}) wouldn't be more useful then (and shut Github up)?

This used to work for all users and there was some hope that the feature might be restored. That hope is fading...


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/c2101070098@github.com>

Gregory Anders

unread,
May 8, 2024, 1:32:42 PM5/8/24
to vim/vim, Push

@gpanders pushed 2 commits.

  • bcb57c2 add email to maintainer info
  • bd83ecf add filetype detection test


View it on GitHub.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/push/18335579743@github.com>

Gregory Anders

unread,
May 8, 2024, 1:33:14 PM5/8/24
to vim/vim, Push

@gpanders pushed 1 commit.

  • 3d3e695 add filetype detection test


View it on GitHub.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/push/18335587558@github.com>

Gregory Anders

unread,
May 8, 2024, 1:34:32 PM5/8/24
to vim/vim, Subscribed

Can you please add a filetype detection test?

Done, thanks for the reminder.

Thanks, can you please add your email or github handle at the maintainer line

Done as well. I didn't update CODEOWNERS tho, per @clason's comment it sounds like that may not work as intended? But if you prefer I can update it regardless.


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/c2101074198@github.com>

Christian Brabandt

unread,
May 8, 2024, 1:43:57 PM5/8/24
to vim/vim, Subscribed

Yeah, I noticed that warning. It's not particular useful that one cannot add non-org people there. I have just renamed it to MAINTAINERs (in 3ac83c7) Not sure if it is actually useful (or it's just redundant).


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/c2101088792@github.com>

Christian Brabandt

unread,
May 8, 2024, 1:46:20 PM5/8/24
to vim/vim, Subscribed

now you can add it to the MAINTAINERS file 😬


Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/c2101092440@github.com>

Gregory Anders

unread,
May 8, 2024, 1:51:18 PM5/8/24
to vim/vim, Push

@gpanders pushed 4 commits.

  • 3b03f00 Add runtime files and filetype detection for jj
  • d14c138 add email to maintainer info
  • 0f049c5 add filetype detection test
  • 59e086a update MAINTAINERS file


View it on GitHub.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/push/18335826461@github.com>

Gregory Anders

unread,
May 8, 2024, 1:51:37 PM5/8/24
to vim/vim, Subscribed

now you can add it to the MAINTAINERS file 😬

Done!


Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/c2101100931@github.com>

Christian Brabandt

unread,
May 8, 2024, 1:52:55 PM5/8/24
to vim/vim, Subscribed

thanks!


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/c2101102876@github.com>

Christian Brabandt

unread,
May 8, 2024, 2:20:48 PM5/8/24
to vim/vim, Subscribed

Closed #14733 via 6a4ea47.


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/14733/issue_event/12747654886@github.com>

Reply all
Reply to author
Forward
0 new messages