fix: do not panic when text contains multiple values (#20)

dsherret · web-flow · commit 677779504116 · 2023-06-09T11:53:24.000-04:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
           token: ${{ secrets.GH_DPRINTBOT_PAT }}
 
       - uses: denoland/setup-deno@v1
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dsherret/rust-toolchain-file@v1
 
       - name: Bump version and tag
         env:
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -0,0 +1,3 @@
+max_width = 120
+tab_spaces = 2
+edition = "2021"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ tracing = ["dprint-core/tracing"]
 
 [dependencies]
 anyhow = "1.0.64"
-dprint-core = { version = "0.62.0", features = ["formatting"] }
+dprint-core = { version = "0.62.1", features = ["formatting"] }
 jsonc-parser = { version = "0.21.1" }
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
diff --git a/dprint.json b/dprint.json
@@ -12,9 +12,9 @@
     "**/benches/data"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.84.2.wasm",
-    "https://plugins.dprint.dev/json-0.17.1.wasm",
-    "https://plugins.dprint.dev/markdown-0.15.2.wasm",
+    "https://plugins.dprint.dev/typescript-0.85.0.wasm",
+    "https://plugins.dprint.dev/json-0.17.3.wasm",
+    "https://plugins.dprint.dev/markdown-0.15.3.wasm",
     "https://plugins.dprint.dev/toml-0.5.4.wasm",
     "https://plugins.dprint.dev/exec-0.3.5.json@d687dda57be0fe9a0088ccdaefa5147649ff24127d8b3ea227536c68ee7abeab"
   ]
diff --git a/src/format_text.rs b/src/format_text.rs
@@ -89,4 +89,15 @@ mod tests {
       "Line 1, column 7: Unexpected token\n\n  { \"a\":\u{200b}5 }\n        ~"
     );
   }
+
+  #[test]
+  fn no_panic_diagnostic_multiple_values() {
+    let global_config = GlobalConfiguration::default();
+    let config = resolve_config(ConfigKeyMap::new(), &global_config).config;
+    let message = format_text("{},\n", &config).err().unwrap().to_string();
+    assert_eq!(
+      message,
+      "Line 1, column 3: Text cannot contain more than one JSON value\n\n  {},"
+    );
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+max_width = 120`
	`2`	`+tab_spaces = 2`
	`3`	`+edition = "2021"`