Merge pull request #20 from 1Kinoti/main

add support for table annotations

grammar.js

@@ -14,8 +14,7 @@ module.exports = grammar({
  $._declaration,
  // NOTE:
  // in a script, this is not a legal top level item, this is
- // only here to cover `config.nu` and `env.nu` which are what
- // this parser will mostly be used for i think
+ // only here to cover `config.nu` and `env.nu`
  prec(-1, $._statement),
  ))
  ),
@@ -155,7 +154,7 @@ module.exports = grammar({
  PUNC().colon,
  field("type", choice(
  $.list_type,
- $.record_type,
+ $.collection_type,
  $.flat_type,
  )),
  field("completion", optional($.param_cmd)),
@@ -168,14 +167,14 @@ module.exports = grammar({
 
  flat_type: $ => field("flat_type", FLAT_TYPES()),
 
- record_type: $ => {
+ collection_type: $ => {
  const key = field("key", choice(
  $.identifier,
  alias($.val_string, $.identifier),
  ));
 
  return seq(
- "record",
+ choice("record", "table"),
  seq(
  token.immediate(BRACK().open_angle),
  repeat(seq(

queries/highlights.scm

@@ -281,8 +281,8 @@
  "list" @type.enum
  ["<" ">"] @punctuation.bracket
 )
-(record_type
- "record" @type.enum
+(collection_type
+ ["record" "table"] @type.enum
  "<" @punctuation.bracket
  key: (_) @variable.parameter 
  ["," ":"] @punctuation.delimiter

src/grammar.json

@@ -48,7 +48,7 @@
  },
  {
  "type": "PATTERN",
- "value": ".*"
+ "value": ".*\\n"
  }
  ]
  },
@@ -677,7 +677,7 @@
  },
  {
  "type": "SYMBOL",
- "name": "record_type"
+ "name": "collection_type"
  },
  {
  "type": "SYMBOL",
@@ -874,12 +874,21 @@
  ]
  }
  },
- "record_type": {
+ "collection_type": {
  "type": "SEQ",
  "members": [
  {
- "type": "STRING",
- "value": "record"
+ "type": "CHOICE",
+ "members": [
+ {
+ "type": "STRING",
+ "value": "record"
+ },
+ {
+ "type": "STRING",
+ "value": "table"
+ }
+ ]
  },
  {
  "type": "SEQ",

src/node-types.json

@@ -472,6 +472,32 @@
  }
  }
  },
+ {
+ "type": "collection_type",
+ "named": true,
+ "fields": {
+ "key": {
+ "multiple": true,
+ "required": false,
+ "types": [
+ {
+ "type": "identifier",
+ "named": true
+ }
+ ]
+ }
+ },
+ "children": {
+ "multiple": true,
+ "required": false,
+ "types": [
+ {
+ "type": "flat_type",
+ "named": true
+ }
+ ]
+ }
+ },
  {
  "type": "command",
  "named": true,
@@ -2959,15 +2985,15 @@
  "required": true,
  "types": [
  {
- "type": "flat_type",
+ "type": "collection_type",
  "named": true
  },
  {
- "type": "list_type",
+ "type": "flat_type",
  "named": true
  },
  {
- "type": "record_type",
+ "type": "list_type",
  "named": true
  }
  ]
@@ -3470,32 +3496,6 @@
  }
  }
  },
- {
- "type": "record_type",
- "named": true,
- "fields": {
- "key": {
- "multiple": true,
- "required": false,
- "types": [
- {
- "type": "identifier",
- "named": true
- }
- ]
- }
- },
- "children": {
- "multiple": true,
- "required": false,
- "types": [
- {
- "type": "flat_type",
- "named": true
- }
- ]
- }
- },
  {
  "type": "redirection",
  "named": true,