Skip to content

Commit

Permalink
Remove weird ignore on git-commit
Browse files Browse the repository at this point in the history
It was needlessly highlighting everything that wasn't a comment.

Adds keyword detection for Github-esque issue-closing syntax.
Adds missing 'd' and 'drop' highlighting in git-rebase-todo
  • Loading branch information
sum01 committed Jan 5, 2018
1 parent c8ff764 commit 8629357
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 32 deletions.
20 changes: 8 additions & 12 deletions runtime/syntax/git-commit.yaml
@@ -1,29 +1,25 @@
filetype: git-commit

detect:
filename: "COMMIT_EDITMSG|TAG_EDITMSG"
filename: "^(.*[\\/])?(COMMIT_EDITMSG|TAG_EDITMSG)$"

rules:
# Commit message
- ignore: ".*"
# Comments
- comment:
start: "^#"
end: "$"
rules: []
# File changes
- type.keyword: "#[[:space:]](deleted|modified|new file|renamed):[[:space:]].*"
- type.keyword: "#[[:space:]]deleted:"
- type.keyword: "#[[:space:]]modified:"
- type.keyword: "#[[:space:]]new file:"
- type.keyword: "#[[:space:]]renamed:"
# Untracked filenames
- error: "^# [^/?*:;{}\\\\]+\\.[^/?*:;{}\\\\]+$"
- type.keyword: "^#[[:space:]]Changes.*[:]"
- type.keyword: "^#[[:space:]]Your branch and '[^']+"
- type.keyword: "^#[[:space:]]Your branch and '"
- type.keyword: "^#[[:space:]]On branch [^ ]+"
- type.keyword: "^#[[:space:]]On branch"
# Recolor hash symbols
- special: "#"
# Color keywords for closing issues (such as on Github)
- type.keyword: "\\b(?i)((fix(es|ed)?|close(s|d)?) #[0-9]+)\\b"

# Comments
- comment.line:
start: "^#"
end: "$"
rules: []
31 changes: 11 additions & 20 deletions runtime/syntax/git-rebase-todo.yaml
@@ -1,28 +1,19 @@
filetype: git-rebase-todo

detect:
filename: "git-rebase-todo"
filename: "^(.*[\\/])?git\\-rebase\\-todo$"

rules:
# Rebase commands
- statement: "^(p(ick)?|r(eword)?|e(dit)?|s(quash)?|f(ixup)?|x|exec|d(rop)?)\\b"
# Commit IDs
- identifier: "\\b([0-9a-f]{7,40})\\b"

# Color keywords for Github (and others)
- type.keyword: "\\b(?i)((fix(es|ed)?|close(s|d)?) #[0-9]+)\\b"

# Comments
- comment:
start: "#"
- comment.line:
start: "^#"
end: "$"
rules: []
# Rebase commands
- statement: "^(e|edit) [0-9a-f]{7,40}"
- statement: "^# (e, edit)"
- statement: "^(f|fixup) [0-9a-f]{7,40}"
- statement: "^# (f, fixup)"
- statement: "^(p|pick) [0-9a-f]{7,40}"
- statement: "^# (p, pick)"
- statement: "^(r|reword) [0-9a-f]{7,40}"
- statement: "^# (r, reword)"
- statement: "^(s|squash) [0-9a-f]{7,40}"
- statement: "^# (s, squash)"
- statement: "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
- statement: "^# (x, exec)"
# Recolor hash symbols
- special: "#"
# Commit IDs
- identifier: "[0-9a-f]{7,40}"

0 comments on commit 8629357

Please sign in to comment.