From 2c5342a0fb42f1293a0b66113b18dd2102d9b149 Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Thu, 21 Dec 2023 06:04:00 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96:=20update=20grammars?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shiki/languages/csharp.tmLanguage.json | 14 +++++++++++++-
 packages/shiki/languages/vhdl.tmLanguage.json   |  4 ++--
 packages/shiki/src/languages.ts                 |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/shiki/languages/csharp.tmLanguage.json b/packages/shiki/languages/csharp.tmLanguage.json
index 383a288fc..48254ffdb 100644
--- a/packages/shiki/languages/csharp.tmLanguage.json
+++ b/packages/shiki/languages/csharp.tmLanguage.json
@@ -1046,6 +1046,18 @@
           "name": "storage.type.struct.cs",
           "match": "\\bstruct\\b"
         },
+        {
+          "name": "keyword.other.constraint.default.cs",
+          "match": "\\bdefault\\b"
+        },
+        {
+          "name": "keyword.other.constraint.notnull.cs",
+          "match": "\\bnotnull\\b"
+        },
+        {
+          "name": "keyword.other.constraint.unmanaged.cs",
+          "match": "\\bunmanaged\\b"
+        },
         {
           "match": "(new)\\s*(\\()\\s*(\\))",
           "captures": {
@@ -2628,7 +2640,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G",
+              "begin": "(?=[^;\\)])",
               "end": "(?=;|\\))",
               "patterns": [
                 {
diff --git a/packages/shiki/languages/vhdl.tmLanguage.json b/packages/shiki/languages/vhdl.tmLanguage.json
index 655154ded..b1ec2a797 100644
--- a/packages/shiki/languages/vhdl.tmLanguage.json
+++ b/packages/shiki/languages/vhdl.tmLanguage.json
@@ -1170,7 +1170,7 @@
     "process_pattern": {
       "patterns": [
         {
-          "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Optional identifier $2\n\t\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\n\n\t\t\t\t\t\t\t# Colon $3\n\t\t\t\t\t\t\t\\s*(:)\\s*\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# The word process #4\n\t\t\t\t\t\t((?i:process\\b))\n\t\t\t\t\t",
+          "begin": "(?x)\n\t\t\t\t\t\t# From the beginning of the line\n\t\t\t\t\t\t^\\s*\n\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t# Optional identifier $2\n\t\t\t\t\t\t\t([a-zA-Z][a-zA-Z0-9_]*)\n\n\t\t\t\t\t\t\t# Colon $3\n\t\t\t\t\t\t\t\\s*(:)\\s*\n\t\t\t\t\t\t)?\n\n\t\t\t\t\t\t# The word process #4\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(?:postponed\\s+)?\n\t\t\t\t\t\t\t(?i:process\\b)\n\t\t\t\t\t\t)\n\t\t\t\t\t",
           "beginCaptures": {
             "2": {
               "name": "entity.name.section.process.begin.vhdl"
@@ -1182,7 +1182,7 @@
               "name": "keyword.language.vhdl"
             }
           },
-          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t((?i:end))\n\n\t\t\t\t\t\t# Optional word process $3\n\t\t\t\t\t\t(\\s+((?i:process)))\n\n\t\t\t\t\t\t# Optional identifier $6 or invalid identifier $7\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?\n\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
+          "end": "(?x)\n\t\t\t\t\t\t# The word end $1\n\t\t\t\t\t\t((?i:end))\n\n\t\t\t\t\t\t# Optional word process $3\n\t\t\t\t\t\t(\\s+(\n\t\t\t\t\t\t\t(?:postponed\\s+)?\n\t\t\t\t\t\t\t(?i:process)\n\t\t\t\t\t\t))\n\n\t\t\t\t\t\t# Optional identifier $6 or invalid identifier $7\n\t\t\t\t\t\t(\\s+((\\2)|(.+?)))?\n\n\t\t\t\t\t\t(?=\\s*;)\n\t\t\t\t\t",
           "endCaptures": {
             "1": {
               "name": "keyword.language.vhdl"
diff --git a/packages/shiki/src/languages.ts b/packages/shiki/src/languages.ts
index 074516df6..95e3d9c69 100644
--- a/packages/shiki/src/languages.ts
+++ b/packages/shiki/src/languages.ts
@@ -573,6 +573,7 @@ export const languages: ILanguageRegistration[] = [
     scopeName: 'source.gts',
     path: 'glimmer-ts.tmLanguage.json',
     displayName: 'Glimmer TS',
+    samplePath: 'glimmer-ts.sample',
     aliases: ['gts'],
     embeddedLangs: ['typescript', 'handlebars']
   },