difftreelog
feat(rowan) alternative object comp syntax
in: master
10 files changed
crates/jrsonnet-formatter/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-formatter/src/lib.rs
+++ b/crates/jrsonnet-formatter/src/lib.rs
@@ -13,9 +13,9 @@
AstNode, AstToken as _, SyntaxToken,
nodes::{
Arg, ArgsDesc, Assertion, BinaryOperator, Bind, CompSpec, Destruct, DestructArrayPart,
- DestructRest, Expr, ExprArray, ExprBase, FieldName, ForSpec, IfSpec, ImportKind, Literal,
- Member, Name, Number, ObjBody, ObjLocal, ParamsDesc, SliceDesc, SourceFile, Stmt, Suffix,
- Text, TextKind, UnaryOperator, Visibility,
+ DestructRest, Expr, ExprArray, ExprBase, FieldName, ForObjSpec, ForSpec, IfSpec,
+ ImportKind, Literal, Member, Name, Number, ObjBody, ObjLocal, ParamsDesc, SliceDesc,
+ SourceFile, Stmt, Suffix, Text, TextKind, UnaryOperator, Visibility,
},
};
@@ -645,6 +645,11 @@
p!(out, str("for ") {self.bind()} str(" in ") {self.expr()});
}
}
+impl Printable for ForObjSpec {
+ fn print(&self, out: &mut PrintItems) {
+ p!(out, str("for [") {self.key()} str("]") {self.visibility()} str(" ") {self.value()} str(" in ") {self.expr()});
+ }
+}
impl Printable for IfSpec {
fn print(&self, out: &mut PrintItems) {
p!(out, str("if ") {self.expr()});
@@ -654,6 +659,7 @@
fn print(&self, out: &mut PrintItems) {
match self {
Self::ForSpec(f) => f.print(out),
+ Self::ForObjSpec(f) => f.print(out),
Self::IfSpec(i) => i.print(out),
}
}
crates/jrsonnet-rowan-parser/jsonnet.ungramdiffbeforeafterboth--- a/crates/jrsonnet-rowan-parser/jsonnet.ungram
+++ b/crates/jrsonnet-rowan-parser/jsonnet.ungram
@@ -246,11 +246,21 @@
bind:Destruct
'in'
Expr
+ForObjSpec =
+ 'for'
+ '['
+ key:Name
+ ']'
+ Visibility
+ value:Destruct
+ 'in'
+ Expr
IfSpec =
'if'
Expr
CompSpec =
ForSpec
+| ForObjSpec
| IfSpec
BindDestruct =
crates/jrsonnet-rowan-parser/src/generated/nodes.rsdiffbeforeafterboth--- a/crates/jrsonnet-rowan-parser/src/generated/nodes.rs
+++ b/crates/jrsonnet-rowan-parser/src/generated/nodes.rs
@@ -650,6 +650,37 @@
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ForObjSpec {
+ pub(crate) syntax: SyntaxNode,
+}
+impl ForObjSpec {
+ pub fn for_kw_token(&self) -> Option<SyntaxToken> {
+ support::token(&self.syntax, T![for])
+ }
+ pub fn l_brack_token(&self) -> Option<SyntaxToken> {
+ support::token(&self.syntax, T!['['])
+ }
+ pub fn key(&self) -> Option<Name> {
+ support::children(&self.syntax).next()
+ }
+ pub fn r_brack_token(&self) -> Option<SyntaxToken> {
+ support::token(&self.syntax, T![']'])
+ }
+ pub fn visibility(&self) -> Option<Visibility> {
+ support::children(&self.syntax).next()
+ }
+ pub fn value(&self) -> Option<Destruct> {
+ support::children(&self.syntax).next()
+ }
+ pub fn in_kw_token(&self) -> Option<SyntaxToken> {
+ support::token(&self.syntax, T![in])
+ }
+ pub fn expr(&self) -> Option<Expr> {
+ support::children(&self.syntax).next()
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct IfSpec {
pub(crate) syntax: SyntaxNode,
}
@@ -845,6 +876,7 @@
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum CompSpec {
ForSpec(ForSpec),
+ ForObjSpec(ForObjSpec),
IfSpec(IfSpec),
}
@@ -1702,6 +1734,21 @@
&self.syntax
}
}
+impl AstNode for ForObjSpec {
+ fn can_cast(kind: SyntaxKind) -> bool {
+ kind == FOR_OBJ_SPEC
+ }
+ fn cast(syntax: SyntaxNode) -> Option<Self> {
+ if Self::can_cast(syntax.kind()) {
+ Some(Self { syntax })
+ } else {
+ None
+ }
+ }
+ fn syntax(&self) -> &SyntaxNode {
+ &self.syntax
+ }
+}
impl AstNode for IfSpec {
fn can_cast(kind: SyntaxKind) -> bool {
kind == IF_SPEC
@@ -2014,6 +2061,11 @@
CompSpec::ForSpec(node)
}
}
+impl From<ForObjSpec> for CompSpec {
+ fn from(node: ForObjSpec) -> CompSpec {
+ CompSpec::ForObjSpec(node)
+ }
+}
impl From<IfSpec> for CompSpec {
fn from(node: IfSpec) -> CompSpec {
CompSpec::IfSpec(node)
@@ -2022,13 +2074,14 @@
impl AstNode for CompSpec {
fn can_cast(kind: SyntaxKind) -> bool {
match kind {
- FOR_SPEC | IF_SPEC => true,
+ FOR_SPEC | FOR_OBJ_SPEC | IF_SPEC => true,
_ => false,
}
}
fn cast(syntax: SyntaxNode) -> Option<Self> {
let res = match syntax.kind() {
FOR_SPEC => CompSpec::ForSpec(ForSpec { syntax }),
+ FOR_OBJ_SPEC => CompSpec::ForObjSpec(ForObjSpec { syntax }),
IF_SPEC => CompSpec::IfSpec(IfSpec { syntax }),
_ => return None,
};
@@ -2037,6 +2090,7 @@
fn syntax(&self) -> &SyntaxNode {
match self {
CompSpec::ForSpec(it) => &it.syntax,
+ CompSpec::ForObjSpec(it) => &it.syntax,
CompSpec::IfSpec(it) => &it.syntax,
}
}
@@ -3016,6 +3070,11 @@
std::fmt::Display::fmt(self.syntax(), f)
}
}
+impl std::fmt::Display for ForObjSpec {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ std::fmt::Display::fmt(self.syntax(), f)
+ }
+}
impl std::fmt::Display for IfSpec {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
std::fmt::Display::fmt(self.syntax(), f)
crates/jrsonnet-rowan-parser/src/generated/syntax_kinds.rsdiffbeforeafterboth1//! This is a generated file, please do not edit manually. Changes can be2//! made in codegeneration that lives in `xtask` top-level dir.34#![allow(5 bad_style,6 missing_docs,7 unreachable_pub,8 clippy::manual_non_exhaustive,9 clippy::match_like_matches_macro10)]11#[doc = r" The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT`."]12#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]13#[repr(u16)]14pub enum SyntaxKind {15 #[doc(hidden)]16 TOMBSTONE,17 #[doc(hidden)]18 EOF,19 OR,20 NULL_COAELSE,21 AND,22 BIT_OR,23 BIT_XOR,24 BIT_AND,25 EQ,26 NE,27 LT,28 GT,29 LE,30 GE,31 LHS,32 RHS,33 PLUS,34 MINUS,35 MUL,36 DIV,37 MODULO,38 NOT,39 BIT_NOT,40 L_BRACK,41 R_BRACK,42 L_PAREN,43 R_PAREN,44 L_BRACE,45 R_BRACE,46 COLON,47 SEMI,48 DOT,49 DOTDOTDOT,50 COMMA,51 DOLLAR,52 ASSIGN,53 QUESTION_MARK,54 FLOAT,55 ERROR_FLOAT_JUNK_AFTER_POINT,56 ERROR_FLOAT_JUNK_AFTER_EXPONENT,57 ERROR_FLOAT_JUNK_AFTER_EXPONENT_SIGN,58 STRING_DOUBLE,59 ERROR_STRING_DOUBLE_UNTERMINATED,60 STRING_SINGLE,61 ERROR_STRING_SINGLE_UNTERMINATED,62 STRING_DOUBLE_VERBATIM,63 ERROR_STRING_DOUBLE_VERBATIM_UNTERMINATED,64 STRING_SINGLE_VERBATIM,65 ERROR_STRING_SINGLE_VERBATIM_UNTERMINATED,66 ERROR_STRING_VERBATIM_MISSING_QUOTES,67 STRING_BLOCK,68 ERROR_STRING_BLOCK_UNEXPECTED_END,69 ERROR_STRING_BLOCK_MISSING_NEW_LINE,70 ERROR_STRING_BLOCK_MISSING_TERMINATION,71 ERROR_STRING_BLOCK_MISSING_INDENT,72 IDENT,73 WHITESPACE,74 SINGLE_LINE_SLASH_COMMENT,75 SINGLE_LINE_HASH_COMMENT,76 MULTI_LINE_COMMENT,77 ERROR_COMMENT_TOO_SHORT,78 ERROR_COMMENT_UNTERMINATED,79 ERROR_NO_OPERATOR,80 ERROR_MISSING_TOKEN,81 ERROR_UNEXPECTED_TOKEN,82 ERROR_CUSTOM,83 TAILSTRICT_KW,84 LOCAL_KW,85 IMPORTSTR_KW,86 IMPORTBIN_KW,87 IMPORT_KW,88 IF_KW,89 THEN_KW,90 ELSE_KW,91 FUNCTION_KW,92 ERROR_KW,93 IN_KW,94 META_OBJECT_APPLY,95 NULL_KW,96 TRUE_KW,97 FALSE_KW,98 SELF_KW,99 SUPER_KW,100 FOR_KW,101 ASSERT_KW,102 LEXING_ERROR,103 __LAST_TOKEN,104 SOURCE_FILE,105 EXPR,106 SUFFIX_INDEX,107 NAME,108 SUFFIX_INDEX_EXPR,109 SUFFIX_SLICE,110 SLICE_DESC,111 SUFFIX_APPLY,112 ARGS_DESC,113 STMT_LOCAL,114 STMT_ASSERT,115 ASSERTION,116 EXPR_BINARY,117 EXPR_UNARY,118 EXPR_OBJ_EXTEND,119 EXPR_PARENED,120 EXPR_LITERAL,121 EXPR_STRING,122 EXPR_NUMBER,123 EXPR_ARRAY,124 EXPR_OBJECT,125 EXPR_ARRAY_COMP,126 EXPR_IMPORT,127 EXPR_VAR,128 EXPR_IF_THEN_ELSE,129 TRUE_EXPR,130 FALSE_EXPR,131 EXPR_FUNCTION,132 PARAMS_DESC,133 EXPR_ERROR,134 SLICE_DESC_END,135 SLICE_DESC_STEP,136 ARG,137 OBJ_BODY_COMP,138 OBJ_BODY_MEMBER_LIST,139 MEMBER_BIND_STMT,140 OBJ_LOCAL,141 MEMBER_ASSERT_STMT,142 MEMBER_FIELD_NORMAL,143 VISIBILITY,144 MEMBER_FIELD_METHOD,145 FIELD_NAME_FIXED,146 FIELD_NAME_DYNAMIC,147 FOR_SPEC,148 FOR_OBJ_SPEC,149 IF_SPEC,150 BIND_DESTRUCT,151 BIND_FUNCTION,152 PARAM,153 DESTRUCT_FULL,154 DESTRUCT_SKIP,155 DESTRUCT_ARRAY,156 DESTRUCT_OBJECT,157 DESTRUCT_OBJECT_FIELD,158 DESTRUCT_REST,159 DESTRUCT_ARRAY_ELEMENT,160 SUFFIX,161 BIND,162 STMT,163 OBJ_BODY,164 COMP_SPEC,165 EXPR_BASE,166 MEMBER_COMP,167 MEMBER,168 FIELD_NAME,169 DESTRUCT,170 DESTRUCT_ARRAY_PART,171 BINARY_OPERATOR,172 UNARY_OPERATOR,173 LITERAL,174 TEXT,175 NUMBER,176 IMPORT_KIND,177 TRIVIA,178 CUSTOM_ERROR,179 #[doc(hidden)]180 __LAST,181}182use self::SyntaxKind::*;183impl SyntaxKind {184 pub fn is_keyword(self) -> bool {185 match self {186 OR | NULL_COAELSE | AND | BIT_OR | BIT_XOR | BIT_AND | EQ | NE | LT | GT | LE | GE187 | LHS | RHS | PLUS | MINUS | MUL | DIV | MODULO | NOT | BIT_NOT | L_BRACK | R_BRACK188 | L_PAREN | R_PAREN | L_BRACE | R_BRACE | COLON | SEMI | DOT | DOTDOTDOT | COMMA189 | DOLLAR | ASSIGN | QUESTION_MARK | TAILSTRICT_KW | LOCAL_KW | IMPORTSTR_KW190 | IMPORTBIN_KW | IMPORT_KW | IF_KW | THEN_KW | ELSE_KW | FUNCTION_KW | ERROR_KW191 | IN_KW | NULL_KW | TRUE_KW | FALSE_KW | SELF_KW | SUPER_KW | FOR_KW | ASSERT_KW => true,192 _ => false,193 }194 }195 pub fn is_enum(self) -> bool {196 match self {197 SUFFIX | BIND | STMT | OBJ_BODY | COMP_SPEC | EXPR_BASE | MEMBER_COMP | MEMBER198 | FIELD_NAME | DESTRUCT | DESTRUCT_ARRAY_PART | BINARY_OPERATOR | UNARY_OPERATOR199 | LITERAL | TEXT | NUMBER | IMPORT_KIND | TRIVIA | CUSTOM_ERROR => true,200 _ => false,201 }202 }203 pub fn error_description(self) -> Option<&'static str> {204 match self {205 ERROR_FLOAT_JUNK_AFTER_POINT => {206 ::core::option::Option::Some("junk after decimal point in number literal")207 }208 ERROR_FLOAT_JUNK_AFTER_EXPONENT => {209 ::core::option::Option::Some("junk after exponent in number literal")210 }211 ERROR_FLOAT_JUNK_AFTER_EXPONENT_SIGN => {212 ::core::option::Option::Some("junk after exponent sign in number literal")213 }214 ERROR_STRING_DOUBLE_UNTERMINATED => {215 ::core::option::Option::Some("unterminated double-quoted string")216 }217 ERROR_STRING_SINGLE_UNTERMINATED => {218 ::core::option::Option::Some("unterminated single-quoted string")219 }220 ERROR_STRING_DOUBLE_VERBATIM_UNTERMINATED => {221 ::core::option::Option::Some("unterminated verbatim double-quoted string")222 }223 ERROR_STRING_SINGLE_VERBATIM_UNTERMINATED => {224 ::core::option::Option::Some("unterminated verbatim single-quoted string")225 }226 ERROR_STRING_VERBATIM_MISSING_QUOTES => {227 ::core::option::Option::Some("verbatim string missing opening quotes")228 }229 ERROR_STRING_BLOCK_UNEXPECTED_END => {230 ::core::option::Option::Some("unexpected end of text block")231 }232 ERROR_STRING_BLOCK_MISSING_NEW_LINE => {233 ::core::option::Option::Some("text block requires new line after |||")234 }235 ERROR_STRING_BLOCK_MISSING_TERMINATION => {236 ::core::option::Option::Some("unterminated text block")237 }238 ERROR_STRING_BLOCK_MISSING_INDENT => {239 ::core::option::Option::Some("text block first line must be indented")240 }241 ERROR_COMMENT_TOO_SHORT => ::core::option::Option::Some("comment too short"),242 ERROR_COMMENT_UNTERMINATED => {243 ::core::option::Option::Some("unterminated multi-line comment")244 }245 ERROR_NO_OPERATOR => ::core::option::Option::Some("expected operator"),246 ERROR_MISSING_TOKEN => ::core::option::Option::Some("missing token"),247 ERROR_UNEXPECTED_TOKEN => ::core::option::Option::Some("unexpected token"),248 ERROR_CUSTOM => ::core::option::Option::Some("error"),249 LEXING_ERROR => ::core::option::Option::Some("unexpected character"),250 _ => None,251 }252 }253 pub fn display_name(self) -> &'static str {254 match self {255 OR => "'||'",256 NULL_COAELSE => "'??'",257 AND => "'&&'",258 BIT_OR => "'|'",259 BIT_XOR => "'^'",260 BIT_AND => "'&'",261 EQ => "'=='",262 NE => "'!='",263 LT => "'<'",264 GT => "'>'",265 LE => "'<='",266 GE => "'>='",267 LHS => "'<<'",268 RHS => "'>>'",269 PLUS => "'+'",270 MINUS => "'-'",271 MUL => "'*'",272 DIV => "'/'",273 MODULO => "'%'",274 NOT => "'!'",275 BIT_NOT => "'~'",276 L_BRACK => "'['",277 R_BRACK => "']'",278 L_PAREN => "'('",279 R_PAREN => "')'",280 L_BRACE => "'{'",281 R_BRACE => "'}'",282 COLON => "':'",283 SEMI => "';'",284 DOT => "'.'",285 DOTDOTDOT => "'...'",286 COMMA => "','",287 DOLLAR => "'$'",288 ASSIGN => "'='",289 QUESTION_MARK => "'?'",290 FLOAT => "number",291 ERROR_FLOAT_JUNK_AFTER_POINT => "junk after decimal point in number literal",292 ERROR_FLOAT_JUNK_AFTER_EXPONENT => "junk after exponent in number literal",293 ERROR_FLOAT_JUNK_AFTER_EXPONENT_SIGN => "junk after exponent sign in number literal",294 STRING_DOUBLE => "\"string\"",295 ERROR_STRING_DOUBLE_UNTERMINATED => "unterminated double-quoted string",296 STRING_SINGLE => "'string'",297 ERROR_STRING_SINGLE_UNTERMINATED => "unterminated single-quoted string",298 STRING_DOUBLE_VERBATIM => "@\"string\"",299 ERROR_STRING_DOUBLE_VERBATIM_UNTERMINATED => {300 "unterminated verbatim double-quoted string"301 }302 STRING_SINGLE_VERBATIM => "@'string'",303 ERROR_STRING_SINGLE_VERBATIM_UNTERMINATED => {304 "unterminated verbatim single-quoted string"305 }306 ERROR_STRING_VERBATIM_MISSING_QUOTES => "verbatim string missing opening quotes",307 STRING_BLOCK => "|||string|||",308 ERROR_STRING_BLOCK_UNEXPECTED_END => "unexpected end of text block",309 ERROR_STRING_BLOCK_MISSING_NEW_LINE => "text block requires new line after |||",310 ERROR_STRING_BLOCK_MISSING_TERMINATION => "unterminated text block",311 ERROR_STRING_BLOCK_MISSING_INDENT => "text block first line must be indented",312 IDENT => "identifier",313 WHITESPACE => "whitespace",314 SINGLE_LINE_SLASH_COMMENT => "//comment",315 SINGLE_LINE_HASH_COMMENT => "#comment",316 MULTI_LINE_COMMENT => "/*comment*/",317 ERROR_COMMENT_TOO_SHORT => "comment too short",318 ERROR_COMMENT_UNTERMINATED => "unterminated multi-line comment",319 ERROR_NO_OPERATOR => "expected operator",320 ERROR_MISSING_TOKEN => "missing token",321 ERROR_UNEXPECTED_TOKEN => "unexpected token",322 ERROR_CUSTOM => "error",323 TAILSTRICT_KW => "'tailstrict'",324 LOCAL_KW => "'local'",325 IMPORTSTR_KW => "'importstr'",326 IMPORTBIN_KW => "'importbin'",327 IMPORT_KW => "'import'",328 IF_KW => "'if'",329 THEN_KW => "'then'",330 ELSE_KW => "'else'",331 FUNCTION_KW => "'function'",332 ERROR_KW => "'error'",333 IN_KW => "'in'",334 META_OBJECT_APPLY => "meta_object_apply",335 NULL_KW => "'null'",336 TRUE_KW => "'true'",337 FALSE_KW => "'false'",338 SELF_KW => "'self'",339 SUPER_KW => "'super'",340 FOR_KW => "'for'",341 ASSERT_KW => "'assert'",342 LEXING_ERROR => "unexpected character",343 _ => "unknown",344 }345 }346 pub fn from_raw(r: u16) -> Self {347 assert!(r < Self::__LAST as u16);348 unsafe { std::mem::transmute(r) }349 }350 pub fn into_raw(self) -> u16 {351 self as u16352 }353}354#[macro_export]355macro_rules ! T { [||] => { $ crate :: SyntaxKind :: OR } ; [??] => { $ crate :: SyntaxKind :: NULL_COAELSE } ; [&&] => { $ crate :: SyntaxKind :: AND } ; [|] => { $ crate :: SyntaxKind :: BIT_OR } ; [^] => { $ crate :: SyntaxKind :: BIT_XOR } ; [&] => { $ crate :: SyntaxKind :: BIT_AND } ; [==] => { $ crate :: SyntaxKind :: EQ } ; [!=] => { $ crate :: SyntaxKind :: NE } ; [<] => { $ crate :: SyntaxKind :: LT } ; [>] => { $ crate :: SyntaxKind :: GT } ; [<=] => { $ crate :: SyntaxKind :: LE } ; [>=] => { $ crate :: SyntaxKind :: GE } ; [<<] => { $ crate :: SyntaxKind :: LHS } ; [>>] => { $ crate :: SyntaxKind :: RHS } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [-] => { $ crate :: SyntaxKind :: MINUS } ; [*] => { $ crate :: SyntaxKind :: MUL } ; [/] => { $ crate :: SyntaxKind :: DIV } ; [%] => { $ crate :: SyntaxKind :: MODULO } ; [!] => { $ crate :: SyntaxKind :: NOT } ; [~] => { $ crate :: SyntaxKind :: BIT_NOT } ; ['['] => { $ crate :: SyntaxKind :: L_BRACK } ; [']'] => { $ crate :: SyntaxKind :: R_BRACK } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_BRACE } ; ['}'] => { $ crate :: SyntaxKind :: R_BRACE } ; [:] => { $ crate :: SyntaxKind :: COLON } ; [;] => { $ crate :: SyntaxKind :: SEMI } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [...] => { $ crate :: SyntaxKind :: DOTDOTDOT } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; ['$'] => { $ crate :: SyntaxKind :: DOLLAR } ; [=] => { $ crate :: SyntaxKind :: ASSIGN } ; [?] => { $ crate :: SyntaxKind :: QUESTION_MARK } ; [tailstrict] => { $ crate :: SyntaxKind :: TAILSTRICT_KW } ; [local] => { $ crate :: SyntaxKind :: LOCAL_KW } ; [importstr] => { $ crate :: SyntaxKind :: IMPORTSTR_KW } ; [importbin] => { $ crate :: SyntaxKind :: IMPORTBIN_KW } ; [import] => { $ crate :: SyntaxKind :: IMPORT_KW } ; [if] => { $ crate :: SyntaxKind :: IF_KW } ; [then] => { $ crate :: SyntaxKind :: THEN_KW } ; [else] => { $ crate :: SyntaxKind :: ELSE_KW } ; [function] => { $ crate :: SyntaxKind :: FUNCTION_KW } ; [error] => { $ crate :: SyntaxKind :: ERROR_KW } ; [in] => { $ crate :: SyntaxKind :: IN_KW } ; [null] => { $ crate :: SyntaxKind :: NULL_KW } ; [true] => { $ crate :: SyntaxKind :: TRUE_KW } ; [false] => { $ crate :: SyntaxKind :: FALSE_KW } ; [self] => { $ crate :: SyntaxKind :: SELF_KW } ; [super] => { $ crate :: SyntaxKind :: SUPER_KW } ; [for] => { $ crate :: SyntaxKind :: FOR_KW } ; [assert] => { $ crate :: SyntaxKind :: ASSERT_KW } }356#[allow(unused_imports)]357pub use T;crates/jrsonnet-rowan-parser/src/parser.rsdiffbeforeafterboth--- a/crates/jrsonnet-rowan-parser/src/parser.rs
+++ b/crates/jrsonnet-rowan-parser/src/parser.rs
@@ -364,6 +364,19 @@
fn compspec(p: &mut Parser) -> CompletedMarker {
assert!(p.at_ts(COMPSPEC));
if p.at(T![for]) {
+ if p.nth_at(1, T!['[']) && p.nth_at(2, IDENT) && p.nth_at(3, T![']']) && p.nth_at(4, T![:])
+ {
+ let m = p.start();
+ p.bump_assert(T![for]);
+ p.bump_assert(T!['[']);
+ name(p);
+ p.expect(T![']']);
+ visibility(p);
+ destruct(p);
+ p.expect(T![in]);
+ expr(p);
+ return m.complete(p, FOR_OBJ_SPEC);
+ }
let m = p.start();
p.bump();
destruct(p);
crates/jrsonnet-rowan-parser/src/snapshots/jrsonnet_rowan_parser__tests__for_obj_spec_force_visible.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-rowan-parser/src/snapshots/jrsonnet_rowan_parser__tests__for_obj_spec_force_visible.snap
@@ -0,0 +1,51 @@
+---
+source: crates/jrsonnet-rowan-parser/src/tests.rs
+expression: "{ [k]: v for [k]::: v in obj }\n"
+---
+SOURCE_FILE@0..31
+ EXPR@0..30
+ EXPR_OBJECT@0..30
+ OBJ_BODY_COMP@0..30
+ L_BRACE@0..1 "{"
+ WHITESPACE@1..2 " "
+ MEMBER_FIELD_NORMAL@2..8
+ FIELD_NAME_DYNAMIC@2..5
+ L_BRACK@2..3 "["
+ EXPR@3..4
+ EXPR_VAR@3..4
+ NAME@3..4
+ IDENT@3..4 "k"
+ R_BRACK@4..5 "]"
+ VISIBILITY@5..6
+ COLON@5..6 ":"
+ WHITESPACE@6..7 " "
+ EXPR@7..8
+ EXPR_VAR@7..8
+ NAME@7..8
+ IDENT@7..8 "v"
+ WHITESPACE@8..9 " "
+ FOR_OBJ_SPEC@9..28
+ FOR_KW@9..12 "for"
+ WHITESPACE@12..13 " "
+ L_BRACK@13..14 "["
+ NAME@14..15
+ IDENT@14..15 "k"
+ R_BRACK@15..16 "]"
+ VISIBILITY@16..19
+ COLON@16..17 ":"
+ COLON@17..18 ":"
+ COLON@18..19 ":"
+ WHITESPACE@19..20 " "
+ DESTRUCT_FULL@20..21
+ NAME@20..21
+ IDENT@20..21 "v"
+ WHITESPACE@21..22 " "
+ IN_KW@22..24 "in"
+ WHITESPACE@24..25 " "
+ EXPR@25..28
+ EXPR_VAR@25..28
+ NAME@25..28
+ IDENT@25..28 "obj"
+ WHITESPACE@28..29 " "
+ R_BRACE@29..30 "}"
+ WHITESPACE@30..31 "\n"
crates/jrsonnet-rowan-parser/src/snapshots/jrsonnet_rowan_parser__tests__for_obj_spec_hidden.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-rowan-parser/src/snapshots/jrsonnet_rowan_parser__tests__for_obj_spec_hidden.snap
@@ -0,0 +1,50 @@
+---
+source: crates/jrsonnet-rowan-parser/src/tests.rs
+expression: "{ [k]: v for [k]:: v in obj }\n"
+---
+SOURCE_FILE@0..30
+ EXPR@0..29
+ EXPR_OBJECT@0..29
+ OBJ_BODY_COMP@0..29
+ L_BRACE@0..1 "{"
+ WHITESPACE@1..2 " "
+ MEMBER_FIELD_NORMAL@2..8
+ FIELD_NAME_DYNAMIC@2..5
+ L_BRACK@2..3 "["
+ EXPR@3..4
+ EXPR_VAR@3..4
+ NAME@3..4
+ IDENT@3..4 "k"
+ R_BRACK@4..5 "]"
+ VISIBILITY@5..6
+ COLON@5..6 ":"
+ WHITESPACE@6..7 " "
+ EXPR@7..8
+ EXPR_VAR@7..8
+ NAME@7..8
+ IDENT@7..8 "v"
+ WHITESPACE@8..9 " "
+ FOR_OBJ_SPEC@9..27
+ FOR_KW@9..12 "for"
+ WHITESPACE@12..13 " "
+ L_BRACK@13..14 "["
+ NAME@14..15
+ IDENT@14..15 "k"
+ R_BRACK@15..16 "]"
+ VISIBILITY@16..18
+ COLON@16..17 ":"
+ COLON@17..18 ":"
+ WHITESPACE@18..19 " "
+ DESTRUCT_FULL@19..20
+ NAME@19..20
+ IDENT@19..20 "v"
+ WHITESPACE@20..21 " "
+ IN_KW@21..23 "in"
+ WHITESPACE@23..24 " "
+ EXPR@24..27
+ EXPR_VAR@24..27
+ NAME@24..27
+ IDENT@24..27 "obj"
+ WHITESPACE@27..28 " "
+ R_BRACE@28..29 "}"
+ WHITESPACE@29..30 "\n"
crates/jrsonnet-rowan-parser/src/snapshots/jrsonnet_rowan_parser__tests__for_obj_spec_value_destruct.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-rowan-parser/src/snapshots/jrsonnet_rowan_parser__tests__for_obj_spec_value_destruct.snap
@@ -0,0 +1,66 @@
+---
+source: crates/jrsonnet-rowan-parser/src/tests.rs
+expression: "{ [k]: a + b for [k]: [a, b] in obj }\n"
+---
+SOURCE_FILE@0..38
+ EXPR@0..37
+ EXPR_OBJECT@0..37
+ OBJ_BODY_COMP@0..37
+ L_BRACE@0..1 "{"
+ WHITESPACE@1..2 " "
+ MEMBER_FIELD_NORMAL@2..12
+ FIELD_NAME_DYNAMIC@2..5
+ L_BRACK@2..3 "["
+ EXPR@3..4
+ EXPR_VAR@3..4
+ NAME@3..4
+ IDENT@3..4 "k"
+ R_BRACK@4..5 "]"
+ VISIBILITY@5..6
+ COLON@5..6 ":"
+ WHITESPACE@6..7 " "
+ EXPR@7..12
+ EXPR_BINARY@7..12
+ EXPR@7..8
+ EXPR_VAR@7..8
+ NAME@7..8
+ IDENT@7..8 "a"
+ WHITESPACE@8..9 " "
+ PLUS@9..10 "+"
+ WHITESPACE@10..11 " "
+ EXPR@11..12
+ EXPR_VAR@11..12
+ NAME@11..12
+ IDENT@11..12 "b"
+ WHITESPACE@12..13 " "
+ FOR_OBJ_SPEC@13..35
+ FOR_KW@13..16 "for"
+ WHITESPACE@16..17 " "
+ L_BRACK@17..18 "["
+ NAME@18..19
+ IDENT@18..19 "k"
+ R_BRACK@19..20 "]"
+ VISIBILITY@20..21
+ COLON@20..21 ":"
+ WHITESPACE@21..22 " "
+ DESTRUCT_ARRAY@22..28
+ L_BRACK@22..23 "["
+ DESTRUCT_FULL@23..24
+ NAME@23..24
+ IDENT@23..24 "a"
+ COMMA@24..25 ","
+ WHITESPACE@25..26 " "
+ DESTRUCT_FULL@26..27
+ NAME@26..27
+ IDENT@26..27 "b"
+ R_BRACK@27..28 "]"
+ WHITESPACE@28..29 " "
+ IN_KW@29..31 "in"
+ WHITESPACE@31..32 " "
+ EXPR@32..35
+ EXPR_VAR@32..35
+ NAME@32..35
+ IDENT@32..35 "obj"
+ WHITESPACE@35..36 " "
+ R_BRACE@36..37 "}"
+ WHITESPACE@37..38 "\n"
crates/jrsonnet-rowan-parser/src/snapshots/jrsonnet_rowan_parser__tests__for_obj_spec_visible.snapdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-rowan-parser/src/snapshots/jrsonnet_rowan_parser__tests__for_obj_spec_visible.snap
@@ -0,0 +1,49 @@
+---
+source: crates/jrsonnet-rowan-parser/src/tests.rs
+expression: "{ [k]: v for [k]: v in obj }\n"
+---
+SOURCE_FILE@0..29
+ EXPR@0..28
+ EXPR_OBJECT@0..28
+ OBJ_BODY_COMP@0..28
+ L_BRACE@0..1 "{"
+ WHITESPACE@1..2 " "
+ MEMBER_FIELD_NORMAL@2..8
+ FIELD_NAME_DYNAMIC@2..5
+ L_BRACK@2..3 "["
+ EXPR@3..4
+ EXPR_VAR@3..4
+ NAME@3..4
+ IDENT@3..4 "k"
+ R_BRACK@4..5 "]"
+ VISIBILITY@5..6
+ COLON@5..6 ":"
+ WHITESPACE@6..7 " "
+ EXPR@7..8
+ EXPR_VAR@7..8
+ NAME@7..8
+ IDENT@7..8 "v"
+ WHITESPACE@8..9 " "
+ FOR_OBJ_SPEC@9..26
+ FOR_KW@9..12 "for"
+ WHITESPACE@12..13 " "
+ L_BRACK@13..14 "["
+ NAME@14..15
+ IDENT@14..15 "k"
+ R_BRACK@15..16 "]"
+ VISIBILITY@16..17
+ COLON@16..17 ":"
+ WHITESPACE@17..18 " "
+ DESTRUCT_FULL@18..19
+ NAME@18..19
+ IDENT@18..19 "v"
+ WHITESPACE@19..20 " "
+ IN_KW@20..22 "in"
+ WHITESPACE@22..23 " "
+ EXPR@23..26
+ EXPR_VAR@23..26
+ NAME@23..26
+ IDENT@23..26 "obj"
+ WHITESPACE@26..27 " "
+ R_BRACE@27..28 "}"
+ WHITESPACE@28..29 "\n"
crates/jrsonnet-rowan-parser/src/tests.rsdiffbeforeafterboth--- a/crates/jrsonnet-rowan-parser/src/tests.rs
+++ b/crates/jrsonnet-rowan-parser/src/tests.rs
@@ -228,6 +228,19 @@
local_in_binop_rhs => r#"
a + local x = 1; x
"#
+
+ for_obj_spec_visible => r#"
+ { [k]: v for [k]: v in obj }
+ "#
+ for_obj_spec_hidden => r#"
+ { [k]: v for [k]:: v in obj }
+ "#
+ for_obj_spec_force_visible => r#"
+ { [k]: v for [k]::: v in obj }
+ "#
+ for_obj_spec_value_destruct => r#"
+ { [k]: a + b for [k]: [a, b] in obj }
+ "#
);
#[test]