From b4e707760e3d8fb4f95f9f4a426383bce87209d4 Mon Sep 17 00:00:00 2001
From: Anton Reshetov <reshetov.art@gmail.com>
Date: Mon, 29 Aug 2022 09:54:01 +0300
Subject: [PATCH] fix(grammars): update xml & xsl #263

---
 .../editor/grammars/xml.tmLanguage.json       | 502 ++++++------------
 .../editor/grammars/xsl.tmLanguage.json       | 127 ++---
 2 files changed, 205 insertions(+), 424 deletions(-)

diff --git a/src/renderer/components/editor/grammars/xml.tmLanguage.json b/src/renderer/components/editor/grammars/xml.tmLanguage.json
index 2933c18d..d54a932c 100644
--- a/src/renderer/components/editor/grammars/xml.tmLanguage.json
+++ b/src/renderer/components/editor/grammars/xml.tmLanguage.json
@@ -1,387 +1,203 @@
 {
-  "information_for_contributors": [
-    "This file has been converted from https://github.com/atom/language-xml/blob/master/grammars/xml.cson",
-    "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/atom/language-xml/commit/7bc75dfe779ad5b35d9bf4013d9181864358cb49",
-  "name": "XML",
-  "scopeName": "text.xml",
-  "patterns": [
-    {
-      "begin": "(<\\?)\\s*([-_a-zA-Z0-9]+)",
+  "fileTypes": ["xml", "xsd", "tld", "jsp", "pt", "cpt", "dtml", "rss", "opml"],
+  "repository": {
+    "entity": {
+      "match": "(&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+      "name": "constant.character.entity.xml",
       "captures": {
-        "1": {
-          "name": "punctuation.definition.tag.xml"
-        },
-        "2": {
-          "name": "entity.name.tag.xml"
-        }
-      },
-      "end": "(\\?>)",
-      "name": "meta.tag.preprocessor.xml",
-      "patterns": [
-        {
-          "match": " ([a-zA-Z-]+)",
-          "name": "entity.other.attribute-name.xml"
-        },
-        {
-          "include": "#doublequotedString"
-        },
-        {
-          "include": "#singlequotedString"
-        }
-      ]
+        "1": { "name": "punctuation.definition.constant.xml" },
+        "3": { "name": "punctuation.definition.constant.xml" }
+      }
     },
-    {
-      "begin": "(<!)(DOCTYPE)\\s+([:a-zA-Z_][:a-zA-Z0-9_.-]*)",
+    "parameterEntity": {
+      "match": "(%)([:a-zA-Z_][:a-zA-Z0-9_.-]*)(;)",
+      "name": "constant.character.parameter-entity.xml",
       "captures": {
-        "1": {
-          "name": "punctuation.definition.tag.xml"
-        },
-        "2": {
-          "name": "keyword.other.doctype.xml"
-        },
-        "3": {
-          "name": "variable.language.documentroot.xml"
-        }
-      },
-      "end": "\\s*(>)",
-      "name": "meta.tag.sgml.doctype.xml",
+        "1": { "name": "punctuation.definition.constant.xml" },
+        "3": { "name": "punctuation.definition.constant.xml" }
+      }
+    },
+    "tagStuff": {
       "patterns": [
         {
-          "include": "#internalSubset"
-        }
+          "match": " (?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9]+)=",
+          "captures": {
+            "3": { "name": "punctuation.separator.namespace.xml" },
+            "1": { "name": "entity.other.attribute-name.namespace.xml" },
+            "4": { "name": "entity.other.attribute-name.localname.xml" },
+            "2": { "name": "entity.other.attribute-name.xml" }
+          }
+        },
+        { "include": "#doublequotedString" },
+        { "include": "#singlequotedString" }
       ]
     },
-    {
-      "include": "#comments"
+    "bare-ampersand": {
+      "match": "&",
+      "name": "invalid.illegal.bad-ampersand.xml"
     },
-    {
-      "begin": "(<)((?:([-_a-zA-Z0-9]+)(:))?([-_a-zA-Z0-9:]+))(?=(\\s[^>]*)?></\\2>)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.tag.xml"
-        },
-        "2": {
-          "name": "entity.name.tag.xml"
-        },
-        "3": {
-          "name": "entity.name.tag.namespace.xml"
-        },
-        "4": {
-          "name": "punctuation.separator.namespace.xml"
-        },
-        "5": {
-          "name": "entity.name.tag.localname.xml"
-        }
+    "singlequotedString": {
+      "begin": "'",
+      "endCaptures": {
+        "0": { "name": "punctuation.definition.string.end.xml" }
       },
-      "end": "(>)(</)((?:([-_a-zA-Z0-9]+)(:))?([-_a-zA-Z0-9:]+))(>)",
+      "end": "'",
+      "patterns": [{ "include": "#entity" }, { "include": "#bare-ampersand" }],
+      "name": "string.quoted.single.xml",
+      "beginCaptures": {
+        "0": { "name": "punctuation.definition.string.begin.xml" }
+      }
+    },
+    "doublequotedString": {
+      "begin": "\"",
       "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.tag.xml"
-        },
-        "2": {
-          "name": "punctuation.definition.tag.xml"
-        },
-        "3": {
-          "name": "entity.name.tag.xml"
-        },
-        "4": {
-          "name": "entity.name.tag.namespace.xml"
-        },
-        "5": {
-          "name": "punctuation.separator.namespace.xml"
-        },
-        "6": {
-          "name": "entity.name.tag.localname.xml"
-        },
-        "7": {
-          "name": "punctuation.definition.tag.xml"
-        }
+        "0": { "name": "punctuation.definition.string.end.xml" }
       },
-      "name": "meta.tag.no-content.xml",
+      "end": "\"",
+      "patterns": [{ "include": "#entity" }, { "include": "#bare-ampersand" }],
+      "name": "string.quoted.double.xml",
+      "beginCaptures": {
+        "0": { "name": "punctuation.definition.string.begin.xml" }
+      }
+    },
+    "internalSubset": {
+      "begin": "(\\[)",
+      "end": "(\\])",
       "patterns": [
-        {
-          "include": "#tagStuff"
-        }
-      ]
+        { "include": "#EntityDecl" },
+        { "include": "#parameterEntity" }
+      ],
+      "name": "meta.internalsubset.xml",
+      "captures": { "1": { "name": "punctuation.definition.constant.xml" } }
     },
-    {
-      "begin": "(</?)(?:([-\\w\\.]+)((:)))?([-\\w\\.:]+)",
+    "EntityDecl": {
+      "begin": "(<!)(ENTITY)\\s+(%\\s+)?([:a-zA-Z_][:a-zA-Z0-9_.-]*)(\\s+(?:SYSTEM|PUBLIC)\\s+)?",
+      "end": "(>)",
+      "patterns": [
+        { "include": "#doublequotedString" },
+        { "include": "#singlequotedString" }
+      ],
       "captures": {
-        "1": {
-          "name": "punctuation.definition.tag.xml"
-        },
-        "2": {
-          "name": "entity.name.tag.namespace.xml"
-        },
-        "3": {
-          "name": "entity.name.tag.xml"
-        },
-        "4": {
-          "name": "punctuation.separator.namespace.xml"
-        },
-        "5": {
-          "name": "entity.name.tag.localname.xml"
-        }
-      },
-      "end": "(/?>)",
-      "name": "meta.tag.xml",
+        "3": { "name": "punctuation.definition.entity.xml" },
+        "1": { "name": "punctuation.definition.tag.xml" },
+        "4": { "name": "variable.language.entity.xml" },
+        "2": { "name": "keyword.other.entity.xml" },
+        "5": { "name": "keyword.other.entitytype.xml" }
+      }
+    }
+  },
+  "keyEquivalent": "^~X",
+  "uuid": "D3C4E6DA-6B1C-11D9-8CC2-000D93589AF6",
+  "patterns": [
+    {
+      "begin": "(<\\?)\\s*([-_a-zA-Z0-9]+)",
+      "end": "(\\?>)",
       "patterns": [
-        {
-          "include": "#tagStuff"
-        }
-      ]
+        { "match": " ([a-zA-Z-]+)", "name": "entity.other.attribute-name.xml" },
+        { "include": "#doublequotedString" },
+        { "include": "#singlequotedString" }
+      ],
+      "name": "meta.tag.metadata.processing.xml",
+      "captures": {
+        "1": { "name": "punctuation.definition.tag.xml" },
+        "2": { "name": "entity.name.tag.xml" }
+      }
     },
     {
-      "include": "#entity"
+      "begin": "(<!)(DOCTYPE)\\s+([:a-zA-Z_][:a-zA-Z0-9_.-]*)",
+      "end": "\\s*(>)",
+      "patterns": [{ "include": "#internalSubset" }],
+      "name": "meta.tag.metadata.doctype.xml",
+      "captures": {
+        "1": { "name": "punctuation.definition.tag.xml" },
+        "2": { "name": "entity.name.tag.xml" },
+        "3": { "name": "entity.other.attribute-name.documentroot.xml" }
+      }
     },
     {
-      "include": "#bare-ampersand"
+      "begin": "<[!%]--",
+      "end": "--%?>",
+      "name": "comment.block.xml",
+      "captures": { "0": { "name": "punctuation.definition.comment.xml" } }
     },
     {
-      "begin": "<%@",
+      "begin": "(<)((?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]+))(?=(\\s[^>]*)?></\\2>)",
+      "endCaptures": {
+        "7": { "name": "punctuation.definition.tag.xml" },
+        "3": { "name": "entity.name.tag.namespace.xml" },
+        "4": { "name": "entity.name.tag.xml" },
+        "5": { "name": "punctuation.separator.namespace.xml" },
+        "1": { "name": "punctuation.definition.tag.xml" },
+        "6": { "name": "entity.name.tag.localname.xml" },
+        "2": { "name": "meta.scope.between-tag-pair.xml" }
+      },
+      "end": "(>(<))/(?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]+)(>)",
+      "patterns": [{ "include": "#tagStuff" }],
+      "name": "meta.tag.no-content.xml",
       "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.begin.xml"
-        }
-      },
-      "end": "%>",
+        "3": { "name": "entity.name.tag.namespace.xml" },
+        "1": { "name": "punctuation.definition.tag.xml" },
+        "6": { "name": "entity.name.tag.localname.xml" },
+        "4": { "name": "entity.name.tag.xml" },
+        "5": { "name": "punctuation.separator.namespace.xml" }
+      }
+    },
+    {
+      "begin": "(</?)(?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]+)",
+      "end": "(/?>)",
+      "patterns": [{ "include": "#tagStuff" }],
+      "name": "meta.tag.xml",
+      "captures": {
+        "3": { "name": "entity.name.tag.xml" },
+        "1": { "name": "punctuation.definition.tag.xml" },
+        "4": { "name": "punctuation.separator.namespace.xml" },
+        "2": { "name": "entity.name.tag.namespace.xml" },
+        "5": { "name": "entity.name.tag.localname.xml" }
+      }
+    },
+    { "include": "#entity" },
+    { "include": "#bare-ampersand" },
+    {
+      "begin": "<%@",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.xml"
-        }
+        "0": { "name": "punctuation.section.embedded.end.xml" }
       },
