support nested functions and a few fixes

Changes

3 changed files (+17/-3)

• grammar.js
  • @@ -635,13 +635,22 @@ repeat(seq(',', $.assignment)),
    ';' ), + local_function_declaration: $ => seq( + $.type, + $.symbol, + '(', + optional(seq($.parameter, repeat(seq(',', $.parameter)))), + ')', + $.block + ), + assignment: $ => seq( $.identifier, optional($.inline_array_type), optional(seq('=', $._expression)) ), - block: $ => seq('{', repeat(choice($._statement, $.local_declaration)), '}'), + block: $ => seq('{', repeat(choice($._statement, $.local_declaration, $.local_function_declaration)), '}'), _statement: $ => choice( $.if_statement,
• queries/highlights.scm
  • @@ -6,6 +6,8 @@ (unqualified_type) @type
    (attribute) @attribute (method_declaration (symbol (symbol) @type (identifier) @function.method)) (method_declaration (symbol (identifier) @function.method)) + (local_function_declaration (symbol (symbol) @type (identifier) @function)) + (local_function_declaration (symbol (identifier) @function)) (destructor_declaration (identifier) @function) (creation_method_declaration (symbol (symbol) @type (identifier) @constructor)) (creation_method_declaration (symbol (identifier) @constructor))
• queries/locals.scm
  • @@ -2,10 +2,13 @@ ; locals.scm
    [ (method_declaration) + (local_function_declaration) + (signal_declaration) (block) ] @local.scope (parameter (identifier) @local.definition) - (assignment (identifier) @local.definition) + (local_declaration (assignment (identifier) @local.definition)) + (local_function_declaration (symbol (identifier) @local.definition)) - (identifier) @local.reference + (member_access_expression . (identifier) @local.reference)