From 5e202eaddfb29a7a3256178dc7149bf152e8557c Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ludovic.fernandez@zenika.com>
Date: Fri, 13 May 2016 22:39:09 +0200
Subject: [PATCH 1/3] refactor: naming conventions and styling

- `htmlentities` become `character-reference`
- `reference` become `xref`
- ordering `explicit` after `code-block`
- `code-block`  respect conventions
-  better code blocks patterns
---
 grammars/language-asciidoc.cson               | 277 +++++++++++-------
 .../repositories/blocks/quote-grammar.cson    |   6 +-
 .../inlines/characters-grammar.cson           |   8 +-
 .../inlines/general-block-macro-grammar.cson  |   6 +-
 .../partials/explicit-paragraph-grammar.cson  |   4 +-
 lib/code-block-generator.coffee               |  50 +++-
 spec/blocks/code-block-grammar-spec.coffee    |  14 +-
 spec/blocks/quote-grammar-spec.coffee         |  16 +-
 spec/code-block-generator-spec.coffee         |  57 +++-
 spec/inlines/characters-grammar-spec.coffee   |   6 +-
 ...coffee => language-properties-spec.coffee} |   0
 .../block-callout-grammar-spec.coffee         |   4 +-
 .../explicit-paragraph-grammar-spec.coffee    | 114 +++----
 styles/asciidoc.atom-text-editor.less         |  11 +-
 14 files changed, 355 insertions(+), 218 deletions(-)
 rename spec/{grammar-properties-lang-spec.coffee => language-properties-spec.coffee} (100%)

diff --git a/grammars/language-asciidoc.cson b/grammars/language-asciidoc.cson
index f4a674a..45dfe04 100644
--- a/grammars/language-asciidoc.cson
+++ b/grammars/language-asciidoc.cson
@@ -227,10 +227,13 @@ repository:
     patterns: [
       {
         name: "markup.explicit.asciidoc"
-        match: "^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$"
+        match: '''
+          ^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!
+          ---)
+        '''
         captures:
           "1":
-            name: "support.constant.asciidoc"
+            name: "entity.name.function.asciidoc"
       }
     ]
   "horizontal-rule":
@@ -429,13 +432,13 @@ repository:
   characters:
     patterns: [
       {
-        name: "markup.htmlentity.asciidoc"
+        name: "markup.character-reference.asciidoc"
         match: "(?<!\\\\)(&)(\\S+?)(;)"
         captures:
           "1":
-            name: "support.constant.asciidoc"
+            name: "constant.character.asciidoc"
           "3":
-            name: "support.constant.asciidoc"
+            name: "constant.character.asciidoc"
       }
     ]
   emphasis:
@@ -496,6 +499,11 @@ repository:
             name: "markup.link.asciidoc"
           "3":
             name: "string.unquoted.asciidoc"
+            patterns: [
+              {
+                include: "#attribute-reference"
+              }
+            ]
       }
     ]
   "image-macro":
@@ -813,11 +821,11 @@ repository:
         begin: "^\\[(quote|verse)(, ([\\w ]+))?(, ([\\w ]+))?"
         beginCaptures:
           "1":
-            name: "none.quotes.label.asciidoc"
+            name: "entity.name.function.label.asciidoc"
           "3":
-            name: "none.quotes.attribution.asciidoc"
+            name: "string.unquoted.attribution.asciidoc"
           "5":
