diff --git a/src/Templates/highlight.php/twig.json b/src/Templates/highlight.php/twig.json
index b961028..ceb675d 100644
--- a/src/Templates/highlight.php/twig.json
+++ b/src/Templates/highlight.php/twig.json
@@ -25,6 +25,12 @@
             "begin": "\\{%",
             "end": "%}",
             "contains": [
+                {
+                    "className": "comment",
+                    "begin": "#",
+                    "end": "$",
+                    "endsWithParent": true
+                },
                 {
                     "className": "name",
                     "begin": "\\w+",
@@ -32,6 +38,9 @@
                     "starts": {
                         "endsWithParent": true,
                         "contains": [
+                            {
+                                "$ref": "#contains.1.contains.0"
+                            },
                             {
                                 "begin": "\\|[A-Za-z_]+:?",
                                 "keywords": "abs batch capitalize column convert_encoding date date_modify default escape filter first format inky_to_html inline_css join json_encode keys last length lower map markdown merge nl2br number_format raw reduce replace reverse round slice sort spaceless split striptags title trim upper url_encode",
@@ -53,7 +62,7 @@
                                 ]
                             },
                             {
-                                "$ref": "#contains.1.contains.0.starts.contains.0.contains.0"
+                                "$ref": "#contains.1.contains.1.starts.contains.1.contains.0"
                             }
                         ],
                         "relevance": 0
@@ -68,10 +77,13 @@
             "contains": [
                 "self",
                 {
-                    "$ref": "#contains.1.contains.0.starts.contains.0"
+                    "$ref": "#contains.1.contains.0"
+                },
+                {
+                    "$ref": "#contains.1.contains.1.starts.contains.1"
                 },
                 {
-                    "$ref": "#contains.1.contains.0.starts.contains.0.contains.0"
+                    "$ref": "#contains.1.contains.1.starts.contains.1.contains.0"
                 }
             ]
         }
diff --git a/tests/fixtures/expected/blocks/code-blocks/twig.html b/tests/fixtures/expected/blocks/code-blocks/twig.html
index fab139d..83c841c 100644
--- a/tests/fixtures/expected/blocks/code-blocks/twig.html
+++ b/tests/fixtures/expected/blocks/code-blocks/twig.html
@@ -1,6 +1,30 @@
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-twig">
+<div translate="no" data-loc="9" class="notranslate codeblock codeblock-length-sm codeblock-twig">
     <div class="codeblock-scroll">
-        <pre class="codeblock-lines">1</pre>
-        <pre class="codeblock-code"><code><span class="hljs-comment">{# some code #}</span></code></pre>
+        <pre class="codeblock-lines">1
+2
+3
+4
+5
+6
+7
+8
+9</pre>
+        <pre class="codeblock-code">
+            <code>
+                <span class="hljs-comment">{# some code #}</span>
+                <span class="xml"></span>
+                <span class="hljs-template-tag">
+                    {%
+                        <span class="hljs-name"><span class="hljs-keyword">set</span></span> some_var = 'some value' <span class="hljs-comment"># some inline comment</span>
+                    %}
+                </span>
+                <span class="xml"></span>
+                <span class="hljs-template-variable">{{
+                    <span class="hljs-comment"># another inline comment</span>
+                    'Lorem Ipsum'|uppercase
+                    <span class="hljs-comment"># final inline comment</span>
+                }}</span>
+            </code>
+        </pre>
     </div>
 </div>
diff --git a/tests/fixtures/source/blocks/code-blocks/twig.rst b/tests/fixtures/source/blocks/code-blocks/twig.rst
index 01d0685..229041d 100644
--- a/tests/fixtures/source/blocks/code-blocks/twig.rst
+++ b/tests/fixtures/source/blocks/code-blocks/twig.rst
@@ -1,3 +1,11 @@
-
 .. code-block:: twig
+
     {# some code #}
+    {%
+        set some_var = 'some value' # some inline comment
+    %}
+    {{
+        # another inline comment
+        'Lorem Ipsum'|uppercase
+        # final inline comment
+    }}