From dbbfa5d3a536a3d3cdc91595b274031f88407bf9 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 26 Feb 2018 17:24:56 +0100 Subject: [PATCH] delete diff extension fixes #44412 --- extensions/diff/.vscodeignore | 1 - extensions/diff/OSSREADME.json | 22 - extensions/diff/language-configuration.json | 11 - extensions/diff/package.json | 28 -- extensions/diff/package.nls.json | 4 - extensions/diff/syntaxes/diff.tmLanguage.json | 160 ------- .../diff/test/colorize-fixtures/test.diff | 19 - .../diff/test/colorize-results/test_diff.json | 398 ------------------ 8 files changed, 643 deletions(-) delete mode 100644 extensions/diff/.vscodeignore delete mode 100644 extensions/diff/OSSREADME.json delete mode 100644 extensions/diff/language-configuration.json delete mode 100644 extensions/diff/package.json delete mode 100644 extensions/diff/package.nls.json delete mode 100644 extensions/diff/syntaxes/diff.tmLanguage.json delete mode 100644 extensions/diff/test/colorize-fixtures/test.diff delete mode 100644 extensions/diff/test/colorize-results/test_diff.json diff --git a/extensions/diff/.vscodeignore b/extensions/diff/.vscodeignore deleted file mode 100644 index 77ab386fc7df4..0000000000000 --- a/extensions/diff/.vscodeignore +++ /dev/null @@ -1 +0,0 @@ -test/** \ No newline at end of file diff --git a/extensions/diff/OSSREADME.json b/extensions/diff/OSSREADME.json deleted file mode 100644 index 3be6fb81380fd..0000000000000 --- a/extensions/diff/OSSREADME.json +++ /dev/null @@ -1,22 +0,0 @@ -// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS: -[{ - "name": "textmate/diff.tmbundle", - "version": "0.0.0", - "license": "TextMate Bundle License", - "repositoryURL": "https://github.com/textmate/diff.tmbundle", - "licenseDetail": [ - "Copyright (c) textmate-diff.tmbundle project authors", - "", - "If not otherwise specified (see below), files in this repository fall under the following license:", - "", - "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.", - "", - "An exception is made for files in readable text which contain their own license information,", - "or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added", - "to the base-name name of the original file, and an extension of txt, html, or similar. For example", - "\"tidy\" is accompanied by \"tidy-license.txt\"." - ] -}] \ No newline at end of file diff --git a/extensions/diff/language-configuration.json b/extensions/diff/language-configuration.json deleted file mode 100644 index da6ed54715005..0000000000000 --- a/extensions/diff/language-configuration.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "comments": { - "lineComment": "//", - "blockComment": [ "/*", "*/" ] - }, - "brackets": [ - ["{", "}"], - ["[", "]"], - ["(", ")"] - ] -} \ No newline at end of file diff --git a/extensions/diff/package.json b/extensions/diff/package.json deleted file mode 100644 index 79d69c4e472ba..0000000000000 --- a/extensions/diff/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "diff", - "displayName": "%displayName%", - "description": "%description%", - "version": "0.1.0", - "publisher": "vscode", - "engines": { "vscode": "*" }, - "scripts": { - "update-grammar": "node ../../build/npm/update-grammar.js textmate/diff.tmbundle Syntaxes/Diff.plist ./syntaxes/diff.tmLanguage.json" - }, - "contributes": { - "languages": [ - { - "id": "diff", - "aliases": ["Diff", "diff" ], - "extensions": [".diff", ".patch", ".rej"], - "configuration": "./language-configuration.json" - } - ], - "grammars": [ - { - "language": "diff", - "scopeName": "source.diff", - "path": "./syntaxes/diff.tmLanguage.json" - } - ] - } -} \ No newline at end of file diff --git a/extensions/diff/package.nls.json b/extensions/diff/package.nls.json deleted file mode 100644 index 2159c202e6837..0000000000000 --- a/extensions/diff/package.nls.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "displayName": "Diff File Language Features", - "description": "Provides Syntax highlighting, Bracket matching and other language features in Diff files" -} \ No newline at end of file diff --git a/extensions/diff/syntaxes/diff.tmLanguage.json b/extensions/diff/syntaxes/diff.tmLanguage.json deleted file mode 100644 index d60bbb145f7d7..0000000000000 --- a/extensions/diff/syntaxes/diff.tmLanguage.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "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" - } - ] -} \ No newline at end of file diff --git a/extensions/diff/test/colorize-fixtures/test.diff b/extensions/diff/test/colorize-fixtures/test.diff deleted file mode 100644 index f8805a8987edb..0000000000000 --- a/extensions/diff/test/colorize-fixtures/test.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- lao Sat Jan 26 23:30:39 1991 -+++ tzu Sat Jan 26 23:30:50 1991 -@@ -1,7 +1,6 @@ --The Way that can be told of is not the eternal Way; --The name that can be named is not the eternal name. - The Nameless is the origin of Heaven and Earth; --The Named is the mother of all things. -+The named is the mother of all things. -+ - Therefore let there always be non-being, - so we may see their subtlety, - And let there always be being, -@@ -9,3 +8,6 @@ - The two are the same, - But after they are produced, - they have different names. -+They both may be called deep and profound. -+Deeper and more profound, -+The door of all subtleties! \ No newline at end of file diff --git a/extensions/diff/test/colorize-results/test_diff.json b/extensions/diff/test/colorize-results/test_diff.json deleted file mode 100644 index 26ab2f4fb0300..0000000000000 --- a/extensions/diff/test/colorize-results/test_diff.json +++ /dev/null @@ -1,398 +0,0 @@ -[ - { - "c": "---", - "t": "source.diff meta.diff.header.from-file punctuation.definition.from-file.diff", - "r": { - "dark_plus": "meta.diff.header: #569CD6", - "light_plus": "meta.diff.header: #000080", - "dark_vs": "meta.diff.header: #569CD6", - "light_vs": "meta.diff.header: #000080", - "hc_black": "meta.diff.header: #000080" - } - }, - { - "c": " lao\tSat Jan 26 23:30:39 1991", - "t": "source.diff meta.diff.header.from-file", - "r": { - "dark_plus": "meta.diff.header: #569CD6", - "light_plus": "meta.diff.header: #000080", - "dark_vs": "meta.diff.header: #569CD6", - "light_vs": "meta.diff.header: #000080", - "hc_black": "meta.diff.header: #000080" - } - }, - { - "c": "+++", - "t": "source.diff meta.diff.header.to-file punctuation.definition.to-file.diff", - "r": { - "dark_plus": "meta.diff.header: #569CD6", - "light_plus": "meta.diff.header: #000080", - "dark_vs": "meta.diff.header: #569CD6", - "light_vs": "meta.diff.header: #000080", - "hc_black": "meta.diff.header: #000080" - } - }, - { - "c": " tzu\tSat Jan 26 23:30:50 1991", - "t": "source.diff meta.diff.header.to-file", - "r": { - "dark_plus": "meta.diff.header: #569CD6", - "light_plus": "meta.diff.header: #000080", - "dark_vs": "meta.diff.header: #569CD6", - "light_vs": "meta.diff.header: #000080", - "hc_black": "meta.diff.header: #000080" - } - }, - { - "c": "@@", - "t": "source.diff meta.diff.range.unified punctuation.definition.range.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": " ", - "t": "source.diff meta.diff.range.unified", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "-1,7 +1,6", - "t": "source.diff meta.diff.range.unified meta.toc-list.line-number.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": " ", - "t": "source.diff meta.diff.range.unified", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "@@", - "t": "source.diff meta.diff.range.unified punctuation.definition.range.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "-", - "t": "source.diff markup.deleted.diff punctuation.definition.deleted.diff", - "r": { - "dark_plus": "markup.deleted: #CE9178", - "light_plus": "markup.deleted: #A31515", - "dark_vs": "markup.deleted: #CE9178", - "light_vs": "markup.deleted: #A31515", - "hc_black": "markup.deleted: #CE9178" - } - }, - { - "c": "The Way that can be told of is not the eternal Way;", - "t": "source.diff markup.deleted.diff", - "r": { - "dark_plus": "markup.deleted: #CE9178", - "light_plus": "markup.deleted: #A31515", - "dark_vs": "markup.deleted: #CE9178", - "light_vs": "markup.deleted: #A31515", - "hc_black": "markup.deleted: #CE9178" - } - }, - { - "c": "-", - "t": "source.diff markup.deleted.diff punctuation.definition.deleted.diff", - "r": { - "dark_plus": "markup.deleted: #CE9178", - "light_plus": "markup.deleted: #A31515", - "dark_vs": "markup.deleted: #CE9178", - "light_vs": "markup.deleted: #A31515", - "hc_black": "markup.deleted: #CE9178" - } - }, - { - "c": "The name that can be named is not the eternal name.", - "t": "source.diff markup.deleted.diff", - "r": { - "dark_plus": "markup.deleted: #CE9178", - "light_plus": "markup.deleted: #A31515", - "dark_vs": "markup.deleted: #CE9178", - "light_vs": "markup.deleted: #A31515", - "hc_black": "markup.deleted: #CE9178" - } - }, - { - "c": " The Nameless is the origin of Heaven and Earth;", - "t": "source.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "-", - "t": "source.diff markup.deleted.diff punctuation.definition.deleted.diff", - "r": { - "dark_plus": "markup.deleted: #CE9178", - "light_plus": "markup.deleted: #A31515", - "dark_vs": "markup.deleted: #CE9178", - "light_vs": "markup.deleted: #A31515", - "hc_black": "markup.deleted: #CE9178" - } - }, - { - "c": "The Named is the mother of all things.", - "t": "source.diff markup.deleted.diff", - "r": { - "dark_plus": "markup.deleted: #CE9178", - "light_plus": "markup.deleted: #A31515", - "dark_vs": "markup.deleted: #CE9178", - "light_vs": "markup.deleted: #A31515", - "hc_black": "markup.deleted: #CE9178" - } - }, - { - "c": "+", - "t": "source.diff markup.inserted.diff punctuation.definition.inserted.diff", - "r": { - "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", - "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", - "hc_black": "markup.inserted: #B5CEA8" - } - }, - { - "c": "The named is the mother of all things.", - "t": "source.diff markup.inserted.diff", - "r": { - "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", - "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", - "hc_black": "markup.inserted: #B5CEA8" - } - }, - { - "c": "+", - "t": "source.diff markup.inserted.diff punctuation.definition.inserted.diff", - "r": { - "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", - "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", - "hc_black": "markup.inserted: #B5CEA8" - } - }, - { - "c": " Therefore let there always be non-being,", - "t": "source.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": " so we may see their subtlety,", - "t": "source.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": " And let there always be being,", - "t": "source.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "@@", - "t": "source.diff meta.diff.range.unified punctuation.definition.range.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": " ", - "t": "source.diff meta.diff.range.unified", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "-9,3 +8,6", - "t": "source.diff meta.diff.range.unified meta.toc-list.line-number.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": " ", - "t": "source.diff meta.diff.range.unified", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "@@", - "t": "source.diff meta.diff.range.unified punctuation.definition.range.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": " The two are the same,", - "t": "source.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": " But after they are produced,", - "t": "source.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": " they have different names.", - "t": "source.diff", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "+", - "t": "source.diff markup.inserted.diff punctuation.definition.inserted.diff", - "r": { - "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", - "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", - "hc_black": "markup.inserted: #B5CEA8" - } - }, - { - "c": "They both may be called deep and profound.", - "t": "source.diff markup.inserted.diff", - "r": { - "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", - "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", - "hc_black": "markup.inserted: #B5CEA8" - } - }, - { - "c": "+", - "t": "source.diff markup.inserted.diff punctuation.definition.inserted.diff", - "r": { - "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", - "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", - "hc_black": "markup.inserted: #B5CEA8" - } - }, - { - "c": "Deeper and more profound,", - "t": "source.diff markup.inserted.diff", - "r": { - "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", - "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", - "hc_black": "markup.inserted: #B5CEA8" - } - }, - { - "c": "+", - "t": "source.diff markup.inserted.diff punctuation.definition.inserted.diff", - "r": { - "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", - "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", - "hc_black": "markup.inserted: #B5CEA8" - } - }, - { - "c": "The door of all subtleties!", - "t": "source.diff markup.inserted.diff", - "r": { - "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", - "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", - "hc_black": "markup.inserted: #B5CEA8" - } - } -] \ No newline at end of file