[pull] master from tamasfe:master

.github/workflows/ci.yaml

@@ -79,14 +79,14 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: Retrieve toml-test
         run: |
-          wget https://github.com/BurntSushi/toml-test/releases/download/v1.1.0/toml-test-v1.1.0-linux-amd64.gz
-          gunzip toml-test-v1.1.0-linux-amd64.gz
-          chmod +x toml-test-v1.1.0-linux-amd64
+          wget https://github.com/toml-lang/toml-test/releases/download/v2.1.0/toml-test-v2.1.0-linux-amd64.gz
+          gunzip toml-test-v2.1.0-linux-amd64.gz
+          chmod +x toml-test-v2.1.0-linux-amd64
       - name: Build taplo-cli
         run: |
           cargo build --bin taplo --no-default-features --features "rustls-tls,toml-test"
       - name: Run toml-test
-        run: ./toml-test-v1.1.0-linux-amd64 ./target/debug/taplo -- toml-test
+        run: ./toml-test-v2.1.0-linux-amd64 test -toml 1.1 -skip 'invalid/control/cr,invalid/control/multi-cr,invalid/control/rawmulti-cr,invalid/table/append-with-dotted-keys-04,invalid/table/super-twice,valid/array/array,valid/comment/everywhere,valid/comment/nonascii,valid/datetime/datetime,valid/datetime/edge,valid/datetime/leap-year,valid/datetime/local,valid/datetime/local-date,valid/datetime/local-time,valid/datetime/milliseconds,valid/datetime/no-seconds,valid/datetime/timezone,valid/example,valid/key/numeric-04,valid/key/quoted-unicode,valid/spec-1.1.0/common-12,valid/spec-1.1.0/common-27,valid/spec-1.1.0/common-28,valid/spec-1.1.0/common-29,valid/spec-1.1.0/common-30,valid/spec-1.1.0/common-31,valid/spec-1.1.0/common-32,valid/spec-1.1.0/common-33,valid/spec-1.1.0/common-34,valid/spec-1.1.0/common-44,valid/spec-example-1,valid/spec-example-1-compact,valid/string/escape-esc,valid/string/hex-escape,valid/string/quoted-unicode' -decoder "./target/debug/taplo toml-test"
 
   test-msrv-lib:
     name: Test libraries with MSRV

crates/taplo-cli/src/lib.rs

@@ -139,7 +139,8 @@ impl<E: Environment> Taplo<E> {
 
         let excluded = total - files.len();
 
-        tracing::info!(total, excluded, ?files, "found files");
+        tracing::info!(total, excluded, "found files");
+        tracing::debug!(?files, "file details");
 
         Ok(files)
     }

crates/taplo-lsp/src/handlers/hover.rs

@@ -112,7 +112,7 @@ pub(crate) async fn hover<E: Environment>(
             keys = lookup_keys(doc.dom.clone(), &keys);
 
             // We're interested in the array itself, not its item type.
-            if let Some(KeyOrIndex::Index(_)) = keys.iter().last() {
+            while let Some(KeyOrIndex::Index(_)) = keys.iter().last() {
                 keys = keys.skip_right(1);
             }
 

crates/taplo/Cargo.toml

@@ -35,12 +35,14 @@ serde    = { workspace = true, features = ["derive"], optional = true }
 
 [dev-dependencies]
 assert-json-diff = { version = "2" }
-criterion        = { version = "0.5" }                                          # criterion -> clap
+criterion        = { version = "0.5" }   # criterion -> clap
 difference       = { version = "2.0.0" }
-pprof            = { version = "0.14", features = ["flamegraph", "criterion"] } # pprof -> criterion -> clap
 serde_json       = { version = "1" }
 toml             = { version = "0.7" }
 
+[target.'cfg(unix)'.dev-dependencies]
+pprof = { version = "0.14", features = ["flamegraph", "criterion"] } # pprof -> criterion -> clap
+
 [package.metadata.docs.rs]
 features = ["serde", "schema"]