-      "name": "source.java-props.embedded.xml",
+      "end": "%>",
       "patterns": [
         {
           "match": "page|include|taglib",
           "name": "keyword.other.page-props.xml"
         }
-      ]
+      ],
+      "name": "source.java-props.embedded.xml",
+      "beginCaptures": {
+        "0": { "name": "punctuation.section.embedded.begin.xml" }
+      }
     },
     {
       "begin": "<%[!=]?(?!--)",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.begin.xml"
-        }
-      },
-      "end": "(?!--)%>",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.xml"
-        }
+        "0": { "name": "punctuation.section.embedded.end.xml" }
       },
+      "end": "(?!--)%>",
+      "patterns": [{ "include": "source.java" }],
       "name": "source.java.embedded.xml",
-      "patterns": [
-        {
-          "include": "source.java"
-        }
-      ]
+      "beginCaptures": {
+        "0": { "name": "punctuation.section.embedded.begin.xml" }
+      }
     },
     {
       "begin": "<!\\[CDATA\\[",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.xml"
-        }
-      },
-      "end": "]]>",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.xml"
-        }
-      },
-      "name": "string.unquoted.cdata.xml"
-    }
-  ],
-  "repository": {
-    "EntityDecl": {
-      "begin": "(<!)(ENTITY)\\s+(%\\s+)?([:a-zA-Z_][:a-zA-Z0-9_.-]*)(\\s+(?:SYSTEM|PUBLIC)\\s+)?",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.tag.xml"
-        },
-        "2": {
-          "name": "keyword.other.entity.xml"
-        },
-        "3": {
-          "name": "punctuation.definition.entity.xml"
-        },
-        "4": {
-          "name": "variable.language.entity.xml"
-        },
-        "5": {
-          "name": "keyword.other.entitytype.xml"
-        }
-      },
-      "end": "(>)",
-      "patterns": [
-        {
-          "include": "#doublequotedString"
-        },
-        {
-          "include": "#singlequotedString"
-        }
-      ]
-    },
-    "bare-ampersand": {
-      "match": "&",
-      "name": "invalid.illegal.bad-ampersand.xml"
-    },
-    "doublequotedString": {
-      "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.xml"
-        }
-      },
-      "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.xml"
-        }
-      },
-      "name": "string.quoted.double.xml",
-      "patterns": [
-        {
-          "include": "#entity"
-        },
-        {
-          "include": "#bare-ampersand"
-        }
-      ]
-    },
-    "entity": {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.constant.xml"
-        },
-        "3": {
-          "name": "punctuation.definition.constant.xml"
-        }
-      },
-      "match": "(&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-      "name": "constant.character.entity.xml"
-    },
-    "internalSubset": {
-      "begin": "(\\[)",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.constant.xml"
-        }
+        "0": { "name": "punctuation.definition.string.end.xml" }
       },
