From c3201874c06ae9f1db6217f87d7860a5b63facb4 Mon Sep 17 00:00:00 2001 From: Devin Carr Date: Tue, 12 May 2020 11:20:47 -0700 Subject: Add language_csharp.lua --- README.md | 1 + plugins/language_csharp.lua | 113 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 plugins/language_csharp.lua diff --git a/README.md b/README.md index 3e509f0..c53be00 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ Plugin | Description [`indentguide`](plugins/indentguide.lua?raw=1) | Adds indent guides *([screenshot](https://user-images.githubusercontent.com/3920290/79640716-f9860000-818a-11ea-9c3b-26d10dd0e0c0.png))* [`language_angelscript`](plugins/language_angelscript.lua?raw=1) | Syntax for the [Angelscript](https://www.angelcode.com/angelscript/) programming language [`language_cpp`](plugins/language_cpp.lua?raw=1) | Syntax for the [C++](https://isocpp.org/) programming language +[`language_csharp`](plugins/language_csharp.lua?raw=1) | Syntax for the [C#](http://csharp.net) programming language [`language_fe`](plugins/language_fe.lua?raw=1) | Syntax for the [fe](https://github.com/rxi/fe) programming language [`language_go`](plugins/language_go.lua?raw=1) | Syntax for the [Go](https://golang.org/) programming language [`language_jiyu`](plugins/language_jiyu.lua?raw=1) | Syntax for the [jiyu](https://github.com/machinamentum/jiyu) programming language diff --git a/plugins/language_csharp.lua b/plugins/language_csharp.lua new file mode 100644 index 0000000..85c9cf4 --- /dev/null +++ b/plugins/language_csharp.lua @@ -0,0 +1,113 @@ +local syntax = require "core.syntax" +local common = require "core.common" +local style = require "core.style" + +-- additional syntax highlighting for character (same as string) +style.syntax["character"] = style.syntax["string"] + +syntax.add { + files = "%.cs$", + comment = "//", + patterns = { + { pattern = "//.-\n", type = "comment" }, + { pattern = { "/%*", "%*/" }, type = "comment" }, + { pattern = { '"', '"', '\\' }, type = "string" }, + { pattern = "'\\x%x?%x?%x?%x'", type = "character"}, -- hexadecimal escape sequence + { pattern = "'\\u%x%x%x%x'", type = "character"}, -- unicode escape sequence + { pattern = "'\\?.'", type = "character"}, -- character literal + { pattern = "-?0x%x+", type = "number" }, + { pattern = "-?%d+[%d%.eE]*f?", type = "number" }, + { pattern = "-?%.?%d+f?", type = "number" }, + { pattern = "[%+%-=/%*%^%%<>!~|&]", type = "operator" }, + { pattern = "%?%?", type = "operator" }, -- ?? null-coalescing + { pattern = "%?%.", type = "operator" }, -- ?. null-conditional + { pattern = "[%a_][%w_]*%f[(]", type = "function" }, + { pattern = "[%a_][%w_]*", type = "symbol" }, + }, + symbols = { + -- keywords + ["abstract"] = "keyword", + ["as"] = "keyword", + ["await"] = "keyword", + ["base"] = "keyword", + ["break"] = "keyword", + ["case"] = "keyword", + ["catch"] = "keyword", + ["checked"] = "keyword", + ["class"] = "keyword", + ["const"] = "keyword", + ["continue"] = "keyword", + ["default"] = "keyword", + ["delegate"] = "keyword", + ["do"] = "keyword", + ["else"] = "keyword", + ["enum"] = "keyword", + ["event"] = "keyword", + ["explicit"] = "keyword", + ["extern"] = "keyword", + ["finally"] = "keyword", + ["fixed"] = "keyword", + ["for"] = "keyword", + ["foreach"] = "keyword", + ["goto"] = "keyword", + ["if"] = "keyword", + ["implicit"] = "keyword", + ["in"] = "keyword", + ["interface"] = "keyword", + ["internal"] = "keyword", + ["is"] = "keyword", + ["lock"] = "keyword", + ["namespace"] = "keyword", + ["new"] = "keyword", + ["object"] = "keyword", + ["operator"] = "keyword", + ["out"] = "keyword", + ["override"] = "keyword", + ["params"] = "keyword", + ["private"] = "keyword", + ["protected"] = "keyword", + ["public"] = "keyword", + ["readonly"] = "keyword", + ["ref"] = "keyword", + ["return"] = "keyword", + ["sealed"] = "keyword", + ["sizeof"] = "keyword", + ["stackalloc"] = "keyword", + ["static"] = "keyword", + ["struct"] = "keyword", + ["switch"] = "keyword", + ["this"] = "keyword", + ["throw"] = "keyword", + ["try"] = "keyword", + ["typeof"] = "keyword", + ["unchecked"] = "keyword", + ["unsafe"] = "keyword", + ["using"] = "keyword", + ["var"] = "keyword", + ["virtual"] = "keyword", + ["volatile"] = "keyword", + ["while"] = "keyword", + ["yield"] = "keyword", + -- types + ["bool"] = "keyword2", + ["byte"] = "keyword2", + ["char"] = "keyword2", + ["decimal"] = "keyword2", + ["double"] = "keyword2", + ["float"] = "keyword2", + ["int"] = "keyword2", + ["long"] = "keyword2", + ["sbyte"] = "keyword2", + ["short"] = "keyword2", + ["string"] = "keyword2", + ["uint"] = "keyword2", + ["ulong"] = "keyword2", + ["ushort"] = "keyword2", + ["void"] = "keyword2", + -- literals + ["true"] = "literal", + ["false"] = "literal", + ["null"] = "literal", + }, +} + -- cgit v1.2.3 From 6f95541c2fd93e520c10502adf48964fb60e85ea Mon Sep 17 00:00:00 2001 From: Devin Carr Date: Tue, 12 May 2020 18:00:59 -0700 Subject: Remove character syntax coloring in favor of string --- plugins/language_csharp.lua | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/plugins/language_csharp.lua b/plugins/language_csharp.lua index 85c9cf4..5c8e557 100644 --- a/plugins/language_csharp.lua +++ b/plugins/language_csharp.lua @@ -1,9 +1,4 @@ local syntax = require "core.syntax" -local common = require "core.common" -local style = require "core.style" - --- additional syntax highlighting for character (same as string) -style.syntax["character"] = style.syntax["string"] syntax.add { files = "%.cs$", @@ -12,9 +7,9 @@ syntax.add { { pattern = "//.-\n", type = "comment" }, { pattern = { "/%*", "%*/" }, type = "comment" }, { pattern = { '"', '"', '\\' }, type = "string" }, - { pattern = "'\\x%x?%x?%x?%x'", type = "character"}, -- hexadecimal escape sequence - { pattern = "'\\u%x%x%x%x'", type = "character"}, -- unicode escape sequence - { pattern = "'\\?.'", type = "character"}, -- character literal + { pattern = "'\\x%x?%x?%x?%x'", type = "string" }, -- character hexadecimal escape sequence + { pattern = "'\\u%x%x%x%x'", type = "string" }, -- character unicode escape sequence + { pattern = "'\\?.'", type = "string" }, -- character literal { pattern = "-?0x%x+", type = "number" }, { pattern = "-?%d+[%d%.eE]*f?", type = "number" }, { pattern = "-?%.?%d+f?", type = "number" }, -- cgit v1.2.3 From 503b3aa48efa0c5b7e7f590d28a7ec6556074315 Mon Sep 17 00:00:00 2001 From: Devin Carr Date: Tue, 12 May 2020 18:16:40 -0700 Subject: Minor modifications and additions --- plugins/language_csharp.lua | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/plugins/language_csharp.lua b/plugins/language_csharp.lua index 5c8e557..5e790e3 100644 --- a/plugins/language_csharp.lua +++ b/plugins/language_csharp.lua @@ -4,20 +4,21 @@ syntax.add { files = "%.cs$", comment = "//", patterns = { - { pattern = "//.-\n", type = "comment" }, - { pattern = { "/%*", "%*/" }, type = "comment" }, - { pattern = { '"', '"', '\\' }, type = "string" }, - { pattern = "'\\x%x?%x?%x?%x'", type = "string" }, -- character hexadecimal escape sequence - { pattern = "'\\u%x%x%x%x'", type = "string" }, -- character unicode escape sequence - { pattern = "'\\?.'", type = "string" }, -- character literal - { pattern = "-?0x%x+", type = "number" }, - { pattern = "-?%d+[%d%.eE]*f?", type = "number" }, - { pattern = "-?%.?%d+f?", type = "number" }, - { pattern = "[%+%-=/%*%^%%<>!~|&]", type = "operator" }, - { pattern = "%?%?", type = "operator" }, -- ?? null-coalescing - { pattern = "%?%.", type = "operator" }, -- ?. null-conditional - { pattern = "[%a_][%w_]*%f[(]", type = "function" }, - { pattern = "[%a_][%w_]*", type = "symbol" }, + { pattern = "//.-\n", type = "comment" }, + { pattern = { "/%*", "%*/" }, type = "comment" }, + { pattern = { '"', '"', '\\' }, type = "string" }, + { pattern = { "[%$%@]?\"", '"', '\\' }, type = "string" }, -- string interpolation and verbatim + { pattern = "'\\x%x?%x?%x?%x'", type = "string" }, -- character hexadecimal escape sequence + { pattern = "'\\u%x%x%x%x'", type = "string" }, -- character unicode escape sequence + { pattern = "'\\?.'", type = "string" }, -- character literal + { pattern = "-?0x%x+", type = "number" }, + { pattern = "-?%d+[%d%.eE]*f?", type = "number" }, + { pattern = "-?%.?%d+f?", type = "number" }, + { pattern = "[%+%-=/%*%^%%<>!~|&]", type = "operator" }, + { pattern = "%?%?", type = "operator" }, -- ?? null-coalescing + { pattern = "%?%.", type = "operator" }, -- ?. null-conditional + { pattern = "[%a_][%w_]*%f[(]", type = "function" }, + { pattern = "[%a_][%w_]*", type = "symbol" }, }, symbols = { -- keywords @@ -44,6 +45,7 @@ syntax.add { ["fixed"] = "keyword", ["for"] = "keyword", ["foreach"] = "keyword", + ["get"] = "keyword", ["goto"] = "keyword", ["if"] = "keyword", ["implicit"] = "keyword", @@ -54,7 +56,6 @@ syntax.add { ["lock"] = "keyword", ["namespace"] = "keyword", ["new"] = "keyword", - ["object"] = "keyword", ["operator"] = "keyword", ["out"] = "keyword", ["override"] = "keyword", @@ -66,6 +67,7 @@ syntax.add { ["ref"] = "keyword", ["return"] = "keyword", ["sealed"] = "keyword", + ["set"] = "keyword", ["sizeof"] = "keyword", ["stackalloc"] = "keyword", ["static"] = "keyword", @@ -80,7 +82,9 @@ syntax.add { ["using"] = "keyword", ["var"] = "keyword", ["virtual"] = "keyword", + ["void"] = "keyword", ["volatile"] = "keyword", + ["where"] = "keyword", ["while"] = "keyword", ["yield"] = "keyword", -- types @@ -92,13 +96,13 @@ syntax.add { ["float"] = "keyword2", ["int"] = "keyword2", ["long"] = "keyword2", + ["object"] = "keyword2", ["sbyte"] = "keyword2", ["short"] = "keyword2", ["string"] = "keyword2", ["uint"] = "keyword2", ["ulong"] = "keyword2", ["ushort"] = "keyword2", - ["void"] = "keyword2", -- literals ["true"] = "literal", ["false"] = "literal", -- cgit v1.2.3