-            name: "none.quotes.citetitle.asciidoc"
+            name: "string.unquoted.citetitle.asciidoc"
         end: "\\]$"
       }
       {
@@ -888,10 +896,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -927,10 +936,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -966,10 +976,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1005,10 +1016,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1044,10 +1056,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1083,10 +1096,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1122,10 +1136,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1161,10 +1176,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1200,10 +1216,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1239,10 +1256,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1278,10 +1296,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1317,10 +1336,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1356,10 +1376,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1395,10 +1416,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1434,10 +1456,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1473,10 +1496,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1512,10 +1536,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1551,10 +1576,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1590,10 +1616,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1629,10 +1656,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1668,10 +1696,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1707,10 +1736,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1746,10 +1776,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1785,10 +1816,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1824,10 +1856,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1863,10 +1896,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1902,10 +1936,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1941,10 +1976,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -1980,10 +2016,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2019,10 +2056,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2058,10 +2096,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2097,10 +2136,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2136,10 +2176,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2175,10 +2216,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2214,10 +2256,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2253,10 +2296,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2292,10 +2336,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2331,10 +2376,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2370,10 +2416,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2409,10 +2456,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2448,10 +2496,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2487,10 +2536,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2526,10 +2576,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2565,10 +2616,11 @@ repository:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "entity.name.type.asciidoc"
           "3":
+            name: "markup.meta.attribute-list.asciidoc"
             patterns: [
               {
                 include: "#attribute-reference"
@@ -2599,14 +2651,41 @@ repository:
         end: "(?<=----)[\\r\\n]+$"
       }
       {
-        begin: "^\\[(source)(?:,([^,\\]]*)){0,2}\\]$"
+        begin: "^\\[(source)(,([^\\]]*))?\\]$"
         beginCaptures:
           "0":
             name: "support.asciidoc"
           "1":
-            name: "constant.asciidoc"
+            name: "entity.name.function.asciidoc"
           "2":
-            name: "string.asciidoc"
+            name: "markup.meta.attribute-list.asciidoc"
+        end: "(?<=----)[\\r\\n]+$"
+        patterns: [
+          {
+            name: "markup.raw.asciidoc"
+            begin: "^(-{4,})\\s*$"
+            beginCaptures:
+              "0":
+                name: "support.asciidoc"
+            patterns: [
+              {
+                include: "#block-callout"
+              }
+            ]
+            end: "^\\1*$"
+            endCaptures:
+              "0":
+                name: "support.asciidoc"
+          }
+        ]
+      }
+      {
+        begin: "^\\[([^\\]]+)\\]$"
+        beginCaptures:
+          "0":
+            name: "support.asciidoc"
+          "1":
+            name: "markup.meta.attribute-list.asciidocc"
         end: "(?<=----)[\\r\\n]+$"
         patterns: [
           {
diff --git a/grammars/repositories/blocks/quote-grammar.cson b/grammars/repositories/blocks/quote-grammar.cson
index 2fb4c64..405c5c8 100644
--- a/grammars/repositories/blocks/quote-grammar.cson
+++ b/grammars/repositories/blocks/quote-grammar.cson
@@ -24,9 +24,9 @@ patterns: [
   name: 'markup.italic.quotes.attributes.asciidoc'
   begin: '^\\[(quote|verse)(, ([\\w ]+))?(, ([\\w ]+))?'
   beginCaptures:
-    1: name: 'none.quotes.label.asciidoc'
-    3: name: 'none.quotes.attribution.asciidoc'
-    5: name: 'none.quotes.citetitle.asciidoc'
+    1: name: 'entity.name.function.label.asciidoc'
+    3: name: 'string.unquoted.attribution.asciidoc'
+    5: name: 'string.unquoted.citetitle.asciidoc'
   end: '\\]$'
 ,
   # Matches quote block
diff --git a/grammars/repositories/inlines/characters-grammar.cson b/grammars/repositories/inlines/characters-grammar.cson
index e788b7b..f63e2d4 100644
--- a/grammars/repositories/inlines/characters-grammar.cson
+++ b/grammars/repositories/inlines/characters-grammar.cson
@@ -2,15 +2,15 @@ key: 'characters'
 
 patterns: [
 
-  # Matches characters
+  # Matches characters references.
   #
   # Examples
   #
   #   Dungeons &amp; Dragons
   #
-  name: 'markup.htmlentity.asciidoc'
+  name: 'markup.character-reference.asciidoc'
   match: '(?<!\\\\)(\&)(\\S+?)(;)'
   captures:
-    1: name: 'support.constant.asciidoc'
-    3: name: 'support.constant.asciidoc'
+    1: name: 'constant.character.asciidoc'
+    3: name: 'constant.character.asciidoc'
 ]
diff --git a/grammars/repositories/inlines/general-block-macro-grammar.cson b/grammars/repositories/inlines/general-block-macro-grammar.cson
index 2f64f88..8eb581e 100644
--- a/grammars/repositories/inlines/general-block-macro-grammar.cson
+++ b/grammars/repositories/inlines/general-block-macro-grammar.cson
@@ -13,5 +13,9 @@ patterns: [
  captures:
    1: name: 'entity.name.function.asciidoc'
    2: name: 'markup.link.asciidoc'
-   3: name: 'string.unquoted.asciidoc'
+   3:
+    name: 'string.unquoted.asciidoc'
+    patterns: [
+      include: '#attribute-reference'
+    ]
 ]
diff --git a/grammars/repositories/partials/explicit-paragraph-grammar.cson b/grammars/repositories/partials/explicit-paragraph-grammar.cson
index e0c80ec..9d0430b 100644
--- a/grammars/repositories/partials/explicit-paragraph-grammar.cson
+++ b/grammars/repositories/partials/explicit-paragraph-grammar.cson
@@ -10,7 +10,7 @@ patterns: [
   #   This is a normal paragraph.
   #
   name: 'markup.explicit.asciidoc'
-  match: '^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$'
+  match: '^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!\n---)'
   captures:
-    1: name: 'support.constant.asciidoc'
+    1: name: 'entity.name.function.asciidoc'
 ]
diff --git a/lib/code-block-generator.coffee b/lib/code-block-generator.coffee
index 0348c21..1b913bd 100644
--- a/lib/code-block-generator.coffee
+++ b/lib/code-block-generator.coffee
@@ -7,9 +7,10 @@ module.exports =
       begin: "^\\[(source),\\p{Blank}*(?i:(#{lang.pattern}))(?:,([^\]]*))?\\]$"
       beginCaptures:
         0: name: 'support.asciidoc'
-        1: name: 'constant.asciidoc'
-        2: name: 'string.asciidoc'
+        1: name: 'entity.name.function.asciidoc'
+        2: name: 'entity.name.type.asciidoc'
         3:
+          name: 'markup.meta.attribute-list.asciidoc'
           patterns: [
             include: '#attribute-reference'
           ]
@@ -32,35 +33,59 @@ module.exports =
 
     # add generic block
     codeBlocks.push
-      begin: '^\\[(source)(?:,([^,\\]]*)){0,2}\\]$'
+      begin: '^\\[(source)(,([^\\]]*))?\\]$'
       beginCaptures:
         0: name: 'support.asciidoc'
-        1: name: 'constant.asciidoc'
-        2: name: 'string.asciidoc'
+        1: name: 'entity.name.function.asciidoc'
+        2: name: 'markup.meta.attribute-list.asciidoc'
       end: '(?<=----)[\\r\\n]+$'
       patterns: [
         name: 'markup.raw.asciidoc'
         begin: '^(-{4,})\\s*$'
         beginCaptures:
           0: name: 'support.asciidoc'
-        patterns: [include: '#block-callout']
+        patterns: [
+          include: '#block-callout'
+        ]
         end: '^\\1*$'
         endCaptures:
           0: name: 'support.asciidoc'
       ]
+
+    # add generic block with attributes only
+    codeBlocks.push
+      begin: '^\\[([^\\]]+)\\]$'
+      beginCaptures:
+        0: name: 'support.asciidoc'
+        1: name: 'markup.meta.attribute-list.asciidocc'
+      end: '(?<=----)[\\r\\n]+$'
+      patterns: [
+        name: 'markup.raw.asciidoc'
+        begin: '^(-{4,})\\s*$'
+        beginCaptures:
+          0: name: 'support.asciidoc'
+        patterns: [
+          include: '#block-callout'
+        ]
+        end: '^\\1*$'
+        endCaptures:
+          0: name: 'support.asciidoc'
+      ]
+
     # add listing block
     codeBlocks.push
       name: 'markup.raw.asciidoc'
       begin: '^(-{4,})\\s*$'
       beginCaptures:
         0: name: 'support.asciidoc'
-      patterns: [include: '#block-callout']
+      patterns: [
+        include: '#block-callout'
+      ]
       end: '^\\1*$'
       endCaptures:
         0: name: 'support.asciidoc'
 
-    if debug
-      console.log CSON.stringify codeBlocks
+    if debug then console.log CSON.stringify codeBlocks
     codeBlocks
 
   makeMarkdownBlocks: (languages, debug = false) ->
@@ -86,11 +111,12 @@ module.exports =
       begin: '^\\s*(`{3,}).*$'
       beginCaptures:
         0: name: 'support.asciidoc'
-      patterns: [include: '#block-callout']
+      patterns: [
+        include: '#block-callout'
+      ]
       end: '^\\s*\\1\\s*$'
       endCaptures:
         0: name: 'support.asciidoc'
 
-    if debug
-      console.log CSON.stringify codeBlocks
+    if debug then console.log CSON.stringify codeBlocks
     codeBlocks
diff --git a/spec/blocks/code-block-grammar-spec.coffee b/spec/blocks/code-block-grammar-spec.coffee
index c6d3632..abefc90 100644
--- a/spec/blocks/code-block-grammar-spec.coffee
+++ b/spec/blocks/code-block-grammar-spec.coffee
@@ -29,9 +29,9 @@ describe 'Should tokenizes code block when', ->
     expect(tokens).toHaveLength 7 # Number of lines
     expect(tokens[0]).toHaveLength 5
     expect(tokens[0][0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'support.asciidoc']
-    expect(tokens[0][1]).toEqualJson value: 'source', scopes: ['source.asciidoc', 'support.asciidoc', 'constant.asciidoc']
+    expect(tokens[0][1]).toEqualJson value: 'source', scopes: ['source.asciidoc', 'support.asciidoc', 'entity.name.function.asciidoc']
     expect(tokens[0][2]).toEqualJson value: ',', scopes: ['source.asciidoc', 'support.asciidoc']
-    expect(tokens[0][3]).toEqualJson value: 'shell', scopes: ['source.asciidoc', 'support.asciidoc', 'string.asciidoc']
+    expect(tokens[0][3]).toEqualJson value: 'shell', scopes: ['source.asciidoc', 'support.asciidoc', 'entity.name.type.asciidoc']
     expect(tokens[0][4]).toEqualJson value: ']', scopes: ['source.asciidoc', 'support.asciidoc']
     expect(tokens[1]).toHaveLength 1
     expect(tokens[1][0]).toEqualJson value: '----', scopes: ['source.asciidoc', 'markup.code.shell.asciidoc', 'support.asciidoc']
@@ -77,13 +77,13 @@ describe 'Should tokenizes code block when', ->
     expect(tokens).toHaveLength 4 # Number of lines
     expect(tokens[0]).toHaveLength 9
     expect(tokens[0][0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'support.asciidoc']
-    expect(tokens[0][1]).toEqualJson value: 'source', scopes: ['source.asciidoc', 'support.asciidoc', 'constant.asciidoc']
+    expect(tokens[0][1]).toEqualJson value: 'source', scopes: ['source.asciidoc', 'support.asciidoc', 'entity.name.function.asciidoc']
     expect(tokens[0][2]).toEqualJson value: ',', scopes: ['source.asciidoc', 'support.asciidoc']
-    expect(tokens[0][3]).toEqualJson value: 'java', scopes: ['source.asciidoc', 'support.asciidoc', 'string.asciidoc']
+    expect(tokens[0][3]).toEqualJson value: 'java', scopes: ['source.asciidoc', 'support.asciidoc', 'entity.name.type.asciidoc']
     expect(tokens[0][4]).toEqualJson value: ',', scopes: ['source.asciidoc', 'support.asciidoc']
-    expect(tokens[0][5]).toEqualJson value: 'subs="', scopes: ['source.asciidoc', 'support.asciidoc']
-    expect(tokens[0][6]).toEqualJson value: '{markup-in-source}', scopes: ['source.asciidoc', 'support.asciidoc', 'markup.substitution.attribute-reference.asciidoc']
-    expect(tokens[0][7]).toEqualJson value: '"', scopes: ['source.asciidoc', 'support.asciidoc']
+    expect(tokens[0][5]).toEqualJson value: 'subs="', scopes: ['source.asciidoc', 'support.asciidoc', 'markup.meta.attribute-list.asciidoc']
+    expect(tokens[0][6]).toEqualJson value: '{markup-in-source}', scopes: ['source.asciidoc', 'support.asciidoc', 'markup.meta.attribute-list.asciidoc', 'markup.substitution.attribute-reference.asciidoc']
+    expect(tokens[0][7]).toEqualJson value: '"', scopes: ['source.asciidoc', 'support.asciidoc', 'markup.meta.attribute-list.asciidoc']
     expect(tokens[0][8]).toEqualJson value: ']', scopes: ['source.asciidoc', 'support.asciidoc']
     expect(tokens[1]).toHaveLength 1
     expect(tokens[1][0]).toEqualJson value: '----', scopes: ['source.asciidoc', 'markup.code.java.asciidoc', 'support.asciidoc']
diff --git a/spec/blocks/quote-grammar-spec.coffee b/spec/blocks/quote-grammar-spec.coffee
index c391cf0..b283ae6 100644
--- a/spec/blocks/quote-grammar-spec.coffee
+++ b/spec/blocks/quote-grammar-spec.coffee
@@ -26,11 +26,11 @@ describe 'Should tokenizes quote block when', ->
     expect(tokens).toHaveLength 4
     expect(tokens[0]).toHaveLength 7
     expect(tokens[0][0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
-    expect(tokens[0][1]).toEqualJson value: 'quote', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'none.quotes.label.asciidoc' ]
+    expect(tokens[0][1]).toEqualJson value: 'quote', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'entity.name.function.label.asciidoc' ]
     expect(tokens[0][2]).toEqualJson value: ', ', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
-    expect(tokens[0][3]).toEqualJson value: 'Erwin Schrödinger', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'none.quotes.attribution.asciidoc']
+    expect(tokens[0][3]).toEqualJson value: 'Erwin Schrödinger', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'string.unquoted.attribution.asciidoc']
     expect(tokens[0][4]).toEqualJson value: ', ', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
-    expect(tokens[0][5]).toEqualJson value: 'Sorry', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'none.quotes.citetitle.asciidoc']
+    expect(tokens[0][5]).toEqualJson value: 'Sorry', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'string.unquoted.citetitle.asciidoc']
     expect(tokens[0][6]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
     expect(tokens[1]).toHaveLength 1
     expect(tokens[1][0]).toEqualJson value: '____', scopes: ['source.asciidoc', 'markup.italic.quotes.asciidoc']
@@ -43,9 +43,9 @@ describe 'Should tokenizes quote block when', ->
     {tokens} = grammar.tokenizeLine '[verse, Homer Simpson]\n'
     expect(tokens).toHaveLength 6
     expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
-    expect(tokens[1]).toEqualJson value: 'verse', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'none.quotes.label.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'verse', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'entity.name.function.label.asciidoc']
     expect(tokens[2]).toEqualJson value: ', ', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
-    expect(tokens[3]).toEqualJson value: 'Homer Simpson', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'none.quotes.attribution.asciidoc']
+    expect(tokens[3]).toEqualJson value: 'Homer Simpson', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'string.unquoted.attribution.asciidoc']
     expect(tokens[4]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
     expect(tokens[5]).toEqualJson value: '\n', scopes: ['source.asciidoc']
 
@@ -53,11 +53,11 @@ describe 'Should tokenizes quote block when', ->
     {tokens} = grammar.tokenizeLine '[quote, Erwin Schrödinger, Sorry]\n'
     expect(tokens).toHaveLength 8
     expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
-    expect(tokens[1]).toEqualJson value: 'quote', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'none.quotes.label.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'quote', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'entity.name.function.label.asciidoc']
     expect(tokens[2]).toEqualJson value: ', ', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
-    expect(tokens[3]).toEqualJson value: 'Erwin Schrödinger', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'none.quotes.attribution.asciidoc']
+    expect(tokens[3]).toEqualJson value: 'Erwin Schrödinger', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'string.unquoted.attribution.asciidoc']
     expect(tokens[4]).toEqualJson value: ', ', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
-    expect(tokens[5]).toEqualJson value: 'Sorry', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'none.quotes.citetitle.asciidoc']
+    expect(tokens[5]).toEqualJson value: 'Sorry', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc', 'string.unquoted.citetitle.asciidoc']
     expect(tokens[6]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.italic.quotes.attributes.asciidoc']
     expect(tokens[7]).toEqualJson value: '\n', scopes: ['source.asciidoc']
 
diff --git a/spec/code-block-generator-spec.coffee b/spec/code-block-generator-spec.coffee
index 2c029b1..40ab5c6 100644
--- a/spec/code-block-generator-spec.coffee
+++ b/spec/code-block-generator-spec.coffee
@@ -7,35 +7,62 @@ describe 'Code block generator', ->
     it 'should generate default code block', ->
       languages = []
       codeBlocks = generator.makeAsciidocBlocks(languages)
-      expect(codeBlocks).toHaveLength 2 # Number of blocks
+      expect(codeBlocks).toHaveLength 3 # Number of blocks
       expect(codeBlocks[0]).toEqualJson
-        begin: '^\\[(source)(?:,([^,\\]]*)){0,2}\\]$'
+        begin: '^\\[(source)(,([^\\]]*))?\\]$'
         beginCaptures:
           0: name: 'support.asciidoc'
-          1: name: 'constant.asciidoc'
-          2: name: 'string.asciidoc'
+          1: name: 'entity.name.function.asciidoc'
+          2: name: 'markup.meta.attribute-list.asciidoc'
+        end: '(?<=----)[\\r\\n]+$'
         patterns: [
           name: 'markup.raw.asciidoc'
           begin: '^(-{4,})\\s*$'
           beginCaptures:
             0: name: 'support.asciidoc'
-          patterns: [include: '#block-callout']
+          patterns: [
+            include: '#block-callout'
+          ]
           end: '^\\1*$'
           endCaptures:
             0: name: 'support.asciidoc'
         ]
+
+    it 'should generate default code block with attributes only', ->
+      languages = []
+      codeBlocks = generator.makeAsciidocBlocks(languages)
+      expect(codeBlocks).toHaveLength 3 # Number of blocks
+      expect(codeBlocks[1]).toEqualJson
+        begin: '^\\[([^\\]]+)\\]$'
+        beginCaptures:
+          0: name: 'support.asciidoc'
+          1: name: 'markup.meta.attribute-list.asciidocc'
         end: '(?<=----)[\\r\\n]+$'
+        patterns: [
+          name: 'markup.raw.asciidoc'
+          begin: '^(-{4,})\\s*$'
+          beginCaptures:
+            0: name: 'support.asciidoc'
+          patterns: [
+            include: '#block-callout'
+          ]
+          end: '^\\1*$'
+          endCaptures:
+            0: name: 'support.asciidoc'
+        ]
 
     it 'should generate listing block', ->
       languages = []
       codeBlocks = generator.makeAsciidocBlocks(languages)
-      expect(codeBlocks).toHaveLength 2 # Number of blocks
-      expect(codeBlocks[1]).toEqualJson
+      expect(codeBlocks).toHaveLength 3 # Number of blocks
+      expect(codeBlocks[2]).toEqualJson
         name: 'markup.raw.asciidoc'
         begin: '^(-{4,})\\s*$'
         beginCaptures:
           0: name: 'support.asciidoc'
-        patterns: [include: '#block-callout']
+        patterns: [
+          include: '#block-callout'
+        ]
         end: '^\\1*$'
         endCaptures:
           0: name: 'support.asciidoc'
@@ -45,14 +72,15 @@ describe 'Code block generator', ->
         pattern: 'javascript|js', type: 'source', code: 'js'
       ]
       codeBlocks = generator.makeAsciidocBlocks(languages)
-      expect(codeBlocks).toHaveLength 3 # Number of blocks
+      expect(codeBlocks).toHaveLength 4 # Number of blocks
       expect(codeBlocks[0]).toEqualJson
         begin: '^\\[(source),\\p{Blank}*(?i:(javascript|js))(?:,([^\]]*))?\\]$'
         beginCaptures:
           0: name: 'support.asciidoc'
-          1: name: 'constant.asciidoc'
-          2: name: 'string.asciidoc'
+          1: name: 'entity.name.function.asciidoc'
+          2: name: 'entity.name.type.asciidoc'
           3:
+            name: 'markup.meta.attribute-list.asciidoc'
             patterns: [
               include: '#attribute-reference'
             ]
@@ -78,14 +106,15 @@ describe 'Code block generator', ->
         pattern: 'c(pp|\\+\\+)', type: 'source', code: 'cpp'
       ]
       codeBlocks = generator.makeAsciidocBlocks(languages)
