From 7dbc878a32890ea50a466dffcfd930a525fad704 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 10 Dec 2015 15:24:11 +0100 Subject: [PATCH] remove csharp-syntax-only-extension because vscode omnisharp ships that --- build/gulpfile.vscode.js | 2 +- extensions/csharp/OSSREADME.json | 7 - extensions/csharp/csharp.configuration.json | 11 - extensions/csharp/package.json | 23 - extensions/csharp/syntaxes/csharp.json | 566 -------------------- 5 files changed, 1 insertion(+), 608 deletions(-) delete mode 100644 extensions/csharp/OSSREADME.json delete mode 100644 extensions/csharp/csharp.configuration.json delete mode 100644 extensions/csharp/package.json delete mode 100644 extensions/csharp/syntaxes/csharp.json diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 55367db027b..95fc3139ea2 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -41,7 +41,7 @@ var baseModules = [ // Build var builtInExtensions = { - 'jrieken.vscode-omnisharp': '0.1.0', + 'jrieken.vscode-omnisharp': '0.2.0', }; var vscodeEntryPoints = _.flatten([ diff --git a/extensions/csharp/OSSREADME.json b/extensions/csharp/OSSREADME.json deleted file mode 100644 index 0a9d97ec596..00000000000 --- a/extensions/csharp/OSSREADME.json +++ /dev/null @@ -1,7 +0,0 @@ -// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS: -[{ - "name": "language-csharp", - "version": "0.11.0", - "license": "Dual-licensed under MIT and GPL", - "repositoryURL": "https://github.com/atom/language-csharp" -}] diff --git a/extensions/csharp/csharp.configuration.json b/extensions/csharp/csharp.configuration.json deleted file mode 100644 index 7c3c76c3c46..00000000000 --- a/extensions/csharp/csharp.configuration.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "comments": { - "lineComment": "//", - "blockComment": ["/*", "*/"] - }, - "brackets": [ - ["{", "}"], - ["[", "]"], - ["(", ")"] - ] -} \ No newline at end of file diff --git a/extensions/csharp/package.json b/extensions/csharp/package.json deleted file mode 100644 index 82e1a8d701a..00000000000 --- a/extensions/csharp/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "csharp", - "version": "0.1.0", - "publisher": "vscode", - "engines": { "vscode": "*" }, - "contributes": { - "languages": [{ - "id": "csharp", - "extensions": [ ".cs", ".csx" ], - "aliases": [ "C#", "csharp" ], - "configuration": "./csharp.configuration.json" - }], - "grammars": [{ - "language": "csharp", - "scopeName": "source.cs", - "path": "./syntaxes/csharp.json" - }], - "jsonValidation": [{ - "fileMatch": "project.json", - "url": "http://json.schemastore.org/project" - }] - } -} \ No newline at end of file diff --git a/extensions/csharp/syntaxes/csharp.json b/extensions/csharp/syntaxes/csharp.json deleted file mode 100644 index 1d5924b81b0..00000000000 --- a/extensions/csharp/syntaxes/csharp.json +++ /dev/null @@ -1,566 +0,0 @@ -{ - "scopeName": "source.cs", - "name": "C#", - "fileTypes": [ - "cs" - ], - "foldingStartMarker": "^\\s*#\\s*region|^\\s*/\\*|^(?![^{]*?//|[^{]*?/\\*(?!.*?\\*/.*?\\{)).*?\\{\\s*($|//|/\\*(?!.*?\\*/.*\\S))", - "foldingStopMarker": "^\\s*#\\s*endregion|^\\s*\\*/|^\\s*\\}", - "patterns": [ - { - "captures": { - "1": { - "name": "keyword.other.using.cs" - } - }, - "begin": "^\\s*(using)\\b\\s*", - "end": "\\s*(?:$|(;))", - "name": "meta.keyword.using.cs" - }, - { - "begin": "^\\s*((namespace)\\s+([\\w.]+))", - "beginCaptures": { - "1": { - "name": "meta.namespace.identifier.cs" - }, - "2": { - "name": "keyword.other.namespace.cs" - }, - "3": { - "name": "entity.name.type.namespace.cs" - } - }, - "end": "}", - "endCaptures": { - "0": { - "name": "punctuation.section.namespace.end.cs" - } - }, - "name": "meta.namespace.cs", - "patterns": [ - { - "begin": "{", - "beginCaptures": { - "0": { - "name": "punctuation.section.namespace.begin.cs" - } - }, - "end": "(?=})", - "name": "meta.namespace.body.cs", - "patterns": [ - { - "include": "#code" - } - ] - } - ] - }, - { - "include": "#code" - } - ], - "repository": { - "block": { - "patterns": [ - { - "begin": "{", - "beginCaptures": { - "0": { - "name": "punctuation.section.block.begin.cs" - } - }, - "end": "}", - "endCaptures": { - "0": { - "name": "punctuation.section.block.end.cs" - } - }, - "name": "meta.block.cs", - "patterns": [ - { - "include": "#code" - } - ] - } - ] - }, - "builtinTypes": { - "patterns": [ - { - "match": "\\b(bool|byte|sbyte|char|decimal|double|float|int|uint|long|ulong|object|short|ushort|string|void|class|struct|enum|interface)\\b", - "name": "storage.type.cs" - } - ] - }, - "class": { - "begin": "(?=\\w?[\\w\\s]*(?:class|struct|interface|enum)\\s+\\w+)", - "end": "}", - "endCaptures": { - "0": { - "name": "punctuation.section.class.end.cs" - } - }, - "name": "meta.class.cs", - "patterns": [ - { - "include": "#storage-modifiers" - }, - { - "include": "#comments" - }, - { - "captures": { - "1": { - "name": "storage.modifier.cs" - }, - "2": { - "name": "entity.name.type.class.cs" - } - }, - "match": "(class|struct|interface|enum)\\s+(\\w+)", - "name": "meta.class.identifier.cs" - }, - { - "begin": ":", - "end": "(?={)", - "patterns": [ - { - "captures": { - "1": { - "name": "storage.type.cs" - } - }, - "match": "\\s*,?([A-Za-z_]\\w*)\\b" - } - ] - }, - { - "begin": "{", - "beginCaptures": { - "0": { - "name": "punctuation.section.class.begin.cs" - } - }, - "end": "(?=})", - "name": "meta.class.body.cs", - "patterns": [ - { - "include": "#method" - }, - { - "include": "#code" - } - ] - } - ] - }, - "code": { - "patterns": [ - { - "include": "#block" - }, - { - "include": "#comments" - }, - { - "include": "#class" - }, - { - "include": "#constants" - }, - { - "include": "#storage-modifiers" - }, - { - "include": "#keywords" - }, - { - "include": "#preprocessor" - }, - { - "include": "#method-call" - }, - { - "include": "#builtinTypes" - }, - { - "include": "#documentation" - } - ] - }, - "comments": { - "patterns": [ - { - "begin": "///", - "captures": { - "0": { - "name": "punctuation.definition.comment.cs" - } - }, - "end": "$\\n?", - "name": "comment.block.documentation.cs", - "patterns": [ - { - "include": "text.xml" - } - ] - }, - { - "begin": "/\\*", - "captures": { - "0": { - "name": "punctuation.definition.comment.cs" - } - }, - "end": "\\*/\\n?", - "name": "comment.block.cs" - }, - { - "begin": "//", - "captures": { - "1": { - "name": "punctuation.definition.comment.cs" - } - }, - "end": "$\\n?", - "name": "comment.line.double-slash.cs" - } - ] - }, - "constants": { - "patterns": [ - { - "match": "\\b(true|false|null|this|base)\\b", - "name": "constant.language.cs" - }, - { - "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b", - "name": "constant.numeric.cs" - }, - { - "captures": { - "0": { - "name": "punctuation.definition.string.begin.cs" - } - }, - "match": "@\"([^\"]|\"\")*\"", - "name": "string.quoted.double.literal.cs" - }, - { - "begin": "\"", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.begin.cs" - } - }, - "end": "\"", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.end.cs" - } - }, - "name": "string.quoted.double.cs", - "patterns": [ - { - "match": "\\\\.", - "name": "constant.character.escape.cs" - } - ] - }, - { - "begin": "'", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.begin.cs" - } - }, - "end": "'", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.end.cs" - } - }, - "name": "string.quoted.single.cs", - "patterns": [ - { - "match": "\\\\.", - "name": "constant.character.escape.cs" - } - ] - } - ] - }, - "keywords": { - "patterns": [ - { - "match": "\\b(if|else|while|for|foreach|in|do|return|continue|break|switch|case|default|goto|throw|try|catch|finally|lock|yield|await)\\b", - "name": "keyword.control.cs" - }, - { - "match": "\\b(from|where|select|group|into|orderby|join|let|on|equals|by|ascending|descending)\\b", - "name": "keyword.linq.cs" - }, - { - "match": "\\b(new|is|as|using|checked|unchecked|typeof|sizeof|override|readonly|stackalloc)\\b", - "name": "keyword.operator.cs" - }, - { - "match": "\\b(event|delegate|fixed|add|remove|set|get|value)\\b", - "name": "keyword.other.cs" - }, - { - "match": "\\b(var)\\b", - "name": "storage.type.var.cs" - }, - { - "match": "[@]\\b(var|event|delegate|add|remove|set|get|value|new|is|as|using|checked|unchecked|typeof|sizeof |override|readonly|stackalloc|from|where|select|group|into|orderby|join|let|on|equals|by|ascending|descending |if|else|while|for|foreach|in|do|return|continue|break|switch|case|default|goto|throw|try|catch|finally|lock|yield|await)\\b", - "name": "meta.class.body.cs" - } - ] - }, - "method": { - "patterns": [ - { - "begin": "\\[", - "end": "\\]", - "name": "meta.method.annotation.cs", - "patterns": [ - { - "include": "#constants" - }, - { - "include": "#preprocessor" - }, - { - "include": "#builtinTypes" - } - ] - }, - { - "begin": "(?=\\bnew\\s+)(?=[\\w<].*\\s+)(?=[^=]+\\()", - "end": "(?={|;)", - "name": "meta.new-object.cs", - "patterns": [ - { - "include": "#code" - } - ] - }, - { - "begin": "(?