-
Notifications
You must be signed in to change notification settings - Fork 27.9k
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
Unfreeze Git Commit Message grammar II #173195
Merged
alexr00
merged 4 commits into
microsoft:main
from
walles:johan/replace-git-commit-grammar
Feb 7, 2023
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
167 changes: 58 additions & 109 deletions
167
extensions/git-base/syntaxes/git-commit.tmLanguage.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,141 +1,90 @@ | ||
| { | ||
| "information_for_contributors": [ | ||
| "This file has been converted from https://github.com/textmate/git.tmbundle/blob/master/Syntaxes/Git%20Commit%20Message.tmLanguage", | ||
| "This file has been converted from https://github.com/walles/git-commit-message-plus/blob/master/syntaxes/git-commit.tmLanguage.json", | ||
| "If you want to provide a fix or improvement, please create a pull request against the original repository.", | ||
| "Once accepted there, we are happy to receive an update request." | ||
| ], | ||
| "version": "https://github.com/textmate/git.tmbundle/commit/93897a78c6e52bef13dadc0d4091d203c5facb40", | ||
| "version": "https://github.com/walles/git-commit-message-plus/commit/35a079dea5a91b087021b40c01a6bb4eb0337a87", | ||
| "name": "Git Commit Message", | ||
| "scopeName": "text.git-commit", | ||
| "patterns": [ | ||
| { | ||
| "begin": "\\A(?!# Please enter the commit message)", | ||
| "end": "^(?=# Please enter the commit message)", | ||
| "name": "meta.scope.message.git-commit", | ||
| "comment": "diff presented at the end of the commit message when using commit -v.", | ||
| "name": "meta.embedded.diff.git-commit", | ||
| "contentName": "source.diff", | ||
| "begin": "(?=^diff\\ \\-\\-git)", | ||
| "end": "\\z", | ||
| "patterns": [ | ||
| { | ||
| "begin": "\\A(?=#)", | ||
| "end": "^(?!#)", | ||
| "patterns": [ | ||
| { | ||
| "include": "#comment" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "begin": "^(?!# Please enter the commit message)", | ||
| "end": "^(?=# Please enter the commit message)", | ||
| "patterns": [ | ||
| { | ||
| "begin": "\\G", | ||
| "end": "^(?!\\G)", | ||
| "name": "meta.scope.subject.git-commit", | ||
| "patterns": [ | ||
| { | ||
| "captures": { | ||
| "1": { | ||
| "name": "keyword.other.$2.git-commit" | ||
| } | ||
| }, | ||
| "match": "\\G((fixup|squash)!)\\s*" | ||
| }, | ||
| { | ||
| "match": ".{73,}$", | ||
| "name": "invalid.illegal.line-too-long.git-commit" | ||
| }, | ||
| { | ||
| "match": ".{51,}$", | ||
| "name": "invalid.deprecated.line-too-long.git-commit" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "begin": "^(?!# Please enter the commit message)", | ||
| "end": "^(?=# Please enter the commit message)", | ||
| "patterns": [ | ||
| { | ||
| "include": "#comment" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| "include": "source.diff" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "begin": "^(?=# Please enter the commit message)", | ||
| "end": "\\z", | ||
| "name": "meta.scope.metadata.git-commit", | ||
| "comment": "User supplied message", | ||
| "name": "meta.scope.message.git-commit", | ||
| "begin": "^(?!#)", | ||
| "end": "^(?=#)", | ||
| "patterns": [ | ||
| { | ||
| "include": "#metadata" | ||
| "comment": "Mark > 50 lines as deprecated, > 72 as illegal", | ||
| "name": "meta.scope.subject.git-commit", | ||
| "match": "\\G.{0,50}(.{0,22}(.*))$", | ||
| "captures": { | ||
| "1": { | ||
| "name": "invalid.deprecated.line-too-long.git-commit" | ||
| }, | ||
| "2": { | ||
| "name": "invalid.illegal.line-too-long.git-commit" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "repository": { | ||
| "comment": { | ||
| "begin": "^(#)", | ||
| "captures": { | ||
| "1": { | ||
| "name": "punctuation.definition.comment.git-commit" | ||
| } | ||
| }, | ||
| "end": "\\n", | ||
| "name": "comment.line.number-sign.git-commit" | ||
| }, | ||
| "metadata": { | ||
| { | ||
| "comment": "Git supplied metadata in a number of lines starting with #", | ||
| "name": "meta.scope.metadata.git-commit", | ||
| "begin": "^(?=#)", | ||
| "contentName": "comment.line.number-sign.git-commit", | ||
| "end": "^(?!#)", | ||
| "patterns": [ | ||
| { | ||
| "begin": "(?=^# Changes to be committed:)", | ||
| "end": "(?!\\G)((?=^# \\w)|(?!^#))", | ||
| "patterns": [ | ||
| { | ||
| "begin": "(^[ \\t]+)?(?=#)", | ||
| "beginCaptures": { | ||
| "1": { | ||
| "name": "punctuation.whitespace.comment.leading.git-commit" | ||
| } | ||
| }, | ||
| "contentName": "comment.line.number-sign.git-commit", | ||
| "end": "(?!\\G)^", | ||
| "patterns": [ | ||
| { | ||
| "match": "\\G#", | ||
| "name": "punctuation.definition.comment.git-commit" | ||
| }, | ||
| { | ||
| "match": "((modified|renamed):.*)$\\n?", | ||
| "name": "markup.changed.git-commit" | ||
| }, | ||
| { | ||
| "match": "(new file:.*)$\\n?", | ||
| "name": "markup.inserted.git-commit" | ||
| }, | ||
| { | ||
| "match": "(deleted:.*)$\\n?", | ||
| "name": "markup.deleted.git-commit" | ||
| } | ||
| ] | ||
| "match": "^#\\t((modified|renamed):.*)$", | ||
| "captures": { | ||
| "1": { | ||
| "name": "markup.changed.git-commit" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "include": "#comment" | ||
| "match": "^#\\t(new file:.*)$", | ||
| "captures": { | ||
| "1": { | ||
| "name": "markup.inserted.git-commit" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "begin": "(?=diff\\ \\-\\-git)", | ||
| "comment": "diff presented at the end of the commit message when using commit -v.", | ||
| "contentName": "source.diff", | ||
| "end": "\\z", | ||
| "name": "meta.embedded.diff.git-commit", | ||
| "patterns": [ | ||
| { | ||
| "include": "source.diff" | ||
| "match": "^#\\t(deleted.*)$", | ||
| "captures": { | ||
| "1": { | ||
| "name": "markup.deleted.git-commit" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "comment": "Fallback for non-English git commit template", | ||
| "match": "^#\\t([^:]+): *(.*)$", | ||
| "captures": { | ||
| "1": { | ||
| "name": "keyword.other.file-type.git-commit" | ||
| }, | ||
| "2": { | ||
| "name": "string.unquoted.filename.git-commit" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see you no longer have a
line-too-longscope. Did you intentionally remove this?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that was intentional.
I replaced those scopes with diagnostics and Quick Fixes.
This is what it looks like in the upstream project:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most users won't have your whole extension installed, so having the
line-too-longscope in the syntax highlighting would still be beneficial to them. Would you be willing to bring it back?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done, just pushed a new change for that: 15defef
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!