Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'
This commit is contained in:
Joe Previte
160
lib/vscode/extensions/git/syntaxes/diff.tmLanguage.json
Normal file
160
lib/vscode/extensions/git/syntaxes/diff.tmLanguage.json
Normal file
@ -0,0 +1,160 @@
|
||||
{
|
||||
"information_for_contributors": [
|
||||
"This file has been converted from https://github.com/textmate/diff.tmbundle/blob/master/Syntaxes/Diff.plist",
|
||||
"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/diff.tmbundle/commit/0593bb775eab1824af97ef2172fd38822abd97d7",
|
||||
"name": "Diff",
|
||||
"scopeName": "source.diff",
|
||||
"patterns": [
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.separator.diff"
|
||||
}
|
||||
},
|
||||
"match": "^((\\*{15})|(={67})|(-{3}))$\\n?",
|
||||
"name": "meta.separator.diff"
|
||||
},
|
||||
{
|
||||
"match": "^\\d+(,\\d+)*(a|d|c)\\d+(,\\d+)*$\\n?",
|
||||
"name": "meta.diff.range.normal"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.range.diff"
|
||||
},
|
||||
"2": {
|
||||
"name": "meta.toc-list.line-number.diff"
|
||||
},
|
||||
"3": {
|
||||
"name": "punctuation.definition.range.diff"
|
||||
}
|
||||
},
|
||||
"match": "^(@@)\\s*(.+?)\\s*(@@)($\\n?)?",
|
||||
"name": "meta.diff.range.unified"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"3": {
|
||||
"name": "punctuation.definition.range.diff"
|
||||
},
|
||||
"4": {
|
||||
"name": "punctuation.definition.range.diff"
|
||||
},
|
||||
"6": {
|
||||
"name": "punctuation.definition.range.diff"
|
||||
},
|
||||
"7": {
|
||||
"name": "punctuation.definition.range.diff"
|
||||
}
|
||||
},
|
||||
"match": "^(((\\-{3}) .+ (\\-{4}))|((\\*{3}) .+ (\\*{4})))$\\n?",
|
||||
"name": "meta.diff.range.context"
|
||||
},
|
||||
{
|
||||
"match": "^diff --git a/.*$\\n?",
|
||||
"name": "meta.diff.header.git"
|
||||
},
|
||||
{
|
||||
"match": "^diff (-|\\S+\\s+\\S+).*$\\n?",
|
||||
"name": "meta.diff.header.command"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"4": {
|
||||
"name": "punctuation.definition.from-file.diff"
|
||||
},
|
||||
"6": {
|
||||
"name": "punctuation.definition.from-file.diff"
|
||||
},
|
||||
"7": {
|
||||
"name": "punctuation.definition.from-file.diff"
|
||||
}
|
||||
},
|
||||
"match": "(^(((-{3}) .+)|((\\*{3}) .+))$\\n?|^(={4}) .+(?= - ))",
|
||||
"name": "meta.diff.header.from-file"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"2": {
|
||||
"name": "punctuation.definition.to-file.diff"
|
||||
},
|
||||
"3": {
|
||||
"name": "punctuation.definition.to-file.diff"
|
||||
},
|
||||
"4": {
|
||||
"name": "punctuation.definition.to-file.diff"
|
||||
}
|
||||
},
|
||||
"match": "(^(\\+{3}) .+$\\n?| (-) .* (={4})$\\n?)",
|
||||
"name": "meta.diff.header.to-file"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"3": {
|
||||
"name": "punctuation.definition.inserted.diff"
|
||||
},
|
||||
"6": {
|
||||
"name": "punctuation.definition.inserted.diff"
|
||||
}
|
||||
},
|
||||
"match": "^(((>)( .*)?)|((\\+).*))$\\n?",
|
||||
"name": "markup.inserted.diff"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.changed.diff"
|
||||
}
|
||||
},
|
||||
"match": "^(!).*$\\n?",
|
||||
"name": "markup.changed.diff"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"3": {
|
||||
"name": "punctuation.definition.deleted.diff"
|
||||
},
|
||||
"6": {
|
||||
"name": "punctuation.definition.deleted.diff"
|
||||
}
|
||||
},
|
||||
"match": "^(((<)( .*)?)|((-).*))$\\n?",
|
||||
"name": "markup.deleted.diff"
|
||||
},
|
||||
{
|
||||
"begin": "^(#)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.comment.diff"
|
||||
}
|
||||
},
|
||||
"comment": "Git produces unified diffs with embedded comments\"",
|
||||
"end": "\\n",
|
||||
"name": "comment.line.number-sign.diff"
|
||||
},
|
||||
{
|
||||
"match": "^index [0-9a-f]{7,40}\\.\\.[0-9a-f]{7,40}.*$\\n?",
|
||||
"name": "meta.diff.index.git"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.separator.key-value.diff"
|
||||
},
|
||||
"2": {
|
||||
"name": "meta.toc-list.file-name.diff"
|
||||
}
|
||||
},
|
||||
"match": "^Index(:) (.+)$\\n?",
|
||||
"name": "meta.diff.index"
|
||||
},
|
||||
{
|
||||
"match": "^Only in .*: .*$\\n?",
|
||||
"name": "meta.diff.only-in"
|
||||
}
|
||||
]
|
||||
}
|
||||
141
lib/vscode/extensions/git/syntaxes/git-commit.tmLanguage.json
Normal file
141
lib/vscode/extensions/git/syntaxes/git-commit.tmLanguage.json
Normal file
@ -0,0 +1,141 @@
|
||||
{
|
||||
"information_for_contributors": [
|
||||
"This file has been converted from https://github.com/textmate/git.tmbundle/blob/master/Syntaxes/Git%20Commit%20Message.tmLanguage",
|
||||
"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",
|
||||
"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",
|
||||
"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"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"begin": "^(?=# Please enter the commit message)",
|
||||
"end": "\\z",
|
||||
"name": "meta.scope.metadata.git-commit",
|
||||
"patterns": [
|
||||
{
|
||||
"include": "#metadata"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"repository": {
|
||||
"comment": {
|
||||
"begin": "^(#)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.comment.git-commit"
|
||||
}
|
||||
},
|
||||
"end": "\\n",
|
||||
"name": "comment.line.number-sign.git-commit"
|
||||
},
|
||||
"metadata": {
|
||||
"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"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"include": "#comment"
|
||||
},
|
||||
{
|
||||
"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"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
{
|
||||
"information_for_contributors": [
|
||||
"This file has been converted from https://github.com/textmate/git.tmbundle/blob/master/Syntaxes/Git%20Rebase%20Message.tmLanguage",
|
||||
"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/5870cf3f8abad3a6637bdf69250b5d2ded427dc4",
|
||||
"name": "Git Rebase Message",
|
||||
"scopeName": "text.git-rebase",
|
||||
"patterns": [
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "punctuation.definition.comment.git-rebase"
|
||||
}
|
||||
},
|
||||
"match": "^\\s*(#).*$\\n?",
|
||||
"name": "comment.line.number-sign.git-rebase"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "support.function.git-rebase"
|
||||
},
|
||||
"2": {
|
||||
"name": "constant.sha.git-rebase"
|
||||
},
|
||||
"3": {
|
||||
"name": "meta.commit-message.git-rebase"
|
||||
}
|
||||
},
|
||||
"match": "^\\s*(pick|p|reword|r|edit|e|squash|s|fixup|f|drop|d)\\s+([0-9a-f]+)\\s+(.*)$",
|
||||
"name": "meta.commit-command.git-rebase"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "support.function.git-rebase"
|
||||
},
|
||||
"2": {
|
||||
"patterns": [
|
||||
{
|
||||
"include": "source.shell"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"match": "^\\s*(exec|x)\\s+(.*)$",
|
||||
"name": "meta.commit-command.git-rebase"
|
||||
},
|
||||
{
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "support.function.git-rebase"
|
||||
}
|
||||
},
|
||||
"match": "^\\s*(break|b)\\s*$",
|
||||
"name": "meta.commit-command.git-rebase"
|
||||
}
|
||||
]
|
||||
}
|
||||
10
lib/vscode/extensions/git/syntaxes/ignore.tmLanguage.json
Normal file
10
lib/vscode/extensions/git/syntaxes/ignore.tmLanguage.json
Normal file
@ -0,0 +1,10 @@
|
||||
{
|
||||
"name": "Ignore",
|
||||
"scopeName": "source.ignore",
|
||||
"patterns": [
|
||||
{
|
||||
"match": "^#.*",
|
||||
"name": "comment.line.number-sign.ignore"
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user