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.rsdiffbeforeafterboth--- a/crates/jrsonnet-rowan-parser/src/generated/syntax_kinds.rs
+++ b/crates/jrsonnet-rowan-parser/src/generated/syntax_kinds.rs
@@ -145,6 +145,7 @@
FIELD_NAME_FIXED,
FIELD_NAME_DYNAMIC,
FOR_SPEC,
+ FOR_OBJ_SPEC,
IF_SPEC,
BIND_DESTRUCT,
BIND_FUNCTION,
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.rsdiffbeforeafterboth1// `never`2#![cfg(test)]34use hi_doc::{Formatting, SnippetBuilder, Text};56use crate::{AstNode, parse};78fn process(text: &str) -> String {9 use std::fmt::Write;10 let mut out = String::new();11 let (node, errors) = parse(text);12 write!(out, "{:#?}", node.syntax()).unwrap();13 if !errors.is_empty() && !text.is_empty() {14 writeln!(out, "===").unwrap();15 for err in &errors {16 writeln!(out, "{err:?}").unwrap();17 }18 let mut code = text.to_string();1920 // Prettier errors at EOF position21 if code.ends_with('\n') {22 code.truncate(code.len() - 1);23 code += " ";24 }25 code += " ";2627 let mut s = SnippetBuilder::new(code);2829 for error in errors {30 s.error(Text::fragment(31 format!("{}", error.error),32 Formatting::default(),33 ))34 .range(error.range.start().into()..=error.range.end().into())35 .build();36 }3738 writeln!(out, "===").unwrap();39 let ansi = hi_doc::source_to_ansi(&s.build());40 let text = strip_ansi_escapes::strip_str(&ansi);41 out.push_str(&text);42 }43 out.split('\n')44 .map(|s| s.trim_end().to_string())45 .collect::<Vec<String>>()46 .join("\n")47 .trim_end()48 .to_string()49}50macro_rules! mk_test {51 ($($name:ident => $test:expr)+) => {$(52 #[test]53 fn $name() {54 let src = indoc::indoc!($test);55 let result = process(&src);56 insta::assert_snapshot!(stringify!($name), result, src);57 }58 )+};59 }60mk_test!(61 empty => r#" "#62 function => r#"63 function(a, b = 1) a + b64 "#65 function_error_no_value => r#"66 function(a, b = ) a + b67 "#68 function_error_rparen => r#"69 function(a, b70 "#71 function_error_body => r#"72 function(a, b)73 "#74 local_novalue => r#"75 local a =76 "#77 local_no_value_recovery => r#"78 local a =79 local b = 3;80 181 "#828384 no_rhs => r#"85 a +86 "#87 no_lhs => r#"88 + 289 "#90 no_operator => "91 2 292 "9394 named_before_positional => "95 a(1, 2, b=4, 3, 5, k = 12, 6)96 "9798 wrong_field_end => "99 {100 a: 1;101 b: 2;102 }103 "104105106 plain_call => "107 std.substr(a, 0, std.length(b)) == b108 "109110 destruct => "111 local [a, b, c] = arr;112 local [a, ...] = arr_rest;113 local [..., a] = rest_arr;114 local [...] = rest_in_arr;115 local [a, ...n] = arr_rest_n;116 local [...n, a] = rest_arr_n;117 local [...n] = rest_in_arr_n;118119 local {a, b, c} = obj;120 local {a, b, c, ...} = obj_rest;121 local {a, b, c, ...n} = obj_rest_n;122123 null124 "125126 str_block_missing_indent => "127 |||128 "129 str_block_missing_termination => "130 |||131 hello132 "133 str_block_missing_newline => "134 |||hello135 "136 str_block_missing_indent_text => "137 |||138 hello139 "140141 unexpected_destruct => "142 local * = 1;143 a144 "145 arr_compspec => r#"146 [a for a in [1, 2, 3]]147 "#148 arr_compspec_comma => "149 [a, for a in [1, 2, 3]]150 "151 arr_compspec_no_elems => "152 [for a in [1, 2, 3]]153 "154 arr_compspec_incompatible_with_multiple_elems => r#"155 [a for a in [1, 2, 3], b]156 "#157 arr_compspec_incompatible_with_multiple_elems_w => r#"158 [a, b, for a in [1, 2, 3], c]159 "#160161 obj_compspec => r#"162 {a:1 for a in [1, 2, 3]}163 "#164 obj_compspec_comma => "165 {a:1, for a in [1, 2, 3]}166 "167 obj_compspec_no_elems => "168 {for a in [1, 2, 3]}169 "170 obj_compspec_incompatible_with_multiple_elems => r#"171 {a:1 for a in [1, 2, 3], b:1}172 "#173 obj_compspec_incompatible_with_multiple_elems_w => r#"174 {a:1, b:1, for a in [1, 2, 3], c:1}175 "#176177 obj_compspec_incompatible_with_asserts => r#"178 {assert 1, a: 1 for a in [1,2,3]}179 "#180181 local_method => r#"182 local183 a(x) = x,184 a = function(x) x,185 ; c186 "#187 obj_method => r#"188 {189 a(x): x,190 a: function(x) x,191 }192 "#193194 continue_after_total_failure => r#"195 local intr = $intrinsic(test);196197 local a = 1, b = 2, c = a + b;198199 [c]200 "#201202 super_nesting => r#"203 super.a + super.b204 "#205206 string_block_trim => r#"207 |||-208 Trimmed text block209 |||210 "#211212 visibilities => r#"213 {214 normal: 1,215 hide:: 2,216 unhide::: 3,217 }218 "#219220 unary_not => r#"221 !false222 "#223224 unary_not_in_call => r#"225 std.assertEqual(!false, true)226 "#227228 local_in_binop_rhs => r#"229 a + local x = 1; x230 "#231);232233#[test]234fn eval_simple() {235 let src = "local a = 1, b = 2; a + local c = 1; c";236 let (node, _errors) = parse(src);237238 dbg!(node);239}