Fix table field shape calculation (#552)

* Add test case

* Fix table shape computation

* Changelog

* Snapshots

Author: JohnnyMorganz

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Take into account the extra line created when hanging at equals token in an assignment. This should prevent unnecessary hanging ([#542](https://github.com/JohnnyMorganz/StyLua/issues/542))
 - Fixed comments added to a newly created trailing comment not being formatted ([#547](https://github.com/JohnnyMorganz/StyLua/issues/547))
 - Fixed call chain with a small prefix not being kept inlined causing unstable formatting ([#514](https://github.com/JohnnyMorganz/StyLua/issues/514))
+- Fix shape computation for table fields causing unnecessary expansion ([#551](https://github.com/JohnnyMorganz/StyLua/issues/551))
 
 ## [0.14.2] - 2022-07-27
 

src/formatters/table.rs

@@ -20,7 +20,7 @@ use full_moon::{
         Expression, Field, TableConstructor, Value,
     },
     node::Node,
-    tokenizer::{Token, TokenKind, TokenReference, TokenType},
+    tokenizer::{Token, TokenReference, TokenType},
 };
 
 /// Used to provide information about the table
@@ -477,27 +477,24 @@ pub fn format_table_constructor(
                 let additional_shape = match (
                     start_brace
                         .trailing_trivia()
-                        .any(|x| x.token_kind() == TokenKind::Whitespace),
+                        .any(trivia_util::trivia_is_whitespace),
                     // A space will be present on the end of the last field, not the start of the end brace
                     match (last_field.value(), last_field.punctuation()) {
                         (_, Some(token)) => token
                             .trailing_trivia()
-                            .any(|x| x.token_kind() == TokenKind::Whitespace),
+                            .any(trivia_util::trivia_is_whitespace),
                         (field, None) => table_field_trailing_trivia(field)
                             .iter()
-                            .any(|x| x.token_kind() == TokenKind::Whitespace),
+                            .any(trivia_util::trivia_is_whitespace),
                     },
                 ) {
                     (true, true) => 0,
                     (true, false) | (false, true) => 1,
                     (false, false) => 2,
                 };
 
-                let singleline_shape = shape
-                    + (braces_range.1 - braces_range.0)
-                    + additional_shape
-                    + BRACE_LEN
-                    + BRACE_LEN;
+                let singleline_shape =
+                    shape + (braces_range.1 - braces_range.0) + additional_shape + BRACE_LEN; // End brace is not included in braces range
 
                 match singleline_shape.over_budget() {
                     true => TableType::MultiLine,

src/formatters/trivia_util.rs

@@ -1133,7 +1133,7 @@ pub fn table_field_trailing_trivia(field: &Field) -> Vec<Token> {
     match field {
         Field::ExpressionKey { value, .. } => get_expression_trailing_trivia(value),
         Field::NameKey { value, .. } => get_expression_trailing_trivia(value),
-        Field::NoKey(expression) => get_expression_leading_trivia(expression),
+        Field::NoKey(expression) => get_expression_trailing_trivia(expression),
         other => panic!("unknown node {:?}", other),
     }
 }

tests/inputs/table-8.lua

@@ -0,0 +1,4 @@
+-- https://github.com/JohnnyMorganz/StyLua/issues/551
+local test = {
+	{ "http://example.com/b//c//d;p?q#blarg", "http://u:p@h.com/p/a/t/h?s#hash2", "http://u:p@h.com/p/a/t/h?s#hash2" },
+}

tests/snapshots/tests__standard@table-2.lua.snap

@@ -1,22 +1,7 @@
 ---
 source: tests/tests.rs
 expression: format(&contents)
-
 ---
-local foo = {
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-	"aaaa",
-}
+local foo =
+	{ "aaaa", "aaaa", "aaaa", "aaaa", "aaaa", "aaaa", "aaaa", "aaaa", "aaaa", "aaaa", "aaaa", "aaaa", "aaaa", "aaaa" }
 

tests/snapshots/tests__standard@table-8.lua.snap

@@ -0,0 +1,9 @@
+---
+source: tests/tests.rs
+expression: format(&contents)
+---
+-- https://github.com/JohnnyMorganz/StyLua/issues/551
+local test = {
+	{ "http://example.com/b//c//d;p?q#blarg", "http://u:p@h.com/p/a/t/h?s#hash2", "http://u:p@h.com/p/a/t/h?s#hash2" },
+}
+