copy

Author: jkmnt

README.md

@@ -14,17 +14,6 @@ specific function (or method) call:
 
 This function may be a noop like the Python's `typing.cast()`. Perhaps it could do something useful, e.g. trimming whitespaces or logging.
 
-```python
-def html(s: str):
-    return s.trim()
-```
-
-```python
-def sql(s: str):
-    logging.info(s)
-    return s
-```
-
 If the string is the template (f-string), the internal f-expressions will be syntax highlighted too.
 
 ## Sample
@@ -34,7 +23,25 @@ If the string is the template (f-string), the internal f-expressions will be syn
 This sample shows the well-typed server-side Dialog component with
 bootsrap styling, htmx magic, and text escaping.
 
-## Note
+## Configuration
+
+The trigger functions names may be configured to suit your project.
+Navigate to **Highlight f-strings** settings in VSCode or edit the settings.json:
+
+```jsonc
+"python-fstring-dsl.grammar.triggers": {
+    "html": "html|template\\.render", // html or template.render
+    "css": "css_\\d", // css_0, css_1, etc
+    "sql": false // disable the sql
+    // js is not defined, use the default
+}
+```
+
+The values are regexps. They are inlined inside the larger regexps so don't use capturing groups.
+
+The changes are not applied automatically. Run _(Ctrl-Shift-P)_ **Highlight f-string: Generate grammar** command to apply changes. This action will regenerate the internal grammar file of extension and reload VSCode.
+
+## More
 
 - The syntax matching is naive. It will work only for the simple common cases. If something don't color the way it should, the best workaround will be the template simplification.
 

package.json

@@ -91,10 +91,10 @@
                     "default": {
                         "sql": "sql",
                         "html": "html|hitml\\.m|hitml\\.markup|hitml\\.document|ht\\.m|ht\\.markup|ht\\.document",
-                        "css": "css|hitml\\.css|ht\\.css",
-                        "js": "js|hitml\\.js|ht\\.js"
+                        "css": "css|hitml\\.style|hitml\\.stylesheet|ht\\.style|ht\\.stylesheet",
+                        "js": "js|hitml\\.handler|hitml\\.script|ht\\.handler|ht\\.script"
                     },
-                    "markdownDescription": "Function names (regex) to trigger the syntax highlight.\nOnly `html`, `sql`, `css`, `js` are supported.\n\nE.g.: `{\"html\":\"html|template[.]render\", \"css\":\"minify_css\", \"sql\":false}`\n\nRun **Highlight f-string: Generate grammar** command to apply changes."
+                    "markdownDescription": "Function names (regex) to trigger the syntax highlight.\nOnly `html`, `sql`, `css`, `js` are supported.\n\nE.g.: `{\"html\":\"html|template\\.render\", \"css\":\"minify_css\", \"sql\":false}`\n\nRun **Highlight f-string: Generate grammar** command to apply changes."
                 }
             }
         }

src/gen_grammar.ts

@@ -17,12 +17,12 @@ export const DEF_SPECS: Spec[] = [
   },
   {
     lang: "css",
-    trigger: "css|hitml\\.css|ht\\.css",
+    trigger: "css|hitml\\.style|hitml\\.stylesheet|ht\\.style|ht\\.stylesheet",
     source: "source.css",
   },
   {
     lang: "js",
-    trigger: "js|hitml\\.js|ht\\.js",
+    trigger: "js|hitml\\.handler|hitml\\.script|ht\\.handler|ht\\.script",
     source: "source.js",
   },
 ];

syntaxes/embed-in-python.json

@@ -161,7 +161,7 @@
             ]
         },
         {
-            "begin": "(?x)\n                (?<!def\\s+)\n                \\b\n                (css|hitml\\.css|ht\\.css)\n                \\s*\n                (\\()",
+            "begin": "(?x)\n                (?<!def\\s+)\n                \\b\n                (css|hitml\\.style|hitml\\.stylesheet|ht\\.style|ht\\.stylesheet)\n                \\s*\n                (\\()",
             "end": "(?x)\n                (\\))\n                ",
             "name": "meta.function-call.python",
             "contentName": "meta.function-call.arguments.python",
@@ -239,7 +239,7 @@
             ]
         },
         {
-            "begin": "(?x)\n                (?<!def\\s+)\n                \\b\n                (js|hitml\\.js|ht\\.js)\n                \\s*\n                (\\()",
+            "begin": "(?x)\n                (?<!def\\s+)\n                \\b\n                (js|hitml\\.handler|hitml\\.script|ht\\.handler|ht\\.script)\n                \\s*\n                (\\()",
             "end": "(?x)\n                (\\))\n                ",
             "name": "meta.function-call.python",
             "contentName": "meta.function-call.arguments.python",