From 045d6a2c5813cf08d30a86c827246b2cb63bea07 Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Fri, 3 Mar 2023 00:21:51 -0800 Subject: [PATCH] Treat Newick and Racket as lisps --- CHANGELOG.md | 5 +++++ sample_files/compare.expected | 2 +- src/diff/sliders.rs | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7c935193..434f4f5c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## 0.45 (unreleased) +### Diffing + +Racket and Newick are now treated as lisps for the purposes for +parenthesis heuristics. + ### Parsing Improved parsing for Makefiles. diff --git a/sample_files/compare.expected b/sample_files/compare.expected index e3c4ba823..5cc1a5699 100644 --- a/sample_files/compare.expected +++ b/sample_files/compare.expected @@ -131,7 +131,7 @@ sample_files/nesting_before.el sample_files/nesting_after.el 9fcf6b8adf148cdae47bc3a5f8068e41 - sample_files/newick_before.nwk sample_files/newick_after.nwk -4778aef7b901b2cc7f9ad3601f87864d - +2919522e564dad74183ef2411bfc3111 - sample_files/nix_before.nix sample_files/nix_after.nix 09a56752c1eb7f3f5c10d631a01973fc - diff --git a/src/diff/sliders.rs b/src/diff/sliders.rs index 6444cadfc..7c7b99a10 100644 --- a/src/diff/sliders.rs +++ b/src/diff/sliders.rs @@ -56,7 +56,7 @@ fn prefer_outer_delimiter(language: guess_language::Language) -> bool { match language { // For Lisp family languages, we get the best result with the // outer delimiter. - EmacsLisp | Clojure | CommonLisp | Janet => true, + EmacsLisp | Clojure | CommonLisp | Janet | Racket | Newick => true, // JSON and TOML are like Lisp: the outer delimiter in an array object // is the most relevant. Json | Toml | Hcl => true,