-      expect(codeBlocks).toHaveLength 3 # Number of blocks
+      expect(codeBlocks).toHaveLength 4 # Number of blocks
       expect(codeBlocks[0]).toEqualJson
         begin: '^\\[(source),\\p{Blank}*(?i:(c(pp|\\+\\+)))(?:,([^\]]*))?\\]$'
         beginCaptures:
           0: name: 'support.asciidoc'
-          1: name: 'constant.asciidoc'
-          2: name: 'string.asciidoc'
+          1: name: 'entity.name.function.asciidoc'
+          2: name: 'entity.name.type.asciidoc'
           3:
+            name: 'markup.meta.attribute-list.asciidoc'
             patterns: [
               include: '#attribute-reference'
             ]
diff --git a/spec/inlines/characters-grammar-spec.coffee b/spec/inlines/characters-grammar-spec.coffee
index 0ccf2d1..a6ee0f8 100644
--- a/spec/inlines/characters-grammar-spec.coffee
+++ b/spec/inlines/characters-grammar-spec.coffee
@@ -20,9 +20,9 @@ describe 'Should tokenizes characters when', ->
     {tokens} = grammar.tokenizeLine 'Dungeons &amp; Dragons'
     expect(tokens).toHaveLength 5
     expect(tokens[0]).toEqualJson value: 'Dungeons ', scopes: ['source.asciidoc']