-      "end": "(\\])",
-      "name": "meta.internalsubset.xml",
-      "patterns": [
-        {
-          "include": "#EntityDecl"
-        },
-        {
-          "include": "#parameterEntity"
-        },
-        {
-          "include": "#comments"
-        }
-      ]
-    },
-    "parameterEntity": {
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.constant.xml"
-        },
-        "3": {
-          "name": "punctuation.definition.constant.xml"
-        }
-      },
-      "match": "(%)([:a-zA-Z_][:a-zA-Z0-9_.-]*)(;)",
-      "name": "constant.character.parameter-entity.xml"
-    },
-    "singlequotedString": {
-      "begin": "'",
+      "end": "]]>",
+      "name": "string.unquoted.cdata.xml",
       "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.xml"
-        }
-      },
-      "end": "'",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.xml"
-        }
-      },
-      "name": "string.quoted.single.xml",
-      "patterns": [
-        {
-          "include": "#entity"
-        },
-        {
-          "include": "#bare-ampersand"
-        }
-      ]
-    },
-    "tagStuff": {
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "entity.other.attribute-name.namespace.xml"
-            },
-            "2": {
-              "name": "entity.other.attribute-name.xml"
-            },
-            "3": {
-              "name": "punctuation.separator.namespace.xml"
-            },
-            "4": {
-              "name": "entity.other.attribute-name.localname.xml"
-            }
-          },
-          "match": "(?:^|\\s+)(?:([-\\w.]+)((:)))?([-\\w.:]+)\\s*="
-        },
-        {
-          "include": "#doublequotedString"
-        },
-        {
-          "include": "#singlequotedString"
-        }
-      ]
-    },
-    "comments": {
-      "patterns": [
-        {
-          "begin": "<%--",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.xml"
-            },
-            "end": "--%>",
-            "name": "comment.block.xml"
-          }
-        },
-        {
-          "begin": "<!--",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.xml"
-            }
-          },
-          "end": "-->",
-          "name": "comment.block.xml",
-          "patterns": [
-            {
-              "begin": "--(?!>)",
-              "captures": {
-                "0": {
-                  "name": "invalid.illegal.bad-comments-or-CDATA.xml"
-                }
-              }
-            }
-          ]
-        }
-      ]
+        "0": { "name": "punctuation.definition.string.begin.xml" }
+      }
     }
