development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-26 20:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

consolidate git extensions

Browse source 
related to #43978
This commit is contained in:
Joao Moreno 2018-02-20 16:00:50 +01:00
parent 8915b731a8
commit a563e2cb38
20 changed files with 112 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extensions/git/.vscodeignore
View file

@ -1,4 +1,5 @@
src/**
test/**
out/test/**
tsconfig.json
tsconfig.json
build/**

69
extensions/git/OSSREADME.json
View file

@ -1,29 +1,42 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "textmate/git.tmbundle",
"version": "0.0.0",
"license": "MIT",
"repositoryURL": "https://github.com/textmate/git.tmbundle",
"licenseDetail": [
"Copyright (c) 2008 Tim Harper",
"",
"Permission is hereby granted, free of charge, to any person obtaining",
"a copy of this software and associated documentation files (the\"",
"Software\"), to deal in the Software without restriction, including",
"without limitation the rights to use, copy, modify, merge, publish,",
"distribute, sublicense, and/or sell copies of the Software, and to",
"permit persons to whom the Software is furnished to do so, subject to",
"the following conditions:",
"",
"The above copyright notice and this permission notice shall be",
"included in all copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
]
}]
[
{
"name": "textmate/git.tmbundle",
"version": "0.0.0",
"license": "MIT",
"repositoryURL": "https://github.com/textmate/git.tmbundle",
"licenseDetail": [
"Copyright (c) 2008 Tim Harper",
"",
"Permission is hereby granted, free of charge, to any person obtaining",
"a copy of this software and associated documentation files (the\"",
"Software\"), to deal in the Software without restriction, including",
"without limitation the rights to use, copy, modify, merge, publish,",
"distribute, sublicense, and/or sell copies of the Software, and to",
"permit persons to whom the Software is furnished to do so, subject to",
"the following conditions:",
"",
"The above copyright notice and this permission notice shall be",
"included in all copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
]
},
{
"name": "textmate/diff.tmbundle",
"version": "0.0.0",
"repositoryURL": "https://github.com/textmate/diff.tmbundle",
"licenseDetail": [
"Permission to copy, use, modify, sell and distribute this",
"software is granted. This software is provided \"as is\" without",
"express or implied warranty, and with no claim as to its",
"suitability for any purpose."
]
}
]

0
extensions/gitsyntax/build/update-grammars.js → extensions/git/build/update-grammars.js
View file

0
extensions/gitsyntax/diff.language-configuration.json → extensions/git/languages/diff.language-configuration.json
View file

0
extensions/gitsyntax/git-commit.language-configuration.json → extensions/git/languages/git-commit.language-configuration.json
View file

0
extensions/gitsyntax/git-rebase.language-configuration.json → extensions/git/languages/git-rebase.language-configuration.json
View file

71
extensions/git/package.json
View file

@ -1,8 +1,8 @@
{
"name": "git",
"displayName": "%displayName%",
"description": "%description%",
"publisher": "vscode",
"displayName": "git",
"description": "Git",
"version": "0.0.1",
"engines": {
"vscode": "^1.5.0"
@ -18,7 +18,8 @@
"main": "./out/main",
"scripts": {
"compile": "gulp compile-extension:git",
"watch": "gulp watch-extension:git"
"watch": "gulp watch-extension:git",
"update-grammar": "node ./build/update-grammars.js"
},
"contributes": {
"commands": [
@ -1020,7 +1021,69 @@
"highContrast": "#8db9e2"
}
}
]
],
"languages": [
{
"id": "git-commit",
"aliases": [
"Git Commit Message",
"git-commit"
],
"filenames": [
"COMMIT_EDITMSG",
"MERGE_MSG"
],
"configuration": "./languages/git-commit.language-configuration.json"
},
{
"id": "git-rebase",
"aliases": [
"Git Rebase Message",
"git-rebase"
],
"filenames": [
"git-rebase-todo"
],
"configuration": "./languages/git-rebase.language-configuration.json"
},
{
"id": "diff",
"aliases": [
"Diff",
"diff"
],
"extensions": [
".patch",
".diff",
".rej"
],
"configuration": "./languages/diff.language-configuration.json"
}
],
"grammars": [
{
"language": "git-commit",
"scopeName": "text.git-commit",
"path": "./syntaxes/git-commit.tmLanguage.json"
},
{
"language": "git-rebase",
"scopeName": "text.git-rebase",
"path": "./syntaxes/git-rebase.tmLanguage.json"
},
{
"language": "diff",
"scopeName": "source.diff",
"path": "./syntaxes/diff.tmLanguage.json"
}
],
"configurationDefaults": {
"[git-commit]": {
"editor.rulers": [
72
]
}
}
},
"dependencies": {
"byline": "^5.0.0",

2
extensions/git/package.nls.json
View file

@ -1,4 +1,6 @@
{
"displayName": "Git",
"description": "Git SCM Integration",
"command.clone": "Clone",
"command.init": "Initialize Repository",
"command.close": "Close Repository",

0
extensions/gitsyntax/syntaxes/diff.tmLanguage.json → extensions/git/syntaxes/diff.tmLanguage.json
View file

0
extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json → extensions/git/syntaxes/git-commit.tmLanguage.json
View file

0
extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json → extensions/git/syntaxes/git-rebase.tmLanguage.json
View file

0
extensions/gitsyntax/test/colorize-fixtures/COMMIT_EDITMSG → extensions/git/test/colorize-fixtures/COMMIT_EDITMSG
View file

0
extensions/gitsyntax/test/colorize-fixtures/example.diff → extensions/git/test/colorize-fixtures/example.diff
View file

0
extensions/gitsyntax/test/colorize-fixtures/git-rebase-todo → extensions/git/test/colorize-fixtures/git-rebase-todo
View file

0
extensions/gitsyntax/test/colorize-results/COMMIT_EDITMSG.json → extensions/git/test/colorize-results/COMMIT_EDITMSG.json
View file

0
extensions/gitsyntax/test/colorize-results/example_diff.json → extensions/git/test/colorize-results/example_diff.json
View file

0
extensions/gitsyntax/test/colorize-results/git-rebase-todo.json → extensions/git/test/colorize-results/git-rebase-todo.json
View file

2
extensions/gitsyntax/.vscodeignore
View file

@ -1,2 +0,0 @@
test/**
build/**

42
extensions/gitsyntax/OSSREADME.json
View file

@ -1,42 +0,0 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[
{
"name": "textmate/git.tmbundle",
"version": "0.0.0",
"license": "MIT",
"repositoryURL": "https://github.com/textmate/git.tmbundle",
"licenseDetail": [
"Copyright (c) 2008 Tim Harper",
"",
"Permission is hereby granted, free of charge, to any person obtaining",
"a copy of this software and associated documentation files (the\"",
"Software\"), to deal in the Software without restriction, including",
"without limitation the rights to use, copy, modify, merge, publish,",
"distribute, sublicense, and/or sell copies of the Software, and to",
"permit persons to whom the Software is furnished to do so, subject to",
"the following conditions:",
"",
"The above copyright notice and this permission notice shall be",
"included in all copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
]
},
{
"name": "textmate/diff.tmbundle",
"version": "0.0.0",
"repositoryURL": "https://github.com/textmate/diff.tmbundle",
"licenseDetail": [
"Permission to copy, use, modify, sell and distribute this",
"software is granted. This software is provided \"as is\" without",
"express or implied warranty, and with no claim as to its",
"suitability for any purpose."
]
}
]

80
extensions/gitsyntax/package.json
View file

@ -1,80 +0,0 @@
{
"name": "gitsyntax",
"publisher": "vscode",
"displayName": "gitsyntax",
"description": "Git Syntax",
"version": "0.0.1",
"engines": {
"vscode": "^1.5.0"
},
"categories": [
"Other"
],
"scripts": {
"update-grammar": "node ./build/update-grammars.js"
},
"contributes": {
"languages": [
{
"id": "git-commit",
"aliases": [
"Git Commit Message",
"git-commit"
],
"filenames": [
"COMMIT_EDITMSG",
"MERGE_MSG"
],
"configuration": "./git-commit.language-configuration.json"
},
{
"id": "git-rebase",
"aliases": [
"Git Rebase Message",
"git-rebase"
],
"filenames": [
"git-rebase-todo"
],
"configuration": "./git-rebase.language-configuration.json"
},
{
"id": "diff",
"aliases": [
"Diff",
"diff"
],
"extensions": [
".patch",
".diff",
".rej"
],
"configuration": "./diff.language-configuration.json"
}
],
"grammars": [
{
"language": "git-commit",
"scopeName": "text.git-commit",
"path": "./syntaxes/git-commit.tmLanguage.json"
},
{
"language": "git-rebase",
"scopeName": "text.git-rebase",
"path": "./syntaxes/git-rebase.tmLanguage.json"
},
{
"language": "diff",
"scopeName": "source.diff",
"path": "./syntaxes/diff.tmLanguage.json"
}
],
"configurationDefaults": {
"[git-commit]": {
"editor.rulers": [
72
]
}
}
}
}