-    expect(tokens[1]).toEqualJson value: '&', scopes: ['source.asciidoc', 'markup.htmlentity.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqualJson value: 'amp', scopes: ['source.asciidoc', 'markup.htmlentity.asciidoc']
-    expect(tokens[3]).toEqualJson value: ';', scopes: ['source.asciidoc', 'markup.htmlentity.asciidoc', 'support.constant.asciidoc']
+    expect(tokens[1]).toEqualJson value: '&', scopes: ['source.asciidoc', 'markup.character-reference.asciidoc', 'constant.character.asciidoc']
+    expect(tokens[2]).toEqualJson value: 'amp', scopes: ['source.asciidoc', 'markup.character-reference.asciidoc']
+    expect(tokens[3]).toEqualJson value: ';', scopes: ['source.asciidoc', 'markup.character-reference.asciidoc', 'constant.character.asciidoc']
     expect(tokens[4]).toEqualJson value: ' Dragons', scopes: ['source.asciidoc']
 
   it 'contains space (invalid context)', ->
diff --git a/spec/grammar-properties-lang-spec.coffee b/spec/language-properties-spec.coffee
similarity index 100%
rename from spec/grammar-properties-lang-spec.coffee
rename to spec/language-properties-spec.coffee
diff --git a/spec/partials/block-callout-grammar-spec.coffee b/spec/partials/block-callout-grammar-spec.coffee
index df1e0e2..d58bbcc 100644
--- a/spec/partials/block-callout-grammar-spec.coffee
+++ b/spec/partials/block-callout-grammar-spec.coffee
@@ -29,9 +29,9 @@ describe 'Should tokenizes callout in code block when', ->
     expect(tokens).toHaveLength 8
     expect(tokens[0]).toHaveLength 5
     expect(tokens[0][0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'support.asciidoc']
-    expect(tokens[0][1]).toEqualJson value: 'source', scopes: ['source.asciidoc', 'support.asciidoc', 'constant.asciidoc']
+    expect(tokens[0][1]).toEqualJson value: 'source', scopes: ['source.asciidoc', 'support.asciidoc', 'entity.name.function.asciidoc']
     expect(tokens[0][2]).toEqualJson value: ', ', scopes: ['source.asciidoc', 'support.asciidoc']
-    expect(tokens[0][3]).toEqualJson value: 'js', scopes: ['source.asciidoc', 'support.asciidoc', 'string.asciidoc']
+    expect(tokens[0][3]).toEqualJson value: 'js', scopes: ['source.asciidoc', 'support.asciidoc', 'entity.name.type.asciidoc']
     expect(tokens[0][4]).toEqualJson value: ']', scopes: ['source.asciidoc', 'support.asciidoc']
     expect(tokens[1]).toHaveLength 1
     expect(tokens[1][0]).toEqualJson value: '----', scopes: ['source.asciidoc', 'markup.code.js.asciidoc', 'support.asciidoc']
diff --git a/spec/partials/explicit-paragraph-grammar-spec.coffee b/spec/partials/explicit-paragraph-grammar-spec.coffee
index c067cb4..f6583f8 100644
--- a/spec/partials/explicit-paragraph-grammar-spec.coffee
+++ b/spec/partials/explicit-paragraph-grammar-spec.coffee
@@ -19,121 +19,121 @@ describe 'Should tokenizes explicit paragraph when', ->
   it 'use "normal" keyword', ->
     {tokens} = grammar.tokenizeLine '[normal]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'normal', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'normal', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "literal" keyword', ->
     {tokens} = grammar.tokenizeLine '[literal]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'literal', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'literal', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "listing" keyword', ->
     {tokens} = grammar.tokenizeLine '[listing]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'listing', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'listing', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "TIP" keyword', ->
     {tokens} = grammar.tokenizeLine '[TIP]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'TIP', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'TIP', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "NOTE" keyword', ->
     {tokens} = grammar.tokenizeLine '[NOTE]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'NOTE', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'NOTE', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "IMPORTANT" keyword', ->
     {tokens} = grammar.tokenizeLine '[IMPORTANT]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'IMPORTANT', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'IMPORTANT', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "WARNING" keyword', ->
     {tokens} = grammar.tokenizeLine '[WARNING]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'WARNING', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'WARNING', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "CAUTION" keyword', ->
     {tokens} = grammar.tokenizeLine '[CAUTION]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'CAUTION', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'CAUTION', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "partintro" keyword', ->
     {tokens} = grammar.tokenizeLine '[partintro]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'partintro', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'partintro', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "comment" keyword', ->
     {tokens} = grammar.tokenizeLine '[comment]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'comment', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'comment', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "example" keyword', ->
     {tokens} = grammar.tokenizeLine '[example]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'example', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'example', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "WARNING" keyword', ->
     {tokens} = grammar.tokenizeLine '[WARNING]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'WARNING', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'WARNING', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "sidebar" keyword', ->
     {tokens} = grammar.tokenizeLine '[sidebar]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'sidebar', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'sidebar', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "source" keyword', ->
     {tokens} = grammar.tokenizeLine '[source]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'source', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'source', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "music" keyword', ->
     {tokens} = grammar.tokenizeLine '[music]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'music', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'music', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "latex" keyword', ->
     {tokens} = grammar.tokenizeLine '[latex]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'latex', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'latex', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
   it 'use "graphviz" keyword', ->
     {tokens} = grammar.tokenizeLine '[graphviz]'
     expect(tokens).toHaveLength 3
-    expect(tokens[0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[1]).toEqual value: 'graphviz', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[1]).toEqualJson value: 'graphviz', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
 
 
   it 'simple title with example block', ->
@@ -145,12 +145,12 @@ describe 'Should tokenizes explicit paragraph when', ->
       '''
     expect(tokens).toHaveLength 4
     expect(tokens[0]).toHaveLength 3
-    expect(tokens[0][0]).toEqual value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
-    expect(tokens[0][1]).toEqual value: 'example', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'support.constant.asciidoc']
-    expect(tokens[0][2]).toEqual value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0][0]).toEqualJson value: '[', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
+    expect(tokens[0][1]).toEqualJson value: 'example', scopes: ['source.asciidoc', 'markup.explicit.asciidoc', 'entity.name.function.asciidoc']
+    expect(tokens[0][2]).toEqualJson value: ']', scopes: ['source.asciidoc', 'markup.explicit.asciidoc']
     expect(tokens[1]).toHaveLength 1
-    expect(tokens[1][0]).toEqual value: '====', scopes: ['source.asciidoc', 'markup.block.example.asciidoc']
+    expect(tokens[1][0]).toEqualJson value: '====', scopes: ['source.asciidoc', 'markup.block.example.asciidoc']
     expect(tokens[2]).toHaveLength 1
-    expect(tokens[2][0]).toEqual value: 'foobar', scopes: ['source.asciidoc', 'markup.block.example.asciidoc']
+    expect(tokens[2][0]).toEqualJson value: 'foobar', scopes: ['source.asciidoc', 'markup.block.example.asciidoc']
     expect(tokens[3]).toHaveLength 1
-    expect(tokens[3][0]).toEqual value: '====', scopes: ['source.asciidoc', 'markup.block.example.asciidoc']
+    expect(tokens[3][0]).toEqualJson value: '====', scopes: ['source.asciidoc', 'markup.block.example.asciidoc']
diff --git a/styles/asciidoc.atom-text-editor.less b/styles/asciidoc.atom-text-editor.less
index c908b97..27afc42 100644
--- a/styles/asciidoc.atom-text-editor.less
+++ b/styles/asciidoc.atom-text-editor.less
@@ -15,7 +15,7 @@ atom-text-editor::shadow, :host {
         font-style: italic;
       }
 
-      &.htmlentity {
+      &.character-reference {
         font-style: italic;
         color: mix(red, @syntax-text-color, 20%);
       }
@@ -26,9 +26,8 @@ atom-text-editor::shadow, :host {
         color: mix(green, @syntax-text-color, 20%);
       }
 
-      &.reference {
+      &.xref {
         font-style: italic;
-        color: mix(green, @syntax-text-color, 20%);
       }
 
       &.admonition,
@@ -44,18 +43,18 @@ atom-text-editor::shadow, :host {
         font-weight: bold;
 
         // Lighten headers for dark themes.
-        & when (lightness(@syntax-background-color) < 50%){
+        & when (lightness(@syntax-background-color) < 50%) {
           color: lighten(@syntax-text-color, 20%);
         }
 
         // Darken headers for light themes.
-        & when (lightness(@syntax-background-color) > 50%){
+        & when (lightness(@syntax-background-color) > 50%) {
           color: darken(@syntax-text-color, 20%);
         }
       }
 
       &.heading.blocktitle,
-      &.substitution{
+      &.substitution {
         color: @syntax-text-color-unobtrusive;
       }
       &.meta.attribute-list {

From 42989ec74130148835dd59253bd82d20677514ed Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ludovic.fernandez@zenika.com>
Date: Sun, 15 May 2016 02:40:48 +0200
Subject: [PATCH 2/3] refactor: cancel generic block with attributes only

---
 grammars/language-asciidoc.cson       | 27 ----------------------
 lib/code-block-generator.coffee       | 20 ----------------
 spec/code-block-generator-spec.coffee | 33 ++++-----------------------
 3 files changed, 5 insertions(+), 75 deletions(-)

diff --git a/grammars/language-asciidoc.cson b/grammars/language-asciidoc.cson
index 45dfe04..f1a65ef 100644
--- a/grammars/language-asciidoc.cson
+++ b/grammars/language-asciidoc.cson
@@ -2679,33 +2679,6 @@ repository:
           }
         ]
       }
-      {
-        begin: "^\\[([^\\]]+)\\]$"
-        beginCaptures:
-          "0":
-            name: "support.asciidoc"
-          "1":
-            name: "markup.meta.attribute-list.asciidocc"
-        end: "(?<=----)[\\r\\n]+$"
-        patterns: [
-          {
-            name: "markup.raw.asciidoc"
-            begin: "^(-{4,})\\s*$"
-            beginCaptures:
-              "0":
-                name: "support.asciidoc"
-            patterns: [
-              {
-                include: "#block-callout"
-              }
-            ]
-            end: "^\\1*$"
-            endCaptures:
-              "0":
-                name: "support.asciidoc"
-          }
-        ]
-      }
       {
         name: "markup.raw.asciidoc"
         begin: "^(-{4,})\\s*$"
diff --git a/lib/code-block-generator.coffee b/lib/code-block-generator.coffee
index 1b913bd..f0cedcc 100644
--- a/lib/code-block-generator.coffee
+++ b/lib/code-block-generator.coffee
@@ -52,26 +52,6 @@ module.exports =
           0: name: 'support.asciidoc'
       ]
 
-    # add generic block with attributes only
-    codeBlocks.push
-      begin: '^\\[([^\\]]+)\\]$'
-      beginCaptures:
-        0: name: 'support.asciidoc'
-        1: name: 'markup.meta.attribute-list.asciidocc'
-      end: '(?<=----)[\\r\\n]+$'
-      patterns: [
-        name: 'markup.raw.asciidoc'
-        begin: '^(-{4,})\\s*$'
-        beginCaptures:
-          0: name: 'support.asciidoc'
-        patterns: [
-          include: '#block-callout'
-        ]
-        end: '^\\1*$'
-        endCaptures:
-          0: name: 'support.asciidoc'
-      ]
-
     # add listing block
     codeBlocks.push
       name: 'markup.raw.asciidoc'
diff --git a/spec/code-block-generator-spec.coffee b/spec/code-block-generator-spec.coffee
index 40ab5c6..9529ac6 100644
--- a/spec/code-block-generator-spec.coffee
+++ b/spec/code-block-generator-spec.coffee
@@ -7,7 +7,7 @@ describe 'Code block generator', ->
     it 'should generate default code block', ->
       languages = []
       codeBlocks = generator.makeAsciidocBlocks(languages)
-      expect(codeBlocks).toHaveLength 3 # Number of blocks
+      expect(codeBlocks).toHaveLength 2 # Number of blocks
       expect(codeBlocks[0]).toEqualJson
         begin: '^\\[(source)(,([^\\]]*))?\\]$'
         beginCaptures:
@@ -28,34 +28,11 @@ describe 'Code block generator', ->
             0: name: 'support.asciidoc'
         ]
 
-    it 'should generate default code block with attributes only', ->
-      languages = []
-      codeBlocks = generator.makeAsciidocBlocks(languages)
-      expect(codeBlocks).toHaveLength 3 # Number of blocks
-      expect(codeBlocks[1]).toEqualJson
-        begin: '^\\[([^\\]]+)\\]$'
-        beginCaptures:
-          0: name: 'support.asciidoc'
-          1: name: 'markup.meta.attribute-list.asciidocc'
-        end: '(?<=----)[\\r\\n]+$'
-        patterns: [
-          name: 'markup.raw.asciidoc'
-          begin: '^(-{4,})\\s*$'
-          beginCaptures:
-            0: name: 'support.asciidoc'
-          patterns: [
-            include: '#block-callout'
-          ]
-          end: '^\\1*$'
-          endCaptures:
-            0: name: 'support.asciidoc'
-        ]
-
     it 'should generate listing block', ->
       languages = []
       codeBlocks = generator.makeAsciidocBlocks(languages)
-      expect(codeBlocks).toHaveLength 3 # Number of blocks
-      expect(codeBlocks[2]).toEqualJson
+      expect(codeBlocks).toHaveLength 2 # Number of blocks
+      expect(codeBlocks[1]).toEqualJson
         name: 'markup.raw.asciidoc'
         begin: '^(-{4,})\\s*$'
         beginCaptures:
@@ -72,7 +49,7 @@ describe 'Code block generator', ->
         pattern: 'javascript|js', type: 'source', code: 'js'
       ]
       codeBlocks = generator.makeAsciidocBlocks(languages)
-      expect(codeBlocks).toHaveLength 4 # Number of blocks
+      expect(codeBlocks).toHaveLength 3 # Number of blocks
       expect(codeBlocks[0]).toEqualJson
         begin: '^\\[(source),\\p{Blank}*(?i:(javascript|js))(?:,([^\]]*))?\\]$'
         beginCaptures:
@@ -106,7 +83,7 @@ describe 'Code block generator', ->
         pattern: 'c(pp|\\+\\+)', type: 'source', code: 'cpp'
       ]
       codeBlocks = generator.makeAsciidocBlocks(languages)
-      expect(codeBlocks).toHaveLength 4 # Number of blocks
+      expect(codeBlocks).toHaveLength 3 # Number of blocks
       expect(codeBlocks[0]).toEqualJson
         begin: '^\\[(source),\\p{Blank}*(?i:(c(pp|\\+\\+)))(?:,([^\]]*))?\\]$'
         beginCaptures:

From 37e1597df95563c7e2a2a579f5d8ae5bda843e4f Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ludovic.fernandez@zenika.com>
Date: Sun, 15 May 2016 13:56:42 +0200
Subject: [PATCH 3/3] refactor: ordering patterms

---
 grammars/language-asciidoc.cson               | 359 +++++++++---------
 .../partials/explicit-paragraph-grammar.cson  |   2 +-
 lib/code-block-generator.coffee               |   8 +-
 3 files changed, 183 insertions(+), 186 deletions(-)

diff --git a/grammars/language-asciidoc.cson b/grammars/language-asciidoc.cson
index f1a65ef..76cddd5 100644
--- a/grammars/language-asciidoc.cson
+++ b/grammars/language-asciidoc.cson
@@ -227,10 +227,7 @@ repository:
     patterns: [
       {
         name: "markup.explicit.asciidoc"
-        match: '''
-          ^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!
-          ---)
-        '''
+        match: "^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!\\n---)"
         captures:
           "1":
             name: "entity.name.function.asciidoc"
@@ -2659,7 +2656,6 @@ repository:
             name: "entity.name.function.asciidoc"
           "2":
             name: "markup.meta.attribute-list.asciidoc"
-        end: "(?<=----)[\\r\\n]+$"
         patterns: [
           {
             name: "markup.raw.asciidoc"
@@ -2678,6 +2674,7 @@ repository:
                 name: "support.asciidoc"
           }
         ]
+        end: "(?<=----)[\\r\\n]+$"
       }
       {
         name: "markup.raw.asciidoc"
@@ -2704,10 +2701,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.c"
         patterns: [
           {
@@ -2717,6 +2710,10 @@ repository:
             include: "source.c"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.clojure.asciidoc"
@@ -2724,10 +2721,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.clojure"
         patterns: [
           {
@@ -2737,6 +2730,10 @@ repository:
             include: "source.clojure"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.coffee.asciidoc"
@@ -2744,10 +2741,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.coffee"
         patterns: [
           {
@@ -2757,6 +2750,10 @@ repository:
             include: "source.coffee"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.cpp.asciidoc"
@@ -2764,10 +2761,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.cpp"
         patterns: [
           {
@@ -2777,6 +2770,10 @@ repository:
             include: "source.cpp"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.css.asciidoc"
@@ -2784,10 +2781,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.css"
         patterns: [
           {
@@ -2797,6 +2790,10 @@ repository:
             include: "source.css"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.cs.asciidoc"
@@ -2804,10 +2801,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.cs"
         patterns: [
           {
@@ -2817,6 +2810,10 @@ repository:
             include: "source.cs"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.diff.asciidoc"
@@ -2824,10 +2821,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.diff"
         patterns: [
           {
@@ -2837,6 +2830,10 @@ repository:
             include: "source.diff"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.dockerfile.asciidoc"
@@ -2844,10 +2841,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.dockerfile"
         patterns: [
           {
@@ -2857,6 +2850,10 @@ repository:
             include: "source.dockerfile"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.elixir.asciidoc"
@@ -2864,10 +2861,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.elixir"
         patterns: [
           {
@@ -2877,6 +2870,10 @@ repository:
             include: "source.elixir"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.elm.asciidoc"
@@ -2884,10 +2881,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.elm"
         patterns: [
           {
@@ -2897,6 +2890,10 @@ repository:
             include: "source.elm"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.erlang.asciidoc"
@@ -2904,10 +2901,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.erlang"
         patterns: [
           {
@@ -2917,6 +2910,10 @@ repository:
             include: "source.erlang"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.go.asciidoc"
@@ -2924,10 +2921,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.go"
         patterns: [
           {
@@ -2937,6 +2930,10 @@ repository:
             include: "source.go"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.groovy.asciidoc"
@@ -2944,10 +2941,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.groovy"
         patterns: [
           {
@@ -2957,6 +2950,10 @@ repository:
             include: "source.groovy"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.haskell.asciidoc"
@@ -2964,10 +2961,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.haskell"
         patterns: [
           {
@@ -2977,6 +2970,10 @@ repository:
             include: "source.haskell"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.html.basic.asciidoc"
@@ -2984,10 +2981,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "text.embedded.html.basic"
         patterns: [
           {
@@ -2997,6 +2990,10 @@ repository:
             include: "text.html.basic"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.java.asciidoc"
@@ -3004,10 +3001,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.java"
         patterns: [
           {
@@ -3017,6 +3010,10 @@ repository:
             include: "source.java"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.js.asciidoc"
@@ -3024,10 +3021,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.js"
         patterns: [
           {
@@ -3037,6 +3030,10 @@ repository:
             include: "source.js"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.json.asciidoc"
@@ -3044,10 +3041,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.json"
         patterns: [
           {
@@ -3057,6 +3050,10 @@ repository:
             include: "source.json"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.js.jsx.asciidoc"
@@ -3064,10 +3061,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.js.jsx"
         patterns: [
           {
@@ -3077,6 +3070,10 @@ repository:
             include: "source.js.jsx"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.julia.asciidoc"
@@ -3084,10 +3081,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.julia"
         patterns: [
           {
@@ -3097,6 +3090,10 @@ repository:
             include: "source.julia"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.css.less.asciidoc"
@@ -3104,10 +3101,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.css.less"
         patterns: [
           {
@@ -3117,6 +3110,10 @@ repository:
             include: "source.css.less"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.makefile.asciidoc"
@@ -3124,10 +3121,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.makefile"
         patterns: [
           {
@@ -3137,6 +3130,10 @@ repository:
             include: "source.makefile"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.gfm.asciidoc"
@@ -3144,10 +3141,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.gfm"
         patterns: [
           {
@@ -3157,6 +3150,10 @@ repository:
             include: "source.gfm"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.html.mustache.asciidoc"
@@ -3164,10 +3161,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "text.embedded.html.mustache"
         patterns: [
           {
@@ -3177,6 +3170,10 @@ repository:
             include: "text.html.mustache"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.objc.asciidoc"
@@ -3184,10 +3181,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.objc"
         patterns: [
           {
@@ -3197,6 +3190,10 @@ repository:
             include: "source.objc"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.ocaml.asciidoc"
@@ -3204,10 +3201,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.ocaml"
         patterns: [
           {
@@ -3217,6 +3210,10 @@ repository:
             include: "source.ocaml"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.perl.asciidoc"
@@ -3224,10 +3221,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.perl"
         patterns: [
           {
@@ -3237,6 +3230,10 @@ repository:
             include: "source.perl"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.perl6.asciidoc"
@@ -3244,10 +3241,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.perl6"
         patterns: [
           {
@@ -3257,6 +3250,10 @@ repository:
             include: "source.perl6"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.html.php.asciidoc"
@@ -3264,10 +3261,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "text.embedded.html.php"
         patterns: [
           {
@@ -3277,6 +3270,10 @@ repository:
             include: "text.html.php"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.asciidoc.properties.asciidoc"
@@ -3284,10 +3281,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.asciidoc.properties"
         patterns: [
           {
@@ -3297,6 +3290,10 @@ repository:
             include: "source.asciidoc.properties"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.python.asciidoc"
@@ -3304,10 +3301,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.python"
         patterns: [
           {
@@ -3317,6 +3310,10 @@ repository:
             include: "source.python"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.r.asciidoc"
@@ -3324,10 +3321,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.r"
         patterns: [
           {
@@ -3337,6 +3330,10 @@ repository:
             include: "source.r"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.ruby.asciidoc"
@@ -3344,10 +3341,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.ruby"
         patterns: [
           {
@@ -3357,6 +3350,10 @@ repository:
             include: "source.ruby"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.rust.asciidoc"
@@ -3364,10 +3361,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.rust"
         patterns: [
           {
@@ -3377,6 +3370,10 @@ repository:
             include: "source.rust"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.sass.asciidoc"
@@ -3384,10 +3381,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.sass"
         patterns: [
           {
@@ -3397,6 +3390,10 @@ repository:
             include: "source.sass"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.scala.asciidoc"
@@ -3404,10 +3401,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.scala"
         patterns: [
           {
@@ -3417,6 +3410,10 @@ repository:
             include: "source.scala"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.css.scss.asciidoc"
@@ -3424,10 +3421,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.css.scss"
         patterns: [
           {
@@ -3437,6 +3430,10 @@ repository:
             include: "source.css.scss"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.shell.asciidoc"
@@ -3444,10 +3441,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.shell"
         patterns: [
           {
@@ -3457,6 +3450,10 @@ repository:
             include: "source.shell"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.sql.asciidoc"
@@ -3464,10 +3461,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.sql"
         patterns: [
           {
@@ -3477,6 +3470,10 @@ repository:
             include: "source.sql"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.swift.asciidoc"
@@ -3484,10 +3481,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.swift"
         patterns: [
           {
@@ -3497,6 +3490,10 @@ repository:
             include: "source.swift"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.toml.asciidoc"
@@ -3504,10 +3501,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.toml"
         patterns: [
           {
@@ -3517,6 +3510,10 @@ repository:
             include: "source.toml"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.ts.asciidoc"
@@ -3524,10 +3521,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.ts"
         patterns: [
           {
@@ -3537,6 +3530,10 @@ repository:
             include: "source.ts"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.xml.asciidoc"
@@ -3544,10 +3541,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "text.embedded.xml"
         patterns: [
           {
@@ -3557,6 +3550,10 @@ repository:
             include: "text.xml"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.code.yaml.asciidoc"
@@ -3564,10 +3561,6 @@ repository:
         beginCaptures:
           "0":
             name: "support.asciidoc"
-        end: "^\\s*\\1\\s*$"
-        endCaptures:
-          "0":
-            name: "support.asciidoc"
         contentName: "source.embedded.yaml"
         patterns: [
           {
@@ -3577,6 +3570,10 @@ repository:
             include: "source.yaml"
           }
         ]
+        end: "^\\s*\\1\\s*$"
+        endCaptures:
+          "0":
+            name: "support.asciidoc"
       }
       {
         name: "markup.raw.asciidoc"
diff --git a/grammars/repositories/partials/explicit-paragraph-grammar.cson b/grammars/repositories/partials/explicit-paragraph-grammar.cson
index 9d0430b..36fbf84 100644
--- a/grammars/repositories/partials/explicit-paragraph-grammar.cson
+++ b/grammars/repositories/partials/explicit-paragraph-grammar.cson
@@ -10,7 +10,7 @@ patterns: [
   #   This is a normal paragraph.
   #
   name: 'markup.explicit.asciidoc'
-  match: '^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!\n---)'
+  match: '^\\[((normal|literal|listing|TIP|NOTE|IMPORTANT|WARNING|CAUTION|partintro|comment|example|sidebar|source|music|latex|graphviz))\\]$(?<!\\n---)'
   captures:
     1: name: 'entity.name.function.asciidoc'
 ]
diff --git a/lib/code-block-generator.coffee b/lib/code-block-generator.coffee
index f0cedcc..5fc3da9 100644
--- a/lib/code-block-generator.coffee
+++ b/lib/code-block-generator.coffee
@@ -38,7 +38,6 @@ module.exports =
         0: name: 'support.asciidoc'
         1: name: 'entity.name.function.asciidoc'
         2: name: 'markup.meta.attribute-list.asciidoc'
-      end: '(?<=----)[\\r\\n]+$'
       patterns: [
         name: 'markup.raw.asciidoc'
         begin: '^(-{4,})\\s*$'
@@ -51,6 +50,7 @@ module.exports =
         endCaptures:
           0: name: 'support.asciidoc'
       ]
+      end: '(?<=----)[\\r\\n]+$'
 
     # add listing block
     codeBlocks.push
@@ -75,15 +75,15 @@ module.exports =
       begin: "^\\s*(`{3,})\\s*(?i:(#{lang.pattern}))\\s*$"
       beginCaptures:
         0: name: 'support.asciidoc'
-      end: '^\\s*\\1\\s*$'
-      endCaptures:
-        0: name: 'support.asciidoc'
       contentName: "#{lang.type}.embedded.#{lang.code}"
       patterns: [
         include: '#block-callout'
       ,
         include: "#{lang.type}.#{lang.code}"
       ]
+      end: '^\\s*\\1\\s*$'
+      endCaptures:
+        0: name: 'support.asciidoc'
 
     # add generic block
     codeBlocks.push