miki-template 1.2.0 → 1.3.3

package/miki-template-extension/syntaxes/language-configuration.json

@@ -4,23 +4,111 @@
     "blockComment": ["{#", "#}"]
   },
   "brackets": [
-    ["{", "}"],
+    ["{%", "%}"],
+    ["{{", "}}"],
+    ["{#", "#}"],
+    ["<", ">"],
+    ["(", ")"],
     ["[", "]"],
-    ["(", ")"]
+    ["{", "}"]
   ],
   "autoClosingPairs": [
-    { "open": "{", "close": "}" },
-    { "open": "[", "close": "]" },
-    { "open": "(", "close": ")" },
-    { "open": "\"", "close": "\"", "notIn": ["string"] },
-    { "open": "'", "close": "'", "notIn": ["string", "comment"] }
+    {
+      "open": "{%",
+      "close": "%}"
+    },
+    {
+      "open": "{{",
+      "close": "}}"
+    },
+    {
+      "open": "{#",
+      "close": "#}"
+    },
+    {
+      "open": "<",
+      "close": ">",
+      "notIn": ["string", "comment"]
+    },
+    {
+      "open": "\"",
+      "close": "\"",
+      "notIn": [
+        "string"
+      ]
+    },
+    {
+      "open": "'",
+      "close": "'",
+      "notIn": [
+        "string",
+        "comment"
+      ]
+    },
+    {
+      "open": "(",
+      "close": ")"
+    },
+    {
+      "open": "[",
+      "close": "]"
+    },
+    {
+      "open": "{",
+      "close": "}"
+    }
   ],
   "surroundingPairs": [
-    { "open": "{", "close": "}" },
-    { "open": "[", "close": "]" },
-    { "open": "(", "close": ")" },
-    { "open": "\"", "close": "\"" },
-    { "open": "'", "close": "'" }
+    {
+      "open": "{%",
+      "close": "%}"
+    },
+    {
+      "open": "{{",
+      "close": "}}"
+    },
+    {
+      "open": "{#",
+      "close": "#}"
+    },
+    {
+      "open": "<",
+      "close": ">"
+    },
+    {
+      "open": "\"",
+      "close": "\""
+    },
+    {
+      "open": "'",
+      "close": "'"
+    },
+    {
+      "open": "(",
+      "close": ")"
+    },
+    {
+      "open": "[",
+      "close": "]"
+    },
+    {
+      "open": "{",
+      "close": "}"
+    }
   ],
-  "wordPattern": "[a-zA-Z_][a-zA-Z0-9_.]*"
+  "folding": {
+    "markers": {
+      "start": "{%\\s*(block|for|if|with|autoescape|spaceless|verbatim|comment|partialdef|cache|filter|blocktrans|regroup|language|addtoblock|style|script)\\b",
+      "end": "{%\\s*end(block|for|if|with|autoescape|spaceless|verbatim|comment|partialdef|endcache|endfilter|blocktrans|endblocktrans|endlanguage|endaddtoblock)|</(style|script)>"
+    }
+  },
+  "wordPattern": "[a-zA-Z_][a-zA-Z0-9_.]*",
+  "indentationRules": {
+    "increaseIndentPattern": "{%\\s*(block|for|if|with|autoescape|spaceless|verbatim|comment|partialdef|cache|filter|blocktrans|regroup|language|addtoblock)\\b[^}]*%}|(<(?!(area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)[^>]*>)[^>]*>)\\s*$",
+    "decreaseIndentPattern": "{%\\s*end(block|for|if|with|autoescape|spaceless|verbatim|comment|partialdef|endcache|endfilter|blocktrans|endblocktrans|endlanguage|endaddtoblock)\\b|</(html|head|body|div|section|article|aside|header|footer|nav|main|form|table|tr|td|th|tbody|thead|style|script)>"
+  },
+  "formatTabSize": 2,
+  "formatIndentSize": 2,
+  "formatOnSave": false,
+  "formatDefaultFormatter": "esbenp.prettier-vscode"
 }

package/miki-template-extension/syntaxes/miki-template.tmLanguage.json

