Merge
This commit is contained in:
commit
d668050ebe
3 changed files with 19 additions and 33 deletions
|
@ -416,7 +416,6 @@ func importFilePath() *lua.LTable {
|
||||||
pkg := L.NewTable()
|
pkg := L.NewTable()
|
||||||
|
|
||||||
L.SetField(pkg, "Join", luar.New(L, filepath.Join))
|
L.SetField(pkg, "Join", luar.New(L, filepath.Join))
|
||||||
L.SetField(pkg, "Clean", luar.New(L, filepath.Join))
|
|
||||||
L.SetField(pkg, "Abs", luar.New(L, filepath.Abs))
|
L.SetField(pkg, "Abs", luar.New(L, filepath.Abs))
|
||||||
L.SetField(pkg, "Base", luar.New(L, filepath.Base))
|
L.SetField(pkg, "Base", luar.New(L, filepath.Base))
|
||||||
L.SetField(pkg, "Clean", luar.New(L, filepath.Clean))
|
L.SetField(pkg, "Clean", luar.New(L, filepath.Clean))
|
||||||
|
|
|
@ -1,29 +1,25 @@
|
||||||
filetype: git-commit
|
filetype: git-commit
|
||||||
|
|
||||||
detect:
|
detect:
|
||||||
filename: "COMMIT_EDITMSG|TAG_EDITMSG"
|
filename: "^(.*[\\/])?(COMMIT_EDITMSG|TAG_EDITMSG)$"
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
# Commit message
|
|
||||||
- ignore: ".*"
|
|
||||||
# Comments
|
|
||||||
- comment:
|
|
||||||
start: "^#"
|
|
||||||
end: "$"
|
|
||||||
rules: []
|
|
||||||
# File changes
|
# File changes
|
||||||
- type.keyword: "#[[:space:]](deleted|modified|new file|renamed):[[:space:]].*"
|
- type.keyword: "#[[:space:]](deleted|modified|new file|renamed):[[:space:]].*"
|
||||||
- type.keyword: "#[[:space:]]deleted:"
|
- type.keyword: "#[[:space:]]deleted:"
|
||||||
- type.keyword: "#[[:space:]]modified:"
|
- type.keyword: "#[[:space:]]modified:"
|
||||||
- type.keyword: "#[[:space:]]new file:"
|
- type.keyword: "#[[:space:]]new file:"
|
||||||
- type.keyword: "#[[:space:]]renamed:"
|
- type.keyword: "#[[:space:]]renamed:"
|
||||||
# Untracked filenames
|
|
||||||
- error: "^# [^/?*:;{}\\\\]+\\.[^/?*:;{}\\\\]+$"
|
|
||||||
- type.keyword: "^#[[:space:]]Changes.*[:]"
|
- type.keyword: "^#[[:space:]]Changes.*[:]"
|
||||||
- type.keyword: "^#[[:space:]]Your branch and '[^']+"
|
- type.keyword: "^#[[:space:]]Your branch and '[^']+"
|
||||||
- type.keyword: "^#[[:space:]]Your branch and '"
|
- type.keyword: "^#[[:space:]]Your branch and '"
|
||||||
- type.keyword: "^#[[:space:]]On branch [^ ]+"
|
- type.keyword: "^#[[:space:]]On branch [^ ]+"
|
||||||
- type.keyword: "^#[[:space:]]On branch"
|
- type.keyword: "^#[[:space:]]On branch"
|
||||||
# Recolor hash symbols
|
# Color keywords for closing issues (such as on Github)
|
||||||
- special: "#"
|
- type.keyword: "\\b(?i)((fix(es|ed)?|close(s|d)?) #[0-9]+)\\b"
|
||||||
|
|
||||||
|
# Comments
|
||||||
|
- comment.line:
|
||||||
|
start: "^#"
|
||||||
|
end: "$"
|
||||||
|
rules: []
|
||||||
|
|
|
@ -1,28 +1,19 @@
|
||||||
filetype: git-rebase-todo
|
filetype: git-rebase-todo
|
||||||
|
|
||||||
detect:
|
detect:
|
||||||
filename: "git-rebase-todo"
|
filename: "^(.*[\\/])?git\\-rebase\\-todo$"
|
||||||
|
|
||||||
rules:
|
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
|
# Comments
|
||||||
- comment:
|
- comment.line:
|
||||||
start: "#"
|
start: "^#"
|
||||||
end: "$"
|
end: "$"
|
||||||
rules: []
|
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}"
|
|
||||||
|
|
Loading…
Reference in a new issue