Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package StyLua for openSUSE:Factory checked
in at 2023-10-16 23:01:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/StyLua (Old)
and /work/SRC/openSUSE:Factory/.StyLua.new.20540 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "StyLua"
Mon Oct 16 23:01:30 2023 rev:12 rq:1118039 version:0.18.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/StyLua/StyLua.changes 2023-08-28
17:14:46.559704428 +0200
+++ /work/SRC/openSUSE:Factory/.StyLua.new.20540/StyLua.changes 2023-10-16
23:01:32.574180002 +0200
@@ -1,0 +2,8 @@
+Mon Oct 9 13:14:58 UTC 2023 - Soc Virnyl Estela
<uncomfy+openbuildserv...@uncomfyhalomacro.pl>
+
+- Update to version 0.18.2:
+ * Fixed LuaJIT suffixes LL/ULL causing a panic when running in --verify mode
+ * Fixed incorrect formatting of conditionals when collapse_simple_statement
is enabled and the block begins with an empty line
+ * Fixed formatting of dot function call chains with comment between dot and
names
+
+-------------------------------------------------------------------
Old:
----
StyLua-0.18.1.tar.gz
New:
----
StyLua-0.18.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ StyLua.spec ++++++
--- /var/tmp/diff_new_pack.m2GYOe/_old 2023-10-16 23:01:33.730221747 +0200
+++ /var/tmp/diff_new_pack.m2GYOe/_new 2023-10-16 23:01:33.730221747 +0200
@@ -18,7 +18,7 @@
%define _bin_name stylua
Name: StyLua
-Version: 0.18.1
+Version: 0.18.2
Release: 0
Summary: Opinionated Lua code formatter
License: (Apache-2.0 OR MIT) AND Unicode-DFS-2016 AND (Apache-2.0 OR
BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Unlicense) AND Apache-2.0 AND MIT
AND MPL-2.0 AND MPL-2.0
++++++ StyLua-0.18.1.tar.gz -> StyLua-0.18.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/.github/workflows/benchmark.yml
new/StyLua-0.18.2/.github/workflows/benchmark.yml
--- old/StyLua-0.18.1/.github/workflows/benchmark.yml 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/.github/workflows/benchmark.yml 2023-09-10
19:01:40.000000000 +0200
@@ -13,7 +13,7 @@
name: Run Benchmark
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
# - run: rustup toolchain update nightly && rustup default nightly
- name: Run benchmark
run: cargo bench -- --output-format bencher | tee output.txt # +nightly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/.github/workflows/ci.yml
new/StyLua-0.18.2/.github/workflows/ci.yml
--- old/StyLua-0.18.1/.github/workflows/ci.yml 2023-07-15 21:12:45.000000000
+0200
+++ new/StyLua-0.18.2/.github/workflows/ci.yml 2023-09-10 19:01:40.000000000
+0200
@@ -10,42 +10,42 @@
test_default:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Test (default)
run: cargo test
test_luau:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Test (Luau)
run: cargo test --features luau
test_lua52:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Test (Lua 5.2)
run: cargo test --features lua52
test_lua53:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Test (Lua 5.3)
run: cargo test --features lua53
test_lua54:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Test (Lua 5.4)
run: cargo test --features lua54
test_wasm:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Test Build (wasm)
run: |
rustup target add wasm32-unknown-unknown
@@ -54,7 +54,7 @@
test_wasm_build:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
@@ -75,7 +75,7 @@
lint:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Clippy
run: |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/.github/workflows/coverage.yml
new/StyLua-0.18.2/.github/workflows/coverage.yml
--- old/StyLua-0.18.1/.github/workflows/coverage.yml 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/.github/workflows/coverage.yml 2023-09-10
19:01:40.000000000 +0200
@@ -10,7 +10,7 @@
coverage:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup toolchain
uses: dtolnay/rust-toolchain@nightly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/.github/workflows/extension.yml
new/StyLua-0.18.2/.github/workflows/extension.yml
--- old/StyLua-0.18.1/.github/workflows/extension.yml 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/.github/workflows/extension.yml 2023-09-10
19:01:40.000000000 +0200
@@ -10,7 +10,7 @@
lint:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
with:
@@ -32,7 +32,7 @@
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v3
with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/.github/workflows/large-scale-test.yml
new/StyLua-0.18.2/.github/workflows/large-scale-test.yml
--- old/StyLua-0.18.1/.github/workflows/large-scale-test.yml 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/.github/workflows/large-scale-test.yml 2023-09-10
19:01:40.000000000 +0200
@@ -20,7 +20,7 @@
name: Build Pull Request (#${{ github.event.inputs.prId }})
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Checkout Pull Request
run: hub pr checkout ${{ github.event.inputs.prId }}
@@ -40,7 +40,7 @@
name: Build Main
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
ref: "main"
@@ -57,7 +57,7 @@
runs-on: ubuntu-latest
needs: ["build-main", "build-latest"]
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Download artifacts
uses: actions/download-artifact@v3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/.github/workflows/release.yml
new/StyLua-0.18.2/.github/workflows/release.yml
--- old/StyLua-0.18.1/.github/workflows/release.yml 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/.github/workflows/release.yml 2023-09-10
19:01:40.000000000 +0200
@@ -50,7 +50,7 @@
name: Build (${{ matrix.artifact-name }})
runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
@@ -115,7 +115,7 @@
name: Publish to cargo
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
@@ -127,7 +127,7 @@
name: Publish wasm to npm
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
@@ -155,7 +155,7 @@
name: Publish binary to npm
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
@@ -178,7 +178,7 @@
name: Publish image to container registry
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v2
id: buildx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/.github/workflows/test-cases.yml
new/StyLua-0.18.2/.github/workflows/test-cases.yml
--- old/StyLua-0.18.1/.github/workflows/test-cases.yml 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/.github/workflows/test-cases.yml 2023-09-10
19:01:40.000000000 +0200
@@ -8,7 +8,7 @@
retrieve_cases:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Pull latest tests
run: python ./.github/retrieve_test_cases.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/CHANGELOG.md
new/StyLua-0.18.2/CHANGELOG.md
--- old/StyLua-0.18.1/CHANGELOG.md 2023-07-15 21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/CHANGELOG.md 2023-09-10 19:01:40.000000000 +0200
@@ -7,6 +7,14 @@
## [Unreleased]
+## [0.18.2] - 2023-09-10
+
+### Fixed
+
+- Fixed LuaJIT suffixes `LL`/`ULL` causing a panic when running in `--verify`
mode ([#750](https://github.com/JohnnyMorganz/StyLua/issues/750))
+- Fixed incorrect formatting of conditionals when `collapse_simple_statement`
is enabled and the block begins with an empty line
([#744](https://github.com/JohnnyMorganz/StyLua/issues/744))
+- Fixed formatting of dot function call chains with comment between dot and
names ([#747](https://github.com/JohnnyMorganz/StyLua/issues/747))
+
## [0.18.1] - 2023-07-15
### Fixed
@@ -695,7 +703,8 @@
Initial alpha release
-[unreleased]: https://github.com/JohnnyMorganz/StyLua/compare/v0.18.1...HEAD
+[unreleased]: https://github.com/JohnnyMorganz/StyLua/compare/v0.18.2...HEAD
+[0.18.2]: https://github.com/JohnnyMorganz/StyLua/releases/tag/v0.18.2
[0.18.1]: https://github.com/JohnnyMorganz/StyLua/releases/tag/v0.18.1
[0.18.0]: https://github.com/JohnnyMorganz/StyLua/releases/tag/v0.18.0
[0.17.1]: https://github.com/JohnnyMorganz/StyLua/releases/tag/v0.17.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/Cargo.lock new/StyLua-0.18.2/Cargo.lock
--- old/StyLua-0.18.1/Cargo.lock 2023-07-15 21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/Cargo.lock 2023-09-10 19:01:40.000000000 +0200
@@ -28,9 +28,9 @@
[[package]]
name = "anyhow"
-version = "1.0.71"
+version = "1.0.75"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
[[package]]
name = "assert_cmd"
@@ -839,18 +839,18 @@
[[package]]
name = "serde"
-version = "1.0.171"
+version = "1.0.179"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
+checksum = "0a5bf42b8d227d4abf38a1ddb08602e229108a517cd4e5bb28f9c7eaafdce5c0"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.171"
+version = "1.0.179"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
+checksum = "741e124f5485c7e60c03b043f79f320bff3527f4bbf12cf3831750dc46a0ec2c"
dependencies = [
"proc-macro2",
"quote",
@@ -859,9 +859,9 @@
[[package]]
name = "serde_json"
-version = "1.0.100"
+version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
dependencies = [
"itoa",
"ryu",
@@ -937,7 +937,7 @@
[[package]]
name = "stylua"
-version = "0.18.1"
+version = "0.18.2"
dependencies = [
"anyhow",
"assert_cmd",
@@ -1011,18 +1011,18 @@
[[package]]
name = "thiserror"
-version = "1.0.40"
+version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
dependencies = [
"proc-macro2",
"quote",
@@ -1060,9 +1060,9 @@
[[package]]
name = "toml"
-version = "0.7.5"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
dependencies = [
"serde",
"serde_spanned",
@@ -1081,9 +1081,9 @@
[[package]]
name = "toml_edit"
-version = "0.19.11"
+version = "0.19.14"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
dependencies = [
"indexmap 2.0.0",
"serde",
@@ -1305,9 +1305,9 @@
[[package]]
name = "winnow"
-version = "0.4.7"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
+checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
dependencies = [
"memchr",
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/Cargo.toml new/StyLua-0.18.2/Cargo.toml
--- old/StyLua-0.18.1/Cargo.toml 2023-07-15 21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/Cargo.toml 2023-09-10 19:01:40.000000000 +0200
@@ -1,6 +1,6 @@
[package]
name = "stylua"
-version = "0.18.1"
+version = "0.18.2"
authors = ["JohnnyMorganz <johnnymorg...@outlook.com>"]
description = "A code formatter for Lua"
license = "MPL-2.0"
@@ -33,7 +33,7 @@
editorconfig = ["ec4rs"]
[dependencies]
-anyhow = "1.0.71"
+anyhow = "1.0.75"
cfg-if = "1.0.0"
clap = { version = "3.1.6", features = ["derive"] }
console = "0.15.7"
@@ -47,13 +47,13 @@
log = "0.4.19"
num_cpus = "1.16.0"
regex = "1.9.1"
-serde = "1.0.165"
-serde_json = "1.0.100"
+serde = "1.0.179"
+serde_json = "1.0.105"
similar = { version = "2.2.1", features = ["text", "inline", "serde"] }
strum = { version = "0.25.0", features = ["derive"], optional = true }
-thiserror = "1.0.40"
+thiserror = "1.0.48"
threadpool = "1.8.1"
-toml = "0.7.5"
+toml = "0.7.6"
[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = { version = "0.2.81", optional = true }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/README.md new/StyLua-0.18.2/README.md
--- old/StyLua-0.18.1/README.md 2023-07-15 21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/README.md 2023-09-10 19:01:40.000000000 +0200
@@ -56,7 +56,7 @@
```yaml
- repo: https://github.com/JohnnyMorganz/StyLua
- rev: v0.18.1
+ rev: v0.18.2
hooks:
- id: stylua # or stylua-system / stylua-github
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/src/formatters/expression.rs
new/StyLua-0.18.2/src/formatters/expression.rs
--- old/StyLua-0.18.1/src/formatters/expression.rs 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/src/formatters/expression.rs 2023-09-10
19:01:40.000000000 +0200
@@ -31,7 +31,8 @@
UpdateTrailingTrivia, UpdateTrivia,
},
trivia_util::{
- self, contains_comments, trivia_is_newline, CommentSearch,
GetLeadingTrivia,
+ self, contains_comments, prepend_newline_indent,
take_leading_comments,
+ take_trailing_comments, trivia_is_newline, CommentSearch,
GetLeadingTrivia,
GetTrailingTrivia,
},
},
@@ -46,6 +47,7 @@
$(#[$inner])*
$enum::$operator(token) => $enum::$operator(fmt_symbol!($ctx,
token, $output, $shape)),
)+
+ #[allow(clippy::redundant_closure_call)]
other => $other(other),
}
};
@@ -425,10 +427,26 @@
}
}
- Index::Dot { dot, name } => Index::Dot {
- dot: format_token_reference(ctx, dot, shape),
- name: format_token_reference(ctx, name, shape),
- },
+ Index::Dot { dot, name } => {
+ // If there are any comments in between the dot and name,
+ // then taken them out and put them before the dot
+ let (mut dot, mut dot_comments) =
+ take_trailing_comments(&format_token_reference(ctx, dot,
shape));
+ let (name, name_comments) =
+ take_leading_comments(&format_token_reference(ctx, name,
shape));
+
+ dot_comments.extend(name_comments);
+
+ if !dot_comments.is_empty() {
+ dot = prepend_newline_indent(
+ ctx,
+
&dot.update_leading_trivia(FormatTriviaType::Append(dot_comments)),
+ shape,
+ );
+ }
+
+ Index::Dot { dot, name }
+ }
other => panic!("unknown node {:?}", other),
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/src/formatters/functions.rs
new/StyLua-0.18.2/src/formatters/functions.rs
--- old/StyLua-0.18.1/src/formatters/functions.rs 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/src/formatters/functions.rs 2023-09-10
19:01:40.000000000 +0200
@@ -971,6 +971,8 @@
let mut must_hang = false;
while let Some(suffix) = peekable_suffixes.next() {
must_hang = suffix.has_leading_comments(CommentSearch::All)
+ // Check for comment placed inside of suffix
+ || matches!(suffix, Suffix::Index(Index::Dot { dot, name }) if
dot.has_trailing_comments(CommentSearch::All) ||
name.has_leading_comments(CommentSearch::All))
// Check for a trailing comment (iff there is still a suffix
after this)
|| (peekable_suffixes.peek().is_some()
&& suffix.has_trailing_comments(CommentSearch::All));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/src/formatters/stmt.rs
new/StyLua-0.18.2/src/formatters/stmt.rs
--- old/StyLua-0.18.1/src/formatters/stmt.rs 2023-07-15 21:12:45.000000000
+0200
+++ new/StyLua-0.18.2/src/formatters/stmt.rs 2023-09-10 19:01:40.000000000
+0200
@@ -468,8 +468,12 @@
// Rather than deferring to `format_block()`, since we know that there
is only a single Stmt or LastStmt in the block, we can format it immediately
// We need to modify the formatted LastStmt, since it will have
automatically added leading/trailing trivia we don't want
// We assume that there is only a laststmt present in the block - the
callee of this function should have already checked for this
- let stmt_leading_trivia =
FormatTriviaType::Append(vec![Token::new(TokenType::spaces(1))]);
- let stmt_trailing_trivia =
FormatTriviaType::Append(vec![Token::new(TokenType::spaces(1))]);
+ // INVARIANT: this stmt has no leading/trailing comments, as this is
checked in `is_if_guard`
+ // This means we can replace trivia completely
+ debug_assert!(!trivia_util::contains_comments(if_node.block()));
+ let stmt_leading_trivia =
FormatTriviaType::Replace(vec![Token::new(TokenType::spaces(1))]);
+ let stmt_trailing_trivia =
+ FormatTriviaType::Replace(vec![Token::new(TokenType::spaces(1))]);
let block = if let Some(stmt) = if_node.block().stmts().next() {
let stmt = format_stmt_no_trivia(ctx, stmt, singleline_shape)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/src/verify_ast.rs
new/StyLua-0.18.2/src/verify_ast.rs
--- old/StyLua-0.18.1/src/verify_ast.rs 2023-07-15 21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/src/verify_ast.rs 2023-09-10 19:01:40.000000000 +0200
@@ -146,6 +146,12 @@
// Luau: cleanse number of any digit separators
#[cfg(feature = "luau")]
let text = text.replace('_', "");
+ // LuaJIT (Lua52): remove suffixes
+ #[cfg(feature = "lua52")]
+ let text = text
+ .trim_end_matches("ULL")
+ .trim_end_matches("LL")
+ .to_string();
let number = match text.as_str().parse::<f64>() {
Ok(num) => num,
@@ -306,6 +312,16 @@
}
#[test]
+ #[cfg(feature = "lua52")]
+ fn test_equivalent_luajit_numbers() {
+ let input_ast = full_moon::parse("local x = 2 ^ 63LL").unwrap();
+ let output_ast = full_moon::parse("local x = 2 ^ 63").unwrap();
+
+ let mut ast_verifier = AstVerifier::new();
+ assert!(ast_verifier.compare(input_ast, output_ast));
+ }
+
+ #[test]
fn test_equivalent_table_separators() {
let input_ast = full_moon::parse("local x = {'a'; 'b';
'c';}").unwrap();
let output_ast = full_moon::parse("local x = {'a', 'b',
'c'}").unwrap();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/stylua-npm-bin/package-lock.json
new/StyLua-0.18.2/stylua-npm-bin/package-lock.json
--- old/StyLua-0.18.1/stylua-npm-bin/package-lock.json 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/stylua-npm-bin/package-lock.json 2023-09-10
19:01:40.000000000 +0200
@@ -1,12 +1,12 @@
{
"name": "@johnnymorganz/stylua-bin",
- "version": "0.18.1",
+ "version": "0.18.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@johnnymorganz/stylua-bin",
- "version": "0.18.1",
+ "version": "0.18.2",
"hasInstallScript": true,
"license": "MPL-2.0",
"dependencies": {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/stylua-npm-bin/package.json
new/StyLua-0.18.2/stylua-npm-bin/package.json
--- old/StyLua-0.18.1/stylua-npm-bin/package.json 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/stylua-npm-bin/package.json 2023-09-10
19:01:40.000000000 +0200
@@ -1,6 +1,6 @@
{
"name": "@johnnymorganz/stylua-bin",
- "version": "0.18.1",
+ "version": "0.18.2",
"description": "A code formatter for Lua",
"bin": {
"stylua": "./run.js"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/stylua-vscode/package-lock.json
new/StyLua-0.18.2/stylua-vscode/package-lock.json
--- old/StyLua-0.18.1/stylua-vscode/package-lock.json 2023-07-15
21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/stylua-vscode/package-lock.json 2023-09-10
19:01:40.000000000 +0200
@@ -2409,9 +2409,9 @@
}
},
"node_modules/word-wrap": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";,
- "integrity":
"sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz";,
+ "integrity":
"sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -4405,9 +4405,9 @@
}
},
"word-wrap": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";,
- "integrity":
"sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz";,
+ "integrity":
"sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
"dev": true
},
"workerpool": {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/StyLua-0.18.1/tests/inputs/hang-call-chain-comments-2.lua
new/StyLua-0.18.2/tests/inputs/hang-call-chain-comments-2.lua
--- old/StyLua-0.18.1/tests/inputs/hang-call-chain-comments-2.lua
1970-01-01 01:00:00.000000000 +0100
+++ new/StyLua-0.18.2/tests/inputs/hang-call-chain-comments-2.lua
2023-09-10 19:01:40.000000000 +0200
@@ -0,0 +1,6 @@
+-- https://github.com/JohnnyMorganz/StyLua/issues/747
+
+obj. --
+func(). --
+func(). --
+func()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/StyLua-0.18.1/tests/inputs-collapse-single-statement/simple-conditional-2.lua
new/StyLua-0.18.2/tests/inputs-collapse-single-statement/simple-conditional-2.lua
---
old/StyLua-0.18.1/tests/inputs-collapse-single-statement/simple-conditional-2.lua
1970-01-01 01:00:00.000000000 +0100
+++
new/StyLua-0.18.2/tests/inputs-collapse-single-statement/simple-conditional-2.lua
2023-09-10 19:01:40.000000000 +0200
@@ -0,0 +1,6 @@
+-- https://github.com/JohnnyMorganz/StyLua/issues/744
+
+if tabnr ~= finaltab then
+
+ stack:push('%T')
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/StyLua-0.18.1/tests/snapshots/tests__collapse_single_statem...@simple-conditional-2.lua.snap
new/StyLua-0.18.2/tests/snapshots/tests__collapse_single_statem...@simple-conditional-2.lua.snap
---
old/StyLua-0.18.1/tests/snapshots/tests__collapse_single_statem...@simple-conditional-2.lua.snap
1970-01-01 01:00:00.000000000 +0100
+++
new/StyLua-0.18.2/tests/snapshots/tests__collapse_single_statem...@simple-conditional-2.lua.snap
2023-09-10 19:01:40.000000000 +0200
@@ -0,0 +1,8 @@
+---
+source: tests/tests.rs
+expression: "format_code(&contents,\n
Config::default().with_collapse_simple_statement(CollapseSimpleStatement::Always),\n
None, OutputVerification::None).unwrap()"
+---
+-- https://github.com/JohnnyMorganz/StyLua/issues/744
+
+if tabnr ~= finaltab then stack:push("%T") end
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/StyLua-0.18.1/tests/snapshots/tests__stand...@hang-call-chain-comments-2.lua.snap
new/StyLua-0.18.2/tests/snapshots/tests__stand...@hang-call-chain-comments-2.lua.snap
---
old/StyLua-0.18.1/tests/snapshots/tests__stand...@hang-call-chain-comments-2.lua.snap
1970-01-01 01:00:00.000000000 +0100
+++
new/StyLua-0.18.2/tests/snapshots/tests__stand...@hang-call-chain-comments-2.lua.snap
2023-09-10 19:01:40.000000000 +0200
@@ -0,0 +1,14 @@
+---
+source: tests/tests.rs
+expression: format(&contents)
+---
+-- https://github.com/JohnnyMorganz/StyLua/issues/747
+
+obj
+ --
+ .func()
+ --
+ .func()
+ --
+ .func()
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/StyLua-0.18.1/wasm/package.json
new/StyLua-0.18.2/wasm/package.json
--- old/StyLua-0.18.1/wasm/package.json 2023-07-15 21:12:45.000000000 +0200
+++ new/StyLua-0.18.2/wasm/package.json 2023-09-10 19:01:40.000000000 +0200
@@ -4,7 +4,7 @@
"JohnnyMorganz <johnnymorg...@outlook.com>"
],
"description": "A code formatter for Lua",
- "version": "0.18.1",
+ "version": "0.18.2",
"license": "MPL-2.0",
"readme": "README.md",
"repository": {
++++++ _service ++++++
--- /var/tmp/diff_new_pack.m2GYOe/_old 2023-10-16 23:01:33.950229692 +0200
+++ /var/tmp/diff_new_pack.m2GYOe/_new 2023-10-16 23:01:33.954229836 +0200
@@ -1,7 +1,7 @@
<services>
<service name="download_files" mode="manual" />
<service name="cargo_vendor" mode="manual">
- <param name="srctar">StyLua-0.18.1.tar.gz</param>
+ <param name="srctar">StyLua*.tar.gz</param>
<param name="compression">zst</param>
<param name="update">true</param>
</service>
++++++ cargo_config ++++++
--- /var/tmp/diff_new_pack.m2GYOe/_old 2023-10-16 23:01:33.974230558 +0200
+++ /var/tmp/diff_new_pack.m2GYOe/_new 2023-10-16 23:01:33.978230703 +0200
@@ -3,5 +3,4 @@
[source.vendored-sources]
directory = "vendor"
-(No newline at EOF)
++++++ vendor.tar.zst ++++++
Binary files /var/tmp/diff_new_pack.m2GYOe/_old and
/var/tmp/diff_new_pack.m2GYOe/_new differ