@@ -1,146 +1,355 @@
 {
-  "scopeName": "text.html.miki",
+  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
   "name": "miki-template",
+  "scopeName": "text.html.miki",
+  "fileTypes": ["miki", "miki-template", "html", "django", "dj"],
+  "tokenColors": [
+    {
+      "name": "Template Tags",
+      "scope": ["entity.name.tag.django"],
+      "settings": {
+        "foreground": "#E8BF6A",
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "name": "Template Variables (block.super)",
+      "scope": ["variable.other.django"],
+      "settings": {
+        "foreground": "#9CDCFE"
+      }
+    },
+    {
+      "name": "Template Filter Functions",
+      "scope": ["support.function.django"],
+      "settings": {
+        "foreground": "#4EC9B0"
+      }
+    },
+    {
+      "name": "Template Strings",
+      "scope": ["string.quoted.double.django", "string.quoted.single.django"],
+      "settings": {
+        "foreground": "#CE9178"
+      }
+    },
+    {
+      "name": "Template Numbers",
+      "scope": ["constant.numeric.django"],
+      "settings": {
+        "foreground": "#B5CEA8"
+      }
+    },
+    {
+      "name": "Template Language Constants",
+      "scope": ["constant.language.django"],
+      "settings": {
+        "foreground": "#569CD6"
+      }
+    },
+    {
+      "name": "Template Operators",
+      "scope": ["keyword.operator.django"],
+      "settings": {
+        "foreground": "#D4D4D4",
+        "fontStyle": "bold"
+      }
+    },
+    {
+      "name": "Template Punctuation",
+      "scope": ["punctuation.separator.django", "punctuation.separator.key-value.django"],
+      "settings": {
+        "foreground": "#808080"
+      }
+    },
+    {
+      "name": "Template Comments",
+      "scope": ["comment.block.django"],
+      "settings": {
+        "foreground": "#6A9955",
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "name": "Template Filter Punctuation",
+      "scope": ["punctuation.separator.filter.django", "punctuation.separator.filter-argument.django"],
+      "settings": {
+        "foreground": "#C586C0"
+      }
+    },
+    {
+      "name": "Prettier Ignore",
+      "scope": ["meta.prettier-ignore.django", "meta.prettier-ignore-region.django"],
+      "settings": {
+        "foreground": "#FFDD00",
+        "fontStyle": "italic"
+      }
+    }
+  ],
   "patterns": [
     {
-      "include": "#comment"
+      "include": "#comments"
+    },
+    {
+      "include": "#prettier-ignore"
+    },
+    {
+      "include": "#prettier-ignore-region"
     },
     {
-      "include": "#tag"
+      "include": "#tag-block"
     },
     {
-      "include": "#variable"
+      "include": "#variable-block"
     },
     {
-      "include": "#string"
+      "include": "#embedded-html"
     }
   ],
   "repository": {
-    "comment": {
-      "name": "comment.block.miki",
-      "begin": "\\{#",
-      "end": "#\\}",
+    "comments": {
+      "patterns": [
+        {
+          "name": "comment.block.django",
+          "begin": "\\{#",
+          "end": "#\\}",
+          "beginCaptures": {
+            "0": { "name": "punctuation.definition.comment.begin.django" }
+          },
+          "endCaptures": {
+            "0": { "name": "punctuation.definition.comment.end.django" }
+          }
+        }
+      ]
+    },
+    "prettier-ignore": {
+      "name": "meta.prettier-ignore.django",
+      "match": "\\{#\\s*prettier-ignore\\s*#\\}",
+      "captures": {
+        "0": { "name": "comment.block.django" }
+      }
+    },
+    "prettier-ignore-region": {
+      "name": "meta.prettier-ignore-region.django",
+      "begin": "\\{#\\s*prettier-ignore-start\\s*#\\}",
+      "end": "\\{#\\s*prettier-ignore-end\\s*#\\}",
       "beginCaptures": {
-        "0": { "name": "punctuation.definition.comment.begin.miki" }
+        "0": { "name": "punctuation.definition.comment.begin.django" }
       },
       "endCaptures": {
-        "0": { "name": "punctuation.definition.comment.end.miki" }
+        "0": { "name": "punctuation.definition.comment.end.django" }
       }
     },
-    "tag": {
-      "name": "meta.tag.miki",
-      "begin": "\\{%",
-      "end": "%\\}",
+    "tag-block": {
+      "name": "meta.tag.django",
+      "begin": "(\\{%)(-?|\\s*)",
+      "end": "(-?\\s*%\\})",
       "beginCaptures": {
-        "0": { "name": "punctuation.definition.tag.begin.miki" }
+        "1": { "name": "punctuation.definition.tag.begin.django" }
       },
       "endCaptures": {
-        "0": { "name": "punctuation.definition.tag.end.miki" }
+        "1": { "name": "punctuation.definition.tag.end.django" }
       },
       "patterns": [
         {
-          "name": "entity.name.tag.miki",
-          "match": "(?i)\\b(if|elif|else|endif|for|empty|endfor|with|endwith|cycle|comment|endcomment|verbatim|endverbatim|include|extends|block|endblock|partialdef|endpartialdef|partial|load|templatetag|trans|blocktrans|language|endlanguage|plural|widthratio|debug|endif|endfor|endwith|endblock|endcomment|endverbatim|endpartialdef|endblocktrans|endlanguage|endcache|endmarkdown)\\b"
+          "name": "entity.name.tag.django",
+          "match": "(?i)\\b(if|elif|else|endif|for|empty|endfor|with|endwith|cycle|firstof|comment|endcomment|verbatim|endverbatim|include|extends|block|endblock|block.super|partialdef|endpartialdef|partial|load|splural|autoescape|autoescapeoff|endautoescape|filter|endfilter|spaceless|endspaceless|templatetag|endtemplatetag|trans|blocktrans|endblocktrans|language|endlanguage|plural|regroup|widthratio|debug|csrf_token|csp_nonce_attr|static|url|addtoblock|endaddtoblock)\\b"
+        },
+        {
+          "name": "variable.other.django",
+          "match": "[a-zA-Z_][a-zA-Z0-9_.]*"
         },
         {
-          "name": "string.quoted.double.miki",
+          "name": "string.quoted.double.django",
           "match": "\"[^\"]*\""
         },
         {
-          "name": "string.quoted.single.miki",
+          "name": "string.quoted.single.django",
           "match": "'[^']*'"
         },
         {
-          "name": "constant.numeric.miki",
-          "match": "\\b\\d+\\b"
+          "name": "constant.numeric.django",
+          "match": "\\b\\d+\\.?\\d*\\b"
         },
         {
-          "name": "keyword.operator.miki",
+          "name": "constant.language.django",
+          "match": "\\b(true|false|null|undefined)\\b"
+        },
+        {
+          "name": "keyword.operator.django",
           "match": "(?i)\\b(and|or|not|in|not in)\\b"
         },
         {
-          "name": "punctuation.separator.miki",
+          "name": "punctuation.separator.django",
           "match": "="
+        },
+        {
+          "name": "punctuation.separator.key-value.django",
+          "match": "\\b(as)\\b"
         }
       ]
     },
-    "variable": {
-      "name": "variable.other.miki",
-      "begin": "\\{\\{",
-      "end": "\\}\\}",
+    "variable-block": {
+      "name": "meta.variable.django",
+      "begin": "(\\{\\{)(-?|\\s*)",
+      "end": "(-?\\s*\\}\\})",
       "beginCaptures": {
-        "0": { "name": "punctuation.definition.variable.begin.miki" }
+        "1": { "name": "punctuation.definition.variable.begin.django" }
       },
       "endCaptures": {
-        "0": { "name": "punctuation.definition.variable.end.miki" }
+        "1": { "name": "punctuation.definition.variable.end.django" }
       },
       "patterns": [
         {
-          "name": "variable.other.miki",
-          "match": "[a-zA-Z_][a-zA-Z0-9_.]*"
+          "include": "#django-variables"
         },
         {
-          "include": "#filter"
+          "include": "#filters"
+        }
+      ]
+    },
+    "django-variables": {
+      "patterns": [
+        {
+          "name": "variable.other.django",
+          "match": "[a-zA-Z_][a-zA-Z0-9_.]*"
         },
         {
-          "name": "string.quoted.double.miki",
+          "name": "string.quoted.double.django",
           "match": "\"[^\"]*\""
         },
         {
-          "name": "string.quoted.single.miki",
+          "name": "string.quoted.single.django",
           "match": "'[^']*'"
+        },
+        {
+          "name": "constant.numeric.django",
+          "match": "\\b\\d+\\.?\\d*\\b"
         }
       ]
     },
-    "filter": {
-      "name": "meta.filter.miki",
-      "begin": "\\|",
-      "end": "(?=\\}|$)",
+    "filters": {
+      "name": "meta.filter.django",
+      "begin": "(\\|)",
+      "end": "(\\}\\}|\\|$)",
       "beginCaptures": {
-        "0": { "name": "punctuation.separator.filter.miki" }
+        "1": { "name": "punctuation.separator.filter.django" }
+      },
+      "endCaptures": {
+        "1": { "name": "punctuation.separator.filter.django" }
       },
       "patterns": [
         {
-          "name": "support.function.miki",
-          "match": "[a-zA-Z_][a-zA-Z0-9_]*"
+          "name": "support.function.django",
+          "match": "(?i)\\b(upper|lower|title|capfirst|slugify|wordcount|striptags|truncatewords|truncatechars|truncatewords_html|truncatechars_html|linebreaks|linebreaksbr|cut|addslashes|removetags|safe|escape|escapejs|urlencode|escapeuri|urlize|stringformat|center|ljust|rjust|length|length_is|join|slice|first|last|dictsort|dictsortreversed|default|default_if_none|firstof|date|time|strftime|date_format|timesince|timeuntil|add|addtoblock|divisibleby|floatformat|yesno|pluralize|pluralize_either|filesizeformat|trans|regroup|intcomma|intword|apnumber|ordinal|naturalday|ordinal|lorem|get_digit|phone2numeric|pprint|make_list|unordered_list|json_script|json_script_filter|urt|datetime|field_class|strip|force_escape|linebreak_filter|truncatewords_filter|truncatechars_filter|safeseq|unordered_list|random|filesizeformat_pprint)\\b"
         },
         {
-          "begin": ":",
+          "name": "punctuation.separator.filter-argument.django",
+          "begin": "(:)",
+          "end": "(?=\\||\\}\\})",
           "beginCaptures": {
-            "0": { "name": "punctuation.separator.filter.argument.miki" }
+            "1": { "name": "punctuation.separator.filter.argument.django" }
           },
-          "end": "(?=\\||\\}\\})",
           "patterns": [
             {
-              "name": "string.quoted.double.miki",
+              "name": "string.quoted.double.django",
               "match": "\"[^\"]*\""
             },
             {
-              "name": "string.quoted.single.miki",
+              "name": "string.quoted.single.django",
               "match": "'[^']*'"
             },
             {
-              "name": "constant.numeric.miki",
-              "match": "\\b\\d+\\b"
+              "name": "constant.numeric.django",
+              "match": "\\b\\d+\\.?\\d*\\b"
             },
             {
-              "name": "variable.other.miki",
+              "name": "variable.other.django",
               "match": "[a-zA-Z_][a-zA-Z0-9_.]*"
             }
           ]
         }
       ]
     },
-    "string": {
-      "name": "string.quoted.double.miki",
-      "begin": "\"",
-      "end": "\"",
-      "beginCaptures": {
-        "0": { "name": "punctuation.definition.string.begin.miki" }
-      },
-      "endCaptures": {
-        "0": { "name": "punctuation.definition.string.end.miki" }
-      }
+    "embedded-html": {
+      "patterns": [
+        {
+          "name": "meta.tag.any.html",
+          "begin": "(<)(style)\\b(?=[^>]*>)",
+          "end": "(</)(style)(>)",
+          "beginCaptures": {
+            "1": { "name": "punctuation.definition.tag.begin.html" },
+            "2": { "name": "entity.name.tag.style.html" }
+          },
+          "endCaptures": {
+            "1": { "name": "punctuation.definition.tag.begin.html" },
+            "2": { "name": "entity.name.tag.style.html" },
+            "3": { "name": "punctuation.definition.tag.end.html" }
+          },
+          "patterns": [
+            {
+              "include": "source.css"
+            }
+          ]
+        },
+        {
+          "name": "meta.tag.any.html",
+          "begin": "(<)(script)\\b(?=[^>]*>)",
+          "end": "(</)(script)(>)",
+          "beginCaptures": {
+            "1": { "name": "punctuation.definition.tag.begin.html" },
+            "2": { "name": "entity.name.tag.script.html" }
+          },
+          "endCaptures": {
+            "1": { "name": "punctuation.definition.tag.begin.html" },
+            "2": { "name": "entity.name.tag.script.html" },
+            "3": { "name": "punctuation.definition.tag.end.html" }
+          },
+          "patterns": [
+            {
+              "include": "source.js"
+            }
+          ]
+        },
+        {
+          "name": "text.html.basic",
+          "begin": "(<)(?![\\?%])",
+          "end": "(>)",
+          "beginCaptures": {
+            "1": { "name": "punctuation.definition.tag.begin.html" }
+          },
+          "endCaptures": {
+            "1": { "name": "punctuation.definition.tag.end.html" }
+          },
+          "patterns": [
+            {
+              "name": "entity.name.tag.html",
+              "match": "\\/?([a-zA-Z][a-zA-Z0-9:-]*)\\/?"
+            },
+            {
+              "name": "meta.attribute.html",
+              "begin": "\\b([a-zA-Z:-]+)(?=\\s*=)",
+              "beginCaptures": {
+                "1": { "name": "entity.other.attribute-name.html" }
+              },
+              "patterns": [
+                {
+                  "name": "string.quoted.double.html",
+                  "match": "\"([^\"]*)\""
+                },
+                {
+                  "name": "string.quoted.single.html",
+                  "match": "'([^']*)'"
+                },
+                {
+                  "name": "string.unquoted.html",
+                  "match": "[^\\s>]+"
+                }
+              ]
+            }
+          ]
+        }
+      ]
     }
   }
 }