Skip to content

Commit

Permalink
Merge pull request #231 from shikijs/csharp
Browse files Browse the repository at this point in the history
fix: update to latest grammar from dotnet/csharp repo. fix #219
  • Loading branch information
octref committed Sep 16, 2021
2 parents 6782a9e + 7fa45de commit fd178bf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
10 changes: 3 additions & 7 deletions packages/shiki/languages/csharp.tmLanguage.json
@@ -1,12 +1,8 @@
{
"information_for_contributors": [
"This file has been converted from https://github.com/dotnet/csharp-tmLanguage/blob/master/grammars/csharp.tmLanguage",
"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/dotnet/csharp-tmLanguage/commit/53344c05ec5dd09e1dbc4a77a1aacd482403715a",
"name": "csharp",
"scopeName": "source.cs",
"fileTypes": ["cs"],
"uuid": "f7de61e2-bdde-4e2a-a139-8221b179584e",
"patterns": [
{
"include": "#preprocessor"
Expand Down Expand Up @@ -3170,7 +3166,7 @@
]
},
"conditional-operator": {
"begin": "(?<!\\?\\s*)\\?(?!\\?|\\.|\\[)",
"begin": "\\?(?!\\s*[?.\\[]|\\s*$)",
"beginCaptures": {
"0": {
"name": "keyword.operator.conditional.question-mark.cs"
Expand Down
6 changes: 1 addition & 5 deletions scripts/grammarSources.ts
Expand Up @@ -155,11 +155,7 @@ export const githubGrammarSources: (string | [string, string])[] = [
'https://github.com/gbasood/vscode-atomic-dreams/blob/master/syntaxes/dm.tmLanguage.json',
'https://github.com/bmalehorn/vscode-fish/blob/master/syntaxes/fish.tmLanguage.json',
'https://github.com/snowpackjs/astro/blob/main/tools/vscode/syntaxes/astro.tmLanguage.json',
// Temporary fix for https://github.com/shikijs/shiki/issues/219#issuecomment-921245374
[
'csharp',
'https://github.com/microsoft/vscode/blob/bd2493499dab8aafe8d216dfa4de7dafd04b4c94/extensions/csharp/syntaxes/csharp.tmLanguage.json'
]
['csharp', 'https://github.com/dotnet/csharp-tmLanguage/blob/main/grammars/csharp.tmLanguage']
]

/**
Expand Down

0 comments on commit fd178bf

Please sign in to comment.