From e5f958b92161732ae46ccc66ce3d6eea213cf925 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 19 Sep 2022 11:05:25 +0200
Subject: Handle line comments nested in block comments

Fixes #76
---
 tools/support/typst.tmLanguage.json | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/support/typst.tmLanguage.json b/tools/support/typst.tmLanguage.json
index 36ffade7..f493cc5b 100644
--- a/tools/support/typst.tmLanguage.json
+++ b/tools/support/typst.tmLanguage.json
@@ -4,20 +4,27 @@
     { "include": "#markup" }
   ],
   "repository": {
-    "blockcomment": {
+    "comments": {
       "patterns": [
         {
           "name": "comment.block.typst",
           "begin": "/\\*",
           "end": "\\*/",
           "captures": { "0": { "name": "punctuation.definition.comment.typst" } },
-          "patterns": [{ "include": "#blockcomment" }]
+          "patterns": [{ "include": "#comments" }]
+        },
+        {
+          "name": "comment.line.double-slash.typst",
+          "begin": "(?<!:)//",
+          "end": "\n",
+          "beginCaptures": { "0": { "name": "punctuation.definition.comment.typst" } },
+          "patterns": [{ "include": "#comments" }]
         }
       ]
     },
     "common": {
       "patterns": [
-        { "include": "#blockcomment" },
+        { "include": "#comments" },
         {
           "name": "meta.block.code.typst",
           "begin": "{",
@@ -37,12 +44,6 @@
     "markup": {
       "patterns": [
         { "include": "#common" },
-        {
-          "name": "comment.line.double-slash.typst",
-          "begin": "(?<!:)//",
-          "end": "\n",
-          "beginCaptures": { "0": { "name": "punctuation.definition.comment.typst" } }
-        },
         {
           "name": "constant.character.escape.content.typst",
           "match": "\\\\([\\\\/\\[\\]{}#*_=~`$-.]|u\\{[0-9a-zA-Z]*\\}?)"
@@ -128,7 +129,7 @@
           "captures": { "1": { "name": "punctuation.definition.label.typst" } }
         },
         {
-          "begin": "(#)(pub|let|set|rule|select|show|wrap)\\b",
+          "begin": "(#)(pub|let|set|show|wrap)\\b",
           "end": "\n|(;)|(?=])",
           "beginCaptures": {
             "0": { "name": "keyword.other.typst" },
@@ -239,7 +240,7 @@
         },
         {
           "name": "keyword.other.typst",
-          "match": "\\b(pub|let|set|rule|select|show|wrap|as|in|from)\\b"
+          "match": "\\b(pub|let|set|show|wrap|as|in|from)\\b"
         },
         {
           "name": "keyword.control.conditional.typst",
-- 
cgit v1.2.3