From 1a931627409a48a67617e6c20ac1baf799911af1 Mon Sep 17 00:00:00 2001
From: Wilfred Hughes <me@wilfred.me.uk>
Date: Thu, 14 Apr 2022 18:45:48 -0700
Subject: [PATCH] Fix block sclars in YAML

---
 CHANGELOG.md                  | 2 ++
 sample_files/compare.expected | 2 +-
 sample_files/yaml_before.yaml | 4 ++++
 src/tree_sitter_parser.rs     | 5 +++--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1aac39d..ddcf74edb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 Added support for Kotlin.
 
+Fixed an issue with YAML and `|` block strings.
+
 ### Display
 
 Improved syntax highlighting for keywords.
diff --git a/sample_files/compare.expected b/sample_files/compare.expected
index f3557c70f..05fdd5887 100644
--- a/sample_files/compare.expected
+++ b/sample_files/compare.expected
@@ -146,7 +146,7 @@ sample_files/whitespace_before.tsx sample_files/whitespace_after.tsx
 c4151c5a44b11e04fd11c2594597ed33  -
 
 sample_files/yaml_before.yaml sample_files/yaml_after.yaml
-1ae5db1355627f3ca607d76c3e6eed9a  -
+c6b4ca92476b2abcf8ec53eab9115e67  -
 
 sample_files/zig_before.zig sample_files/zig_after.zig
 fe7f694c4223c83ecadbbf96f791ccad  -
diff --git a/sample_files/yaml_before.yaml b/sample_files/yaml_before.yaml
index 53a8a2e42..eace8c0a1 100644
--- a/sample_files/yaml_before.yaml
+++ b/sample_files/yaml_before.yaml
@@ -3,3 +3,7 @@ foo: [foobar]
 hello:
   - "world"
   - other
+
+stuff: |
+  a
+  b
diff --git a/src/tree_sitter_parser.rs b/src/tree_sitter_parser.rs
index 3e3809cb3..bae07a127 100644
--- a/src/tree_sitter_parser.rs
+++ b/src/tree_sitter_parser.rs
@@ -579,11 +579,12 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
             TreeSitterConfig {
                 name: "YAML",
                 language,
-                atom_nodes: (vec![
+                atom_nodes: vec![
                     "string_scalar",
                     "double_quote_scalar",
                     "single_quote_scalar",
-                ])
+                    "block_scalar",
+                ]
                 .into_iter()
                 .collect(),
                 delimiter_tokens: (vec![("{", "}"), ("(", ")"), ("[", "]")]),