diff --git a/extensions/git-base/.vscodeignore b/extensions/git-base/.vscodeignore new file mode 100644 index 00000000000..d9011becfb6 --- /dev/null +++ b/extensions/git-base/.vscodeignore @@ -0,0 +1,2 @@ +build/** +cgmanifest.json diff --git a/extensions/git/build/update-grammars.js b/extensions/git-base/build/update-grammars.js similarity index 100% rename from extensions/git/build/update-grammars.js rename to extensions/git-base/build/update-grammars.js diff --git a/extensions/git-base/cgmanifest.json b/extensions/git-base/cgmanifest.json new file mode 100644 index 00000000000..256966aba20 --- /dev/null +++ b/extensions/git-base/cgmanifest.json @@ -0,0 +1,39 @@ +{ + "registrations": [ + { + "component": { + "type": "git", + "git": { + "name": "textmate/git.tmbundle", + "repositoryUrl": "https://github.com/textmate/git.tmbundle", + "commitHash": "5870cf3f8abad3a6637bdf69250b5d2ded427dc4" + } + }, + "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." + ], + "license": "MIT", + "version": "0.0.0" + } + ], + "version": 1 +} diff --git a/extensions/git/languages/git-commit.language-configuration.json b/extensions/git-base/languages/git-commit.language-configuration.json similarity index 100% rename from extensions/git/languages/git-commit.language-configuration.json rename to extensions/git-base/languages/git-commit.language-configuration.json diff --git a/extensions/git/languages/git-rebase.language-configuration.json b/extensions/git-base/languages/git-rebase.language-configuration.json similarity index 100% rename from extensions/git/languages/git-rebase.language-configuration.json rename to extensions/git-base/languages/git-rebase.language-configuration.json diff --git a/extensions/git/languages/ignore.language-configuration.json b/extensions/git-base/languages/ignore.language-configuration.json similarity index 100% rename from extensions/git/languages/ignore.language-configuration.json rename to extensions/git-base/languages/ignore.language-configuration.json diff --git a/extensions/git-base/package.json b/extensions/git-base/package.json new file mode 100644 index 00000000000..db3cbb7a812 --- /dev/null +++ b/extensions/git-base/package.json @@ -0,0 +1,70 @@ +{ + "name": "git-base", + "displayName": "%displayName%", + "description": "%description%", + "version": "1.0.0", + "publisher": "vscode", + "license": "MIT", + "engines": { + "vscode": "0.10.x" + }, + "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": "./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": "ignore", + "aliases": [ + "Ignore", + "ignore" + ], + "extensions": [ + ".gitignore_global", + ".gitignore" + ], + "configuration": "./languages/ignore.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": "ignore", + "scopeName": "source.ignore", + "path": "./syntaxes/ignore.tmLanguage.json" + } + ] + } +} diff --git a/extensions/git-base/package.nls.json b/extensions/git-base/package.nls.json new file mode 100644 index 00000000000..4c1acedb648 --- /dev/null +++ b/extensions/git-base/package.nls.json @@ -0,0 +1,4 @@ +{ + "displayName": "Git Base", + "description": "Git static contributions and pickers." +} diff --git a/extensions/git/syntaxes/git-commit.tmLanguage.json b/extensions/git-base/syntaxes/git-commit.tmLanguage.json similarity index 100% rename from extensions/git/syntaxes/git-commit.tmLanguage.json rename to extensions/git-base/syntaxes/git-commit.tmLanguage.json diff --git a/extensions/git/syntaxes/git-rebase.tmLanguage.json b/extensions/git-base/syntaxes/git-rebase.tmLanguage.json similarity index 100% rename from extensions/git/syntaxes/git-rebase.tmLanguage.json rename to extensions/git-base/syntaxes/git-rebase.tmLanguage.json diff --git a/extensions/git/syntaxes/ignore.tmLanguage.json b/extensions/git-base/syntaxes/ignore.tmLanguage.json similarity index 100% rename from extensions/git/syntaxes/ignore.tmLanguage.json rename to extensions/git-base/syntaxes/ignore.tmLanguage.json diff --git a/extensions/git/package.json b/extensions/git/package.json index d6f792d939e..ec5d16e0dbd 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -30,7 +30,6 @@ "compile": "gulp compile-extension:git", "watch": "gulp watch-extension:git", "update-emoji": "node ./build/update-emoji.js", - "update-grammar": "node ./build/update-grammars.js", "test": "node ../../node_modules/mocha/bin/mocha" }, "capabilities": { @@ -2297,60 +2296,6 @@ } } ], - "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": "ignore", - "aliases": [ - "Ignore", - "ignore" - ], - "extensions": [ - ".gitignore_global", - ".gitignore" - ], - "configuration": "./languages/ignore.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": "ignore", - "scopeName": "source.ignore", - "path": "./syntaxes/ignore.tmLanguage.json" - } - ], "configurationDefaults": { "[git-commit]": { "editor.rulers": [ diff --git a/extensions/git/test/mocha.opts b/extensions/git/test/mocha.opts deleted file mode 100644 index 93c2e8fffb6..00000000000 --- a/extensions/git/test/mocha.opts +++ /dev/null @@ -1 +0,0 @@ ---ui tdd out/test \ No newline at end of file diff --git a/extensions/git/test/colorize-fixtures/COMMIT_EDITMSG b/extensions/vscode-colorize-tests/test/colorize-fixtures/COMMIT_EDITMSG similarity index 100% rename from extensions/git/test/colorize-fixtures/COMMIT_EDITMSG rename to extensions/vscode-colorize-tests/test/colorize-fixtures/COMMIT_EDITMSG diff --git a/extensions/git/test/colorize-fixtures/git-rebase-todo b/extensions/vscode-colorize-tests/test/colorize-fixtures/git-rebase-todo similarity index 89% rename from extensions/git/test/colorize-fixtures/git-rebase-todo rename to extensions/vscode-colorize-tests/test/colorize-fixtures/git-rebase-todo index 3b6df1cd4f7..3efe501eb98 100644 --- a/extensions/git/test/colorize-fixtures/git-rebase-todo +++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/git-rebase-todo @@ -12,4 +12,4 @@ reword 4ca2acc i cant' typ goods # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message -# x, exec = run command (the rest of the line) using shell \ No newline at end of file +# x, exec = run command (the rest of the line) using shell diff --git a/extensions/git/test/colorize-results/COMMIT_EDITMSG.json b/extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json similarity index 100% rename from extensions/git/test/colorize-results/COMMIT_EDITMSG.json rename to extensions/vscode-colorize-tests/test/colorize-results/COMMIT_EDITMSG.json diff --git a/extensions/git/test/colorize-results/git-rebase-todo.json b/extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json similarity index 100% rename from extensions/git/test/colorize-results/git-rebase-todo.json rename to extensions/vscode-colorize-tests/test/colorize-results/git-rebase-todo.json