-  }
+  ],
+  "name": "XML",
+  "scopeName": "text.xml"
 }
diff --git a/src/renderer/components/editor/grammars/xsl.tmLanguage.json b/src/renderer/components/editor/grammars/xsl.tmLanguage.json
index 9b81a5fb..ca86a053 100644
--- a/src/renderer/components/editor/grammars/xsl.tmLanguage.json
+++ b/src/renderer/components/editor/grammars/xsl.tmLanguage.json
@@ -1,94 +1,59 @@
 {
-  "information_for_contributors": [
-    "This file has been converted from https://github.com/atom/language-xml/blob/master/grammars/xsl.cson",
-    "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/atom/language-xml/commit/507de2ee7daca60cf02e9e21fbeb92bbae73e280",
-  "name": "xsl",
-  "scopeName": "text.xml.xsl",
-  "patterns": [
-    {
-      "begin": "(<)(xsl)((:))(template)",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.tag.xml"
-        },
-        "2": {
-          "name": "entity.name.tag.namespace.xml"
-        },
-        "3": {
-          "name": "entity.name.tag.xml"
-        },
-        "4": {
-          "name": "punctuation.separator.namespace.xml"
-        },
-        "5": {
-          "name": "entity.name.tag.localname.xml"
-        }
-      },
-      "end": "(>)",
-      "name": "meta.tag.xml.template",
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "entity.other.attribute-name.namespace.xml"
-            },
-            "2": {
-              "name": "entity.other.attribute-name.xml"
-            },
-            "3": {
-              "name": "punctuation.separator.namespace.xml"
-            },
-            "4": {
-              "name": "entity.other.attribute-name.localname.xml"
-            }
-          },
-          "match": " (?:([-_a-zA-Z0-9]+)((:)))?([a-zA-Z-]+)"
-        },
-        {
-          "include": "#doublequotedString"
-        },
-        {
-          "include": "#singlequotedString"
-        }
-      ]
-    },
-    {
-      "include": "text.xml"
-    }
-  ],
+  "fileTypes": ["xsl", "xslt"],
   "repository": {
     "doublequotedString": {
       "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.xml"
-        }
-      },
-      "end": "\"",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.xml"
-        }
+        "0": { "name": "punctuation.definition.string.end.xml" }
       },
-      "name": "string.quoted.double.xml"
+      "end": "\"",
+      "name": "string.quoted.double.xml",
+      "beginCaptures": {
+        "0": { "name": "punctuation.definition.string.begin.xml" }
+      }
     },
     "singlequotedString": {
       "begin": "'",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.xml"
-        }
-      },
-      "end": "'",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.xml"
-        }
+        "0": { "name": "punctuation.definition.string.end.xml" }
       },
-      "name": "string.quoted.single.xml"
+      "end": "'",
+      "name": "string.quoted.single.xml",
+      "beginCaptures": {
+        "0": { "name": "punctuation.definition.string.begin.xml" }
+      }
     }
-  }
+  },
+  "keyEquivalent": "^~X",
+  "uuid": "DB8033A1-6D8E-4D80-B8A2-8768AAC6125D",
+  "patterns": [
+    {
+      "begin": "(<)(xsl)((:))(template)",
+      "end": "(>)",
+      "patterns": [
+        {
+          "match": " (?:([-_a-zA-Z0-9]+)((:)))?([a-zA-Z-]+)",
+          "captures": {
+            "3": { "name": "punctuation.separator.namespace.xml" },
+            "1": { "name": "entity.other.attribute-name.namespace.xml" },
+            "4": { "name": "entity.other.attribute-name.localname.xml" },
+            "2": { "name": "entity.other.attribute-name.xml" }
+          }
+        },
+        { "include": "#doublequotedString" },
+        { "include": "#singlequotedString" }
+      ],
+      "name": "meta.tag.xml.template",
+      "captures": {
+        "3": { "name": "entity.name.tag.xml" },
+        "1": { "name": "punctuation.definition.tag.xml" },
+        "4": { "name": "punctuation.separator.namespace.xml" },
+        "2": { "name": "entity.name.tag.namespace.xml" },
+        "5": { "name": "entity.name.tag.localname.xml" }
+      }
+    },
+    { "include": "text.xml" }
+  ],
+  "name": "XSL",
+  "scopeName": "text.xml.xsl"
 }