← All changes
|
build/shiki/languages/git-commit.tmLanguage.json
+109
-58
1.27.3
→
1.13.0
View file →
| @@ -1,90 +1,141 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "information_for_contributors": [ |
| 3 | - "This file has been converted from https://github.com/walles/git-commit-message-plus/blob/master/syntaxes/git-commit.tmLanguage.json", | |
| 3 | + "This file has been converted from https://github.com/textmate/git.tmbundle/blob/master/Syntaxes/Git%20Commit%20Message.tmLanguage", | |
| 4 | 4 | "If you want to provide a fix or improvement, please create a pull request against the original repository.", |
| 5 | 5 | "Once accepted there, we are happy to receive an update request." |
| 6 | 6 | ], |
| 7 | - "version": "https://github.com/walles/git-commit-message-plus/commit/35a079dea5a91b087021b40c01a6bb4eb0337a87", | |
| 7 | + "version": "https://github.com/textmate/git.tmbundle/commit/93897a78c6e52bef13dadc0d4091d203c5facb40", | |
| 8 | 8 | "name": "git-commit", |
| 9 | 9 | "scopeName": "text.git-commit", |
| 10 | 10 | "patterns": [ |
| 11 | 11 | { |
| 12 | - "comment": "diff presented at the end of the commit message when using commit -v.", | |
| 13 | - "name": "meta.embedded.diff.git-commit", | |
| 14 | - "contentName": "source.diff", | |
| 15 | - "begin": "(?=^diff\\ \\-\\-git)", | |
| 16 | - "end": "\\z", | |
| 12 | + "begin": "\\A(?!# Please enter the commit message)", | |
| 13 | + "end": "^(?=# Please enter the commit message)", | |
| 14 | + "name": "meta.scope.message.git-commit", | |
| 17 | 15 | "patterns": [ |
| 18 | 16 | { |
| 19 | - "include": "source.diff" | |
| 17 | + "begin": "\\A(?=#)", | |
| 18 | + "end": "^(?!#)", | |
| 19 | + "patterns": [ | |
| 20 | + { | |
| 21 | + "include": "#comment" | |
| 22 | + } | |
| 23 | + ] | |
| 24 | + }, | |
| 25 | + { | |
| 26 | + "begin": "^(?!# Please enter the commit message)", | |
| 27 | + "end": "^(?=# Please enter the commit message)", | |
| 28 | + "patterns": [ | |
| 29 | + { | |
| 30 | + "begin": "\\G", | |
| 31 | + "end": "^(?!\\G)", | |
| 32 | + "name": "meta.scope.subject.git-commit", | |
| 33 | + "patterns": [ | |
| 34 | + { | |
| 35 | + "captures": { | |
| 36 | + "1": { | |
| 37 | + "name": "keyword.other.$2.git-commit" | |
| 38 | + } | |
| 39 | + }, | |
| 40 | + "match": "\\G((fixup|squash)!)\\s*" | |
| 41 | + }, | |
| 42 | + { | |
| 43 | + "match": ".{73,}$", | |
| 44 | + "name": "invalid.illegal.line-too-long.git-commit" | |
| 45 | + }, | |
| 46 | + { | |
| 47 | + "match": ".{51,}$", | |
| 48 | + "name": "invalid.deprecated.line-too-long.git-commit" | |
| 49 | + } | |
| 50 | + ] | |
| 51 | + }, | |
| 52 | + { | |
| 53 | + "begin": "^(?!# Please enter the commit message)", | |
| 54 | + "end": "^(?=# Please enter the commit message)", | |
| 55 | + "patterns": [ | |
| 56 | + { | |
| 57 | + "include": "#comment" | |
| 58 | + } | |
| 59 | + ] | |
| 60 | + } | |
| 61 | + ] | |
| 20 | 62 | } |
| 21 | 63 | ] |
| 22 | 64 | }, |
| 23 | 65 | { |
| 24 | - "comment": "User supplied message", | |
| 25 | - "name": "meta.scope.message.git-commit", | |
| 26 | - "begin": "^(?!#)", | |
| 27 | - "end": "^(?=#)", | |
| 66 | + "begin": "^(?=# Please enter the commit message)", | |
| 67 | + "end": "\\z", | |
| 68 | + "name": "meta.scope.metadata.git-commit", | |
| 28 | 69 | "patterns": [ |
| 29 | 70 | { |
| 30 | - "comment": "Mark > 50 lines as deprecated, > 72 as illegal", | |
| 31 | - "name": "meta.scope.subject.git-commit", | |
| 32 | - "match": "\\G.{0,50}(.{0,22}(.*))$", | |
| 33 | - "captures": { | |
| 34 | - "1": { | |
| 35 | - "name": "invalid.deprecated.line-too-long.git-commit" | |
| 36 | - }, | |
| 37 | - "2": { | |
| 38 | - "name": "invalid.illegal.line-too-long.git-commit" | |
| 39 | - } | |
| 40 | - } | |
| 71 | + "include": "#metadata" | |
| 41 | 72 | } |
| 42 | 73 | ] |
| 74 | + } | |
| 75 | + ], | |
| 76 | + "repository": { | |
| 77 | + "comment": { | |
| 78 | + "begin": "^(#)", | |
| 79 | + "captures": { | |
| 80 | + "1": { | |
| 81 | + "name": "punctuation.definition.comment.git-commit" | |
| 82 | + } | |
| 83 | + }, | |
| 84 | + "end": "\\n", | |
| 85 | + "name": "comment.line.number-sign.git-commit" | |
| 43 | 86 | }, |
| 44 | - { | |
| 45 | - "comment": "Git supplied metadata in a number of lines starting with #", | |
| 46 | - "name": "meta.scope.metadata.git-commit", | |
| 47 | - "begin": "^(?=#)", | |
| 48 | - "contentName": "comment.line.number-sign.git-commit", | |
| 49 | - "end": "^(?!#)", | |
| 87 | + "metadata": { | |
| 50 | 88 | "patterns": [ |
| 51 | 89 | { |
| 52 | - "match": "^#\\t((modified|renamed):.*)$", | |
| 53 | - "captures": { | |
| 54 | - "1": { | |
| 55 | - "name": "markup.changed.git-commit" | |
| 90 | + "begin": "(?=^# Changes to be committed:)", | |
| 91 | + "end": "(?!\\G)((?=^# \\w)|(?!^#))", | |
| 92 | + "patterns": [ | |
| 93 | + { | |
| 94 | + "begin": "(^[ \\t]+)?(?=#)", | |
| 95 | + "beginCaptures": { | |
| 96 | + "1": { | |
| 97 | + "name": "punctuation.whitespace.comment.leading.git-commit" | |
| 98 | + } | |
| 99 | + }, | |
| 100 | + "contentName": "comment.line.number-sign.git-commit", | |
| 101 | + "end": "(?!\\G)^", | |
| 102 | + "patterns": [ | |
| 103 | + { | |
| 104 | + "match": "\\G#", | |
| 105 | + "name": "punctuation.definition.comment.git-commit" | |
| 106 | + }, | |
| 107 | + { | |
| 108 | + "match": "((modified|renamed):.*)$\\n?", | |
| 109 | + "name": "markup.changed.git-commit" | |
| 110 | + }, | |
| 111 | + { | |
| 112 | + "match": "(new file:.*)$\\n?", | |
| 113 | + "name": "markup.inserted.git-commit" | |
| 114 | + }, | |
| 115 | + { | |
| 116 | + "match": "(deleted:.*)$\\n?", | |
| 117 | + "name": "markup.deleted.git-commit" | |
| 118 | + } | |
| 119 | + ] | |
| 56 | 120 | } |
| 57 | - } | |
| 121 | + ] | |
| 58 | 122 | }, |
| 59 | 123 | { |
| 60 | - "match": "^#\\t(new file:.*)$", | |
| 61 | - "captures": { | |
| 62 | - "1": { | |
| 63 | - "name": "markup.inserted.git-commit" | |
| 64 | - } | |
| 65 | - } | |
| 124 | + "include": "#comment" | |
| 66 | 125 | }, |
| 67 | 126 | { |
| 68 | - "match": "^#\\t(deleted.*)$", | |
| 69 | - "captures": { | |
| 70 | - "1": { | |
| 71 | - "name": "markup.deleted.git-commit" | |
| 127 | + "begin": "(?=diff\\ \\-\\-git)", | |
| 128 | + "comment": "diff presented at the end of the commit message when using commit -v.", | |
| 129 | + "contentName": "source.diff", | |
| 130 | + "end": "\\z", | |
| 131 | + "name": "meta.embedded.diff.git-commit", | |
| 132 | + "patterns": [ | |
| 133 | + { | |
| 134 | + "include": "source.diff" | |
| 72 | 135 | } |
| 73 | - } | |
| 74 | - }, | |
| 75 | - { | |
| 76 | - "comment": "Fallback for non-English git commit template", | |
| 77 | - "match": "^#\\t([^:]+): *(.*)$", | |
| 78 | - "captures": { | |
| 79 | - "1": { | |
| 80 | - "name": "keyword.other.file-type.git-commit" | |
| 81 | - }, | |
| 82 | - "2": { | |
| 83 | - "name": "string.unquoted.filename.git-commit" | |
| 84 | - } | |
| 85 | - } | |
| 136 | + ] | |
| 86 | 137 | } |
| 87 | 138 | ] |
| 88 | 139 | } |
| 89 | - ] | |
| 140 | + } | |
| 90 | 141 | } |