git.delta.rocks / jrsonnet / refs/commits / 144cb7462cc2

3expression: reformat(&input)3expression: reformat(&input)
4input_file: crates/jrsonnet-formatter/src/tests/basic_object.jsonnet4input_file: crates/jrsonnet-formatter/src/tests/basic_object.jsonnet
5---5---
6{ foo: 'bar', baz: 'qux', nested: { a: 1, b: 2 } }6{ foo: 'bar', baz: 'qux', nested: { a: 1, b: 2 }, unhidden::: 1 }
77

--- a/crates/jrsonnet-formatter/src/tests/basic_object.jsonnet
+++ b/crates/jrsonnet-formatter/src/tests/basic_object.jsonnet
@@ -1 +1 @@
-{ foo: 'bar', baz: 'qux', nested: { a: 1, b: 2 } }
+{ foo: 'bar', baz: 'qux', nested: { a: 1, b: 2 }, unhidden::: 1 }

--- a/crates/jrsonnet-rowan-parser/src/lib.rs
+++ b/crates/jrsonnet-rowan-parser/src/lib.rs
@@ -21,8 +21,8 @@
 pub use ast::{AstChildren, AstNode, AstToken};
 pub use generated::{nodes, syntax_kinds::SyntaxKind};
 pub use language::*;
+pub use string_block::{collect_lexed_str_block, CollectStrBlock};
 pub use token_set::SyntaxKindSet;
-pub use string_block::{collect_lexed_str_block, CollectStrBlock};
 
 use self::{
 	ast::support,

--- a/crates/jrsonnet-rowan-parser/src/parser.rs
+++ b/crates/jrsonnet-rowan-parser/src/parser.rs
@@ -407,11 +407,13 @@
 		m.complete(p, FIELD_NAME_FIXED);
 	} else {
 		m.forget(p);
-		p.error_with_recovery_set(TS![; : :: ::: '(']);
+		// ::: it split because in TS it is being handled as : ::
+		p.error_with_recovery_set(TS![; : :: '('].with(T![:::]));
 	}
 }
 fn visibility(p: &mut Parser) {
-	if p.at_ts(TS![: :: :::]) {
+	// ::: it split because in TS it is being handled as : ::
+	if p.at_ts(TS![: ::].with(T![:::])) {
 		p.bump();
 	} else {
 		p.error_with_recovery_set(TS![=]);
@@ -471,7 +473,8 @@
 				visibility(p);
 				expr(p);
 				true
-			} else if p.at_ts(TS![: :: :::]) && p.nth_at(1, T![function]) {
+			// ::: it split because in TS it is being handled as : ::
+			} else if p.at_ts(TS![: ::].with(T![:::])) && p.nth_at(1, T![function]) {
 				visibility(p);
 				p.bump_assert(T![function]);
 				params_desc(p);