From 1432e56215385fc434b307ee706793792ae87283 Mon Sep 17 00:00:00 2001
From: Viktor Kleen <viktor@kleen.org>
Date: Thu, 9 Feb 2023 18:01:28 +0000
Subject: [PATCH 1/4] Update nickel treesitter grammar

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 6516cc37d773..4953782b10ea 100644
--- a/languages.toml
+++ b/languages.toml
@@ -577,7 +577,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "nickel"
-source = { git = "https://github.com/nickel-lang/tree-sitter-nickel", rev = "9d83db400b6c11260b9106f131f93ddda8131933" }
+source = { git = "https://github.com/nickel-lang/tree-sitter-nickel", rev = "3a794388773f2424a97b2186828aa3fac4c66ce6" }
 
 [[language]]
 name = "nix"

From e96fa3a95bde2c8bfa186ea7c79990b1e8c244c7 Mon Sep 17 00:00:00 2001
From: Viktor Kleen <viktor@kleen.org>
Date: Thu, 9 Feb 2023 18:34:57 +0000
Subject: [PATCH 2/4] nickel: update treesitter queries

---
 runtime/queries/nickel/highlights.scm | 4 ++--
 runtime/queries/nickel/injections.scm | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/nickel/injections.scm

diff --git a/runtime/queries/nickel/highlights.scm b/runtime/queries/nickel/highlights.scm
index cd458df278a3..4e4bf6694ef5 100644
--- a/runtime/queries/nickel/highlights.scm
+++ b/runtime/queries/nickel/highlights.scm
@@ -20,7 +20,7 @@
 )
 
 (record_operand (atom (ident) @variable))
-(let_expr
+(let_in_block
   "let" @keyword
   "rec"? @keyword
   pat: (pattern
@@ -53,7 +53,7 @@
 (interpolation_end) @punctuation.bracket
 
 ["forall" "default" "doc"] @keyword
-["if" "then" "else" "switch"] @keyword.control.conditional
+["if" "then" "else" "match"] @keyword.control.conditional
 "import" @keyword.control.import
 
 (infix_expr
diff --git a/runtime/queries/nickel/injections.scm b/runtime/queries/nickel/injections.scm
new file mode 100644
index 000000000000..9f00b90a1a67
--- /dev/null
+++ b/runtime/queries/nickel/injections.scm
@@ -0,0 +1,3 @@
+(annot_atom doc: (static_string)
+            @injection.content
+            (#set! injection.language "markdown"))

From e4436d92c9a2af6d09dd8d91f322631b920f001f Mon Sep 17 00:00:00 2001
From: Viktor Kleen <viktor@kleen.org>
Date: Wed, 17 May 2023 12:31:20 +0000
Subject: [PATCH 3/4] nickel: single-quote is not a paired delimiter

---
 languages.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/languages.toml b/languages.toml
index 4953782b10ea..1fcb41d03035 100644
--- a/languages.toml
+++ b/languages.toml
@@ -575,6 +575,12 @@ comment-token = "#"
 language-server = { command = "nls" }
 indent = { tab-width = 2, unit = "  " }
 
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+
 [[grammar]]
 name = "nickel"
 source = { git = "https://github.com/nickel-lang/tree-sitter-nickel", rev = "3a794388773f2424a97b2186828aa3fac4c66ce6" }

From 995e27bbbf9f092a9f7e98f6472da19bf945aebf Mon Sep 17 00:00:00 2001
From: Viktor Kleen <viktor@kleen.org>
Date: Sat, 20 May 2023 10:45:53 +0000
Subject: [PATCH 4/4] nickel: update indentation queries

---
 runtime/queries/nickel/indents.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/nickel/indents.scm b/runtime/queries/nickel/indents.scm
index 8be5a6bd2f4d..0a428448cabf 100644
--- a/runtime/queries/nickel/indents.scm
+++ b/runtime/queries/nickel/indents.scm
@@ -1,7 +1,7 @@
 [
   (fun_expr)
   (let_expr)
-  (switch_expr)
+  (match_expr)
   (ite_expr)
 
   (uni_record)