Skip to content

enh(csharp) highlight generics in more cases #2599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshgoebel merged 5 commits into from
Jun 11, 2020
Merged

enh(csharp) highlight generics in more cases #2599

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
589fcca
csharp generic highlighting
TupikovVladimir Jun 10, 2020
4a34e82
whitespace out from optional match group
TupikovVladimir Jun 11, 2020
6808037
covariant and contravariant support
TupikovVladimir Jun 11, 2020
5febb39
update test
TupikovVladimir Jun 11, 2020
68a7c9f
modify to keywords
TupikovVladimir Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/languages/csharp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ export default function(hljs) {
var GENERIC_MODIFIER = {
begin: "<",
end: ">",
keywords: "in out"
keywords: "in out",
contains: [ TITLE_MODE ]
};
var TYPE_IDENT_RE = hljs.IDENT_RE + '(<' + hljs.IDENT_RE + '(\\s*,\\s*' + hljs.IDENT_RE + ')*>)?(\\[\\])?';
var AT_IDENTIFIER = {
Expand Down Expand Up @@ -177,13 +178,16 @@ export default function(hljs) {
},
{
className: 'function',
begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*\\(', returnBegin: true,
begin: '(' + TYPE_IDENT_RE + '\\s+)+' + hljs.IDENT_RE + '\\s*(\\<.+\\>\\s*)?\\(', returnBegin: true,
Comment thread
joshgoebel marked this conversation as resolved.
Outdated
end: /\s*[{;=]/, excludeEnd: true,
keywords: KEYWORDS,
contains: [
{
begin: hljs.IDENT_RE + '\\s*\\(', returnBegin: true,
contains: [hljs.TITLE_MODE],
begin: hljs.IDENT_RE + '\\s*(\\<.+\\>\\s*)?\\(', returnBegin: true,
Comment thread
joshgoebel marked this conversation as resolved.
Outdated
contains: [
hljs.TITLE_MODE,
GENERIC_MODIFIER
],
relevance: 0
},
{
Expand Down