highlight string formatters and other fixes - also allow attributes on errordomain methods

Changes

2 changed files (+9/-3)

• grammar.js
  • @@ -231,10 +231,15 @@ integer: $ => choice(/[1-9]\d*|0[0-7]*/, /0[xX][A-Fa-f0-9]+/),
    null: $ => 'null', real: $ => /\d+(\.\d+)?([eE][+-]?\d+)?/, regex: $ => /\/([^\\\/\n]|\\[\\\/A-z0|\[\]^$?.(){}+\-*])+\/[gmxsu]*/, - string: $ => /"([^"]+|\\")*"/, + string: $ => seq( + '"', + repeat(choice(/([^"%]+|\\")/, $.string_formatter, /%[^$#0\- +'I\d.hlqLjzZtdiouxXeEfFgGaAcsCSpnm%]/)), + '"' + ), + string_formatter: $ => /%\$?[#0\- +'I]?\d*(\.\d+)?(hh?|ll?|q|L|j|z|Z|t)?[diouxXeEfFgGaAcsCSpnm%]/, template_string: $ => seq( '@"', - repeat(choice(/([^$"]+|\\")+/, $.template_string_expression)), + repeat(choice(/([^$"]+|\\")+/, $.template_string_expression, '$$')), '"' ), template_string_expression: $ => choice(
  • @@ -448,7 +453,7 @@ $.errorcode,
    repeat(seq(',', $.errorcode)), optional(choice( ',', // support trailing ',' - seq(';', repeat($.method_declaration)) + seq(';', repeat(seq(repeat($.attribute), $.method_declaration))) )), '}' ),
• queries/highlights.scm
  • @@ -26,6 +26,7 @@ (null) @constant.builtin
    (real) @number (regex) @constant (string) @string + (string_formatter) @string.special (template_string) @string (template_string_expression) @string.special (verbatim_string) @string