Skip to content

Commit a563e2c

Browse files
joaomorenojoaomoreno
committed
consolidate git extensions
related to microsoft#43978
1 parent 8915b73 commit a563e2c

20 files changed

Lines changed: 112 additions & 157 deletions

‎extensions/git/.vscodeignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
src/**
22
test/**
33
out/test/**
4-
tsconfig.json
4+
tsconfig.json
5+
build/**

‎extensions/git/OSSREADME.json‎

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,42 @@
11
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
2-
[{
3-
"name": "textmate/git.tmbundle",
4-
"version": "0.0.0",
5-
"license": "MIT",
6-
"repositoryURL": "https://github.com/textmate/git.tmbundle",
7-
"licenseDetail": [
8-
"Copyright (c) 2008 Tim Harper",
9-
"",
10-
"Permission is hereby granted, free of charge, to any person obtaining",
11-
"a copy of this software and associated documentation files (the\"",
12-
"Software\"), to deal in the Software without restriction, including",
13-
"without limitation the rights to use, copy, modify, merge, publish,",
14-
"distribute, sublicense, and/or sell copies of the Software, and to",
15-
"permit persons to whom the Software is furnished to do so, subject to",
16-
"the following conditions:",
17-
"",
18-
"The above copyright notice and this permission notice shall be",
19-
"included in all copies or substantial portions of the Software.",
20-
"",
21-
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
22-
"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
23-
"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
24-
"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
25-
"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
26-
"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
27-
"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
28-
]
29-
}]
2+
[
3+
{
4+
"name": "textmate/git.tmbundle",
5+
"version": "0.0.0",
6+
"license": "MIT",
7+
"repositoryURL": "https://github.com/textmate/git.tmbundle",
8+
"licenseDetail": [
9+
"Copyright (c) 2008 Tim Harper",
10+
"",
11+
"Permission is hereby granted, free of charge, to any person obtaining",
12+
"a copy of this software and associated documentation files (the\"",
13+
"Software\"), to deal in the Software without restriction, including",
14+
"without limitation the rights to use, copy, modify, merge, publish,",
15+
"distribute, sublicense, and/or sell copies of the Software, and to",
16+
"permit persons to whom the Software is furnished to do so, subject to",
17+
"the following conditions:",
18+
"",
19+
"The above copyright notice and this permission notice shall be",
20+
"included in all copies or substantial portions of the Software.",
21+
"",
22+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
23+
"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
24+
"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
25+
"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
26+
"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
27+
"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
28+
"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
29+
]
30+
},
31+
{
32+
"name": "textmate/diff.tmbundle",
33+
"version": "0.0.0",
34+
"repositoryURL": "https://github.com/textmate/diff.tmbundle",
35+
"licenseDetail": [
36+
"Permission to copy, use, modify, sell and distribute this",
37+
"software is granted. This software is provided \"as is\" without",
38+
"express or implied warranty, and with no claim as to its",
39+
"suitability for any purpose."
40+
]
41+
}
42+
]

extensions/gitsyntax/build/update-grammars.js renamed to extensions/git/build/update-grammars.js

File renamed without changes.

extensions/gitsyntax/diff.language-configuration.json renamed to extensions/git/languages/diff.language-configuration.json

File renamed without changes.

extensions/gitsyntax/git-commit.language-configuration.json renamed to extensions/git/languages/git-commit.language-configuration.json

File renamed without changes.

extensions/gitsyntax/git-rebase.language-configuration.json renamed to extensions/git/languages/git-rebase.language-configuration.json

File renamed without changes.

‎extensions/git/package.json‎

Lines changed: 67 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "git",
3+
"displayName": "%displayName%",
4+
"description": "%description%",
35
"publisher": "vscode",
4-
"displayName": "git",
5-
"description": "Git",
66
"version": "0.0.1",
77
"engines": {
88
"vscode": "^1.5.0"
@@ -18,7 +18,8 @@
1818
"main": "./out/main",
1919
"scripts": {
2020
"compile": "gulp compile-extension:git",
21-
"watch": "gulp watch-extension:git"
21+
"watch": "gulp watch-extension:git",
22+
"update-grammar": "node ./build/update-grammars.js"
2223
},
2324
"contributes": {
2425
"commands": [
@@ -1020,7 +1021,69 @@
10201021
"highContrast": "#8db9e2"
10211022
}
10221023
}
1023-
]
1024+
],
1025+
"languages": [
1026+
{
1027+
"id": "git-commit",
1028+
"aliases": [
1029+
"Git Commit Message",
1030+
"git-commit"
1031+
],
1032+
"filenames": [
1033+
"COMMIT_EDITMSG",
1034+
"MERGE_MSG"
1035+
],
1036+
"configuration": "./languages/git-commit.language-configuration.json"
1037+
},
1038+
{
1039+
"id": "git-rebase",
1040+
"aliases": [
1041+
"Git Rebase Message",
1042+
"git-rebase"
1043+
],
1044+
"filenames": [
1045+
"git-rebase-todo"
1046+
],
1047+
"configuration": "./languages/git-rebase.language-configuration.json"
1048+
},
1049+
{
1050+
"id": "diff",
1051+
"aliases": [
1052+
"Diff",
1053+
"diff"
1054+
],
1055+
"extensions": [
1056+
".patch",
1057+
".diff",
1058+
".rej"
1059+
],
1060+
"configuration": "./languages/diff.language-configuration.json"
1061+
}
1062+
],
1063+
"grammars": [
1064+
{
1065+
"language": "git-commit",
1066+
"scopeName": "text.git-commit",
1067+
"path": "./syntaxes/git-commit.tmLanguage.json"
1068+
},
1069+
{
1070+
"language": "git-rebase",
1071+
"scopeName": "text.git-rebase",
1072+
"path": "./syntaxes/git-rebase.tmLanguage.json"
1073+
},
1074+
{
1075+
"language": "diff",
1076+
"scopeName": "source.diff",
1077+
"path": "./syntaxes/diff.tmLanguage.json"
1078+
}
1079+
],
1080+
"configurationDefaults": {
1081+
"[git-commit]": {
1082+
"editor.rulers": [
1083+
72
1084+
]
1085+
}
1086+
}
10241087
},
10251088
"dependencies": {
10261089
"byline": "^5.0.0",

‎extensions/git/package.nls.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"displayName": "Git",
3+
"description": "Git SCM Integration",
24
"command.clone": "Clone",
35
"command.init": "Initialize Repository",
46
"command.close": "Close Repository",

extensions/gitsyntax/syntaxes/diff.tmLanguage.json renamed to extensions/git/syntaxes/diff.tmLanguage.json

File renamed without changes.

extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json renamed to extensions/git/syntaxes/git-commit.tmLanguage.json

File renamed without changes.

0 commit comments

Comments
 (0)