chore: Update Syntax Files

Author: github-actions[bot]

README.md

@@ -117,11 +117,11 @@ To install the plugin into an existing Eclipse installation do:
 | Apache HTTP Config <img src="plugin/syntaxes/apache-http/icon.png" width=16/> | file-extensions="conf, htaccess, htgroups, htpasswd" | [master@mrmlnc/vscode-apache](https://github.com/mrmlnc/vscode-apache/tree/0585b0bb3d390fc541aa27cfcfb83b3204156be3/)
 | Astro <img src="plugin/syntaxes/astro/astro.icon.png" width=16/> | file-extensions="astro" | [main@withastro/language-tools](https://github.com/withastro/language-tools/tree/b4bcb4fc02cd960936a5faee6c9cc0ad94fc4c05/packages/vscode)
 | Ballerina | file-extensions="bal" | [master@ballerina-platform/ballerina-grammar](https://github.com/ballerina-platform/ballerina-grammar/tree/10325fc5436a87606407ba68bf668bcd59dc180d/syntaxes)
-| bazelrc <img src="plugin/syntaxes/bazel/icon.png" width=16/> | file-extensions="bazelrc"<br />file-names=".bazelrc, bazel.rc" | [master@bazelbuild/vscode-bazel](https://github.com/bazelbuild/vscode-bazel/tree/2747be789cc697e07365cb46206ef1cd67d8055a/)
+| bazelrc <img src="plugin/syntaxes/bazel/icon.png" width=16/> | file-extensions="bazelrc"<br />file-names=".bazelrc, bazel.rc" | [master@bazelbuild/vscode-bazel](https://github.com/bazelbuild/vscode-bazel/tree/7aa2304cc12907be76d80716c21815ace5f591c6/)
 | Branflakes <img src="plugin/syntaxes/bf/icon.png" width=16/> | file-extensions="bf, bfsck, brainfuck" | [main@chrisvrose/bf-server](https://github.com/chrisvrose/bf-server/tree/5945c04ccea21cd13e133547276d27d6540375f2/)
-| Carbon | file-extensions="carbon" | [trunk@carbon-language/carbon-lang](https://github.com/carbon-language/carbon-lang/tree/cf2c66c1b29fd54c73fbac2ed8357a1f217beb88/utils)
-| COBOL <img src="plugin/syntaxes/cobol/icon.png" width=16/> | file-extensions="cbl, cob, cobol, copy, cpy"<br />file-patterns="\*\*/broadcommfd.cobol-language-support/\*/copybooks/\*\*" | [development@eclipse-che4z/che-che4z-lsp-for-cobol](https://github.com/eclipse-che4z/che-che4z-lsp-for-cobol/tree/a2ecd79e558dd56f1593089b6be53fc6e8c55654/clients/cobol-lsp-vscode-extension)
-| CodeQL <img src="plugin/syntaxes/codeql/icon.png" width=16/> | file-extensions="ql, qll" | [main@github/vscode-codeql](https://github.com/github/vscode-codeql/tree/ddeb8c570e13b9b6f2fb4b4789f424a1ee03787a/)
+| Carbon | file-extensions="carbon" | [trunk@carbon-language/carbon-lang](https://github.com/carbon-language/carbon-lang/tree/5d0d443c985d2c7ada939e1c8bf3f1023689cd88/utils)
+| COBOL <img src="plugin/syntaxes/cobol/icon.png" width=16/> | file-extensions="cbl, cob, cobol, copy, cpy"<br />file-patterns="\*\*/broadcommfd.cobol-language-support/\*/copybooks/\*\*" | [development@eclipse-che4z/che-che4z-lsp-for-cobol](https://github.com/eclipse-che4z/che-che4z-lsp-for-cobol/tree/364a44e1f096609106c3ad2ae554ce42c54856a4/clients/cobol-lsp-vscode-extension)
+| CodeQL <img src="plugin/syntaxes/codeql/icon.png" width=16/> | file-extensions="ql, qll" | [main@github/vscode-codeql](https://github.com/github/vscode-codeql/tree/455e1098455e4e9a76612eec3166726bcecb7fdb/)
 | Crystal <img src="plugin/syntaxes/crystal/icon.png" width=16/> | file-extensions="cr" | [master@crystal-lang-tools/vscode-crystal-lang](https://github.com/crystal-lang-tools/vscode-crystal-lang/tree/5f14b919a52e4149587d1b72dc34fe2afa371a1e/) [[upstream]](https://github.com/Microsoft/vscode/blob/3f1f36333d3453f67a36b6bfb1206e9159e9c4f0/extensions/ruby/syntaxes/ruby.tmLanguage.json)
 | Crystal Slang <img src="plugin/syntaxes/crystal/icon.png" width=16/> | file-extensions="slang" | [master@crystal-lang-tools/vscode-crystal-lang](https://github.com/crystal-lang-tools/vscode-crystal-lang/tree/5f14b919a52e4149587d1b72dc34fe2afa371a1e/)
 | CSV <img src="plugin/syntaxes/csv/icon.png" width=16/> | file-extensions="csv" | [master@mechatroner/vscode_rainbow_csv](https://github.com/mechatroner/vscode_rainbow_csv/tree/0166b04d884ae71600221fe3d934fbec3469638a/)
@@ -136,7 +136,7 @@ To install the plugin into an existing Eclipse installation do:
 | Fortran <img src="plugin/syntaxes/fortran/FortranFreeForm.icon.png" width=16/> | file-extensions="F03, F08, F18, F90, F95, FPP, FYPP, PF, f03, f08, f18, f90, f95, fpp, fypp, pf" | [main@fortran-lang/vscode-fortran-support](https://github.com/fortran-lang/vscode-fortran-support/tree/81c5707cb5400f46f3d862449e319a6c317d9472/)
 | Fortran77 <img src="plugin/syntaxes/fortran/FortranFixedForm.icon.png" width=16/> | file-extensions="F, F77, FOR, f, f77, for" | [main@fortran-lang/vscode-fortran-support](https://github.com/fortran-lang/vscode-fortran-support/tree/81c5707cb5400f46f3d862449e319a6c317d9472/)
 | Gleam <img src="plugin/syntaxes/gleam/gleam.icon.png" width=16/> | file-extensions="gleam" | [main@gleam-lang/vscode-gleam](https://github.com/gleam-lang/vscode-gleam/tree/9f28a4a0bffaccadf74f56ab72310187cd3ff6e2/)
-| GraphQL <img src="plugin/syntaxes/graphql/icon.png" width=16/> | file-extensions="gql, graphql, graphqls" | [main@graphql/graphiql](https://github.com/graphql/graphiql/tree/93614400750001857358c15e0127815ae43a8d62/packages/vscode-graphql-syntax)
+| GraphQL <img src="plugin/syntaxes/graphql/icon.png" width=16/> | file-extensions="gql, graphql, graphqls" | [main@graphql/graphiql](https://github.com/graphql/graphiql/tree/aacdc8586fa4346a4681e73e29af7afda4718617/packages/vscode-graphql-syntax)
 | GraphViz DOT File | file-extensions="dot" | [master@textmate/graphviz.tmbundle](https://github.com/textmate/graphviz.tmbundle/tree/d1d489f893a0e6ef5d9021bf7dc1ffd08b3f9b90/Syntaxes)
 | HashiCorp Sentinel | file-extensions="sentinel" | [main@hashicorp/syntax](https://github.com/hashicorp/syntax/tree/f1c438932384c2d249a3a0d7a336cb9089865f42/)
 | HashiCorp Terraform | file-extensions="tf, tfvars" | [main@hashicorp/syntax](https://github.com/hashicorp/syntax/tree/f1c438932384c2d249a3a0d7a336cb9089865f42/)
@@ -180,27 +180,27 @@ To install the plugin into an existing Eclipse installation do:
 | Markdoc <img src="plugin/syntaxes/markdoc/icon.png" width=16/> | file-extensions="markdoc, markdoc.md, mdoc" | [main@markdoc/language-server](https://github.com/markdoc/language-server/tree/a6b8babf602735dc31bae1d10fad903dc40c9761/)
 | Markdown | file-extensions="livemd, markdown, md, mdown, mdwn, mkd, mkdn, mkdown, ronn, scd, workbook" | [main@wooorm/markdown-tm-language](https://github.com/wooorm/markdown-tm-language/tree/c78b1e5df644d24fa76716bbe26f4b48a6fc1610/)
 | MDX <img src="plugin/syntaxes/mdx/mdx.icon.png" width=16/> | file-extensions="mdx" | [main@mdx-js/mdx-analyzer](https://github.com/mdx-js/mdx-analyzer/tree/4851c2df02cd9c25a3cebc34cf9c4c1841c1feab/packages/vscode-mdx)
-| mermaid <img src="plugin/syntaxes/mermaid/icon.png" width=16/> | file-extensions="mermaid, mmd" | [master@bpruitt-goddard/vscode-mermaid-syntax-highlight](https://github.com/bpruitt-goddard/vscode-mermaid-syntax-highlight/tree/725b6e676fe9c743b3caf00defb907545d3a0da0/)
-| NDVR-COBOL <img src="plugin/syntaxes/cobol/icon.png" width=16/> | file-extensions="cbl.prnt, cob.prnt, cobol.prnt, copy.prnt, cpy.prnt" | [development@eclipse-che4z/che-che4z-lsp-for-cobol](https://github.com/eclipse-che4z/che-che4z-lsp-for-cobol/tree/a2ecd79e558dd56f1593089b6be53fc6e8c55654/clients/cobol-lsp-vscode-extension)
+| mermaid <img src="plugin/syntaxes/mermaid/icon.png" width=16/> | file-extensions="mermaid, mmd" | [master@bpruitt-goddard/vscode-mermaid-syntax-highlight](https://github.com/bpruitt-goddard/vscode-mermaid-syntax-highlight/tree/dad1cad24565f4004d871f4b27f7443130655de4/)
+| NDVR-COBOL <img src="plugin/syntaxes/cobol/icon.png" width=16/> | file-extensions="cbl.prnt, cob.prnt, cobol.prnt, copy.prnt, cpy.prnt" | [development@eclipse-che4z/che-che4z-lsp-for-cobol](https://github.com/eclipse-che4z/che-che4z-lsp-for-cobol/tree/364a44e1f096609106c3ad2ae554ce42c54856a4/clients/cobol-lsp-vscode-extension)
 | NGINX Conf <img src="plugin/syntaxes/nginx/icon.png" width=16/> | file-extensions="conf, fastcgi_params, nginx, scgi_params, uwsgi_params"<br />file-patterns="\*.conf.default, \*.conf.template, \*.mime.types, \*.nginx.conf" | [main@almir/nginx-syntax-highlighter](https://github.com/almir/nginx-syntax-highlighter/tree/03fa6617212032f1d538891730bb15feb4df2ef8/)
 | Nunjucks HTML <img src="plugin/syntaxes/nunjucks/icon.png" width=16/> | file-extensions="njk, njk.html" | [main@edheltzel/better-nunjucks-for-visual-studio-code](https://github.com/edheltzel/better-nunjucks-for-visual-studio-code/tree/83bfc919563c30f8eeb1548f983e143adad29781/)
 | nushell <img src="plugin/syntaxes/nushell/nushell.icon.png" width=16/> | file-extensions="nu" | [main@nushell/vscode-nushell-lang](https://github.com/nushell/vscode-nushell-lang/tree/544de244f118d57d78f0971c1797d427e90d2cb6/)
-| OCaml <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="eliom, ml, ocamlinit" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/ac3a5caa3d9f086aebda9af2493d80693d1db4e8/)
-| OCaml Interface <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="eliomi, mli" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/ac3a5caa3d9f086aebda9af2493d80693d1db4e8/)
-| OCaml.mlx <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="mlx" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/ac3a5caa3d9f086aebda9af2493d80693d1db4e8/)
-| OCamlFormat <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="ocamlformat" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/ac3a5caa3d9f086aebda9af2493d80693d1db4e8/)
-| odin <img src="plugin/syntaxes/odin/odin.icon.png" width=16/> | file-extensions="odin" | [master@DanielGavin/ols](https://github.com/DanielGavin/ols/tree/a5f43fd98dc7b853cf6c198a51d424886b66ea42/editors/vscode)
-| opam <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="opam, opam.locked, opam.template"<br />file-names="opam" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/ac3a5caa3d9f086aebda9af2493d80693d1db4e8/)
+| OCaml <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="eliom, ml, ocamlinit" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/2ccb002979ca59c589b5095a67e51c6304701470/)
+| OCaml Interface <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="eliomi, mli" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/2ccb002979ca59c589b5095a67e51c6304701470/)
+| OCaml.mlx <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="mlx" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/2ccb002979ca59c589b5095a67e51c6304701470/)
+| OCamlFormat <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="ocamlformat" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/2ccb002979ca59c589b5095a67e51c6304701470/)
+| odin <img src="plugin/syntaxes/odin/odin.icon.png" width=16/> | file-extensions="odin" | [master@DanielGavin/ols](https://github.com/DanielGavin/ols/tree/787544c10e5842efc9990a12de680b471333ba4a/editors/vscode)
+| opam <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="opam, opam.locked, opam.template"<br />file-names="opam" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/2ccb002979ca59c589b5095a67e51c6304701470/)
 | OpenGL Shading Language <img src="plugin/syntaxes/glsl/icon.png" width=16/> | file-extensions="comp, csh, frag, fs, fsh, fshader, geom, glsl, gs, gsh, gshader, mesh, rahit, rcall, rchit, rgen, rint, rmiss, task, tesc, tese, vert, vs, vsh, vshader" | [master@GeForceLegend/vscode-glsl](https://github.com/GeForceLegend/vscode-glsl/tree/da57fa1415d5b77191ee8566f2b4b6cd9dbb3572/)
 | Pascal | file-extensions="dfm, dpk, dpr, fmx, lfm, lpr, p, pas" | [master@textmate/pascal.tmbundle](https://github.com/textmate/pascal.tmbundle/tree/3b11b782368065e55acce0423f385722771d28b0/Syntaxes)
 | PlantUML <img src="plugin/syntaxes/plantuml/icon.png" width=16/> | file-extensions="iuml, plantuml, pu, puml, wsd" | [master@qjebbs/vscode-plantuml](https://github.com/qjebbs/vscode-plantuml/tree/7bc1758ed73dc269f5721d78c6c6c01f461d7cb0/)
 | Pony | file-extensions="pony" | [main@chalcolith/eohippus](https://github.com/chalcolith/eohippus/tree/de8031c34fbde4b124e4f0f34fa3fd84c4795bac/eohippus-vscode)
-| Prisma <img src="plugin/syntaxes/prisma/prisma.icon.png" width=16/> | file-extensions="prisma" | [main@prisma/language-tools](https://github.com/prisma/language-tools/tree/e65281d2a6ef19d6de3615aff20aca1cda009a0e/packages/vscode)
-| Reason <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="re, rei" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/ac3a5caa3d9f086aebda9af2493d80693d1db4e8/)
-| Ring <img src="plugin/syntaxes/ring/ring.icon.png" width=16/> | file-extensions="rform, rh, ring" | [master@ring-lang/ring](https://github.com/ring-lang/ring/tree/a8ea7a22cf06a9bac8e3ca0545db66406b0a8ed3/tools/editors/vscode/extension)
+| Prisma <img src="plugin/syntaxes/prisma/prisma.icon.png" width=16/> | file-extensions="prisma" | [main@prisma/language-tools](https://github.com/prisma/language-tools/tree/e24a4a5990adaca484624a414cdea1642e9df211/packages/vscode)
+| Reason <img src="plugin/syntaxes/ocaml/icon.png" width=16/> | file-extensions="re, rei" | [master@ocamllabs/vscode-ocaml-platform](https://github.com/ocamllabs/vscode-ocaml-platform/tree/2ccb002979ca59c589b5095a67e51c6304701470/)
+| Ring <img src="plugin/syntaxes/ring/ring.icon.png" width=16/> | file-extensions="rform, rh, ring" | [master@ring-lang/ring](https://github.com/ring-lang/ring/tree/b85b08b6e5bc25e5b3c7978dae3c2d3e57e2614e/tools/editors/vscode/extension)
 | Roc <img src="plugin/syntaxes/roc/roc.icon.png" width=16/> | file-extensions="roc" | [main@ivan-demchenko/roc-vscode-unofficial](https://github.com/ivan-demchenko/roc-vscode-unofficial/tree/f60596f4b8d65937e7a8df2c0b454a3a309aa91e/)
-| Starlark <img src="plugin/syntaxes/bazel/icon.png" width=16/> | file-extensions="BUILD, WORKSPACE, bazel, bzl, bzlmod, sky, star"<br />file-names="BUILD, WORKSPACE" | [master@bazelbuild/vscode-bazel](https://github.com/bazelbuild/vscode-bazel/tree/2747be789cc697e07365cb46206ef1cd67d8055a/)
-| Svelte <img src="plugin/syntaxes/svelte/icon.png" width=16/> | file-extensions="svelte" | [master@sveltejs/language-tools](https://github.com/sveltejs/language-tools/tree/253b87213c330061fab1279b82241e728746db82/packages/svelte-vscode)
+| Starlark <img src="plugin/syntaxes/bazel/icon.png" width=16/> | file-extensions="BUILD, WORKSPACE, bazel, bzl, bzlmod, sky, star"<br />file-names="BUILD, WORKSPACE" | [master@bazelbuild/vscode-bazel](https://github.com/bazelbuild/vscode-bazel/tree/7aa2304cc12907be76d80716c21815ace5f591c6/)
+| Svelte <img src="plugin/syntaxes/svelte/icon.png" width=16/> | file-extensions="svelte" | [master@sveltejs/language-tools](https://github.com/sveltejs/language-tools/tree/229b9d4dd83116560c1611b25ec74b7112cf2d5d/packages/svelte-vscode)
 | TOML Config File <img src="plugin/syntaxes/toml/icon.png" width=16/> | file-extensions="toml"<br />file-names="Cargo.lock, Pipfile, pdm.lock" | [master@juggernautjp/less-toml](https://github.com/juggernautjp/less-toml/tree/13eb891232e98c4a9c595bf8c657893c84edf3a9/) [[upstream]](https://github.com/textmate/toml.tmbundle/commit/e82b64c1e86396220786846201e9aa3f0a2d9ca2)
 | TSV <img src="plugin/syntaxes/csv/icon.png" width=16/> | file-extensions="tab, tsv" | [master@mechatroner/vscode_rainbow_csv](https://github.com/mechatroner/vscode_rainbow_csv/tree/0166b04d884ae71600221fe3d934fbec3469638a/)
 | Twig <img src="plugin/syntaxes/twig/icon.png" width=16/> | file-extensions="peb, twig" | [main@rholdos/vscode-twig-language-support](https://github.com/rholdos/vscode-twig-language-support/tree/f1e9a1722c91d3f3b3c548386861fd01bfdbeb3b/)

plugin/syntaxes/mermaid/markdown.mermaid.codeblock.tmLanguage.json

@@ -14,7 +14,7 @@
   ],
   "repository": {
     "mermaid-code-block": {
-      "begin": "(?i)(?<=[`~])mermaid(\\s+[^`~]*)?$",
+      "begin": "(?i)(?<=[`~])\\s*mermaid(\\s+[^`~]*)?$",
       "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)",
       "contentName": "meta.embedded.block.mermaid",
       "patterns": [
@@ -24,7 +24,7 @@
       ]
     },
     "mermaid-code-block-with-attributes": {
-      "begin": "(?i)(?<=[`~])\\{\\s*\\.?mermaid(\\s+[^`~]*)?$",
+      "begin": "(?i)(?<=[`~])\\s*\\{\\s*\\.?mermaid(\\s+[^`~]*)?$",
       "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)",
       "contentName": "meta.embedded.block.mermaid",
       "patterns": [
@@ -502,7 +502,7 @@
             },
             {
               "comment": "(entity) {",
-              "begin": "(?i)\\s+([\\w-]+)\\s*(\\[)?\\s*((?:[\\w-]+)|(?:\"[\\w\\s-]+\"))?\\s*(\\])?\\s*({)",
+              "begin": "(?i)\\s*([\\w-]+)\\s*(\\[)?\\s*((?:[\\w-]+)|(?:\"[\\w\\s-]+\"))?\\s*(\\])?\\s*({)",
               "beginCaptures": {
                 "1": {
                   "name": "variable"
@@ -523,7 +523,7 @@
               "patterns": [
                 {
                   "comment": "(type) (name) (constraints)? (\"comment\")?",
-                  "match": "(?i)\\s*([\\w-]+)\\s+([\\w-]+)\\s+([PFU]K(?:,\\s*[PFU]K){0,2})?\\s*(\"[\"\\($&%\\^/#.,?!;:*+=<>\\'\\\\\\-\\w\\s]*\")?\\s*",
+                  "match": "(?i)\\s*([\\w-]+)\\s+([\\w-]+)\\s+([PFU]K(?:,\\s*[PFU]K){0,2})?\\s*(\"[^\"\\r\\n]*\")?\\s*",
                   "captures": {
                     "1": {
                       "name": "storage.type.mermaid"

plugin/syntaxes/mermaid/mdx.mermaid.codeblock.tmLanguage.json

@@ -520,7 +520,7 @@
                     },
                     {
                       "comment": "(entity) {",
-                      "begin": "(?i)\\s+([\\w-]+)\\s*(\\[)?\\s*((?:[\\w-]+)|(?:\"[\\w\\s-]+\"))?\\s*(\\])?\\s*({)",
+                      "begin": "(?i)\\s*([\\w-]+)\\s*(\\[)?\\s*((?:[\\w-]+)|(?:\"[\\w\\s-]+\"))?\\s*(\\])?\\s*({)",
                       "beginCaptures": {
                         "1": {
                           "name": "variable"
@@ -541,7 +541,7 @@
                       "patterns": [
                         {
                           "comment": "(type) (name) (constraints)? (\"comment\")?",
-                          "match": "(?i)\\s*([\\w-]+)\\s+([\\w-]+)\\s+([PFU]K(?:,\\s*[PFU]K){0,2})?\\s*(\"[\"\\($&%\\^/#.,?!;:*+=<>\\'\\\\\\-\\w\\s]*\")?\\s*",
+                          "match": "(?i)\\s*([\\w-]+)\\s+([\\w-]+)\\s+([PFU]K(?:,\\s*[PFU]K){0,2})?\\s*(\"[^\"\\r\\n]*\")?\\s*",
                           "captures": {
                             "1": {
                               "name": "storage.type.mermaid"

plugin/syntaxes/mermaid/mermaid.tmLanguage.json

@@ -467,7 +467,7 @@
             },
             {
               "comment": "(entity) {",
-              "begin": "(?i)\\s+([\\w-]+)\\s*(\\[)?\\s*((?:[\\w-]+)|(?:\"[\\w\\s-]+\"))?\\s*(\\])?\\s*({)",
+              "begin": "(?i)\\s*([\\w-]+)\\s*(\\[)?\\s*((?:[\\w-]+)|(?:\"[\\w\\s-]+\"))?\\s*(\\])?\\s*({)",
               "beginCaptures": {
                 "1": {
                   "name": "variable"
@@ -488,7 +488,7 @@
               "patterns": [
                 {
                   "comment": "(type) (name) (constraints)? (\"comment\")?",
-                  "match": "(?i)\\s*([\\w-]+)\\s+([\\w-]+)\\s+([PFU]K(?:,\\s*[PFU]K){0,2})?\\s*(\"[\"\\($&%\\^/#.,?!;:*+=<>\\'\\\\\\-\\w\\s]*\")?\\s*",
+                  "match": "(?i)\\s*([\\w-]+)\\s+([\\w-]+)\\s+([PFU]K(?:,\\s*[PFU]K){0,2})?\\s*(\"[^\"\\r\\n]*\")?\\s*",
                   "captures": {
                     "1": {
                       "name": "storage.type.mermaid"