From 856fcdc59c86a8d654d84f2d29ee367c47887534 Mon Sep 17 00:00:00 2001
From: James Stout <james.wolf.stout@gmail.com>
Date: Mon, 14 Oct 2024 20:42:41 -0700
Subject: [PATCH 1/2] Add test for recently fixed Kotlin parse.

---
 .../recorded/languages/kotlin/changeCall5.yml | 33 +++++++++++++++++++
 queries/kotlin.scm                            |  1 -
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 data/fixtures/recorded/languages/kotlin/changeCall5.yml

diff --git a/data/fixtures/recorded/languages/kotlin/changeCall5.yml b/data/fixtures/recorded/languages/kotlin/changeCall5.yml
new file mode 100644
index 0000000000..81ff62b2b9
--- /dev/null
+++ b/data/fixtures/recorded/languages/kotlin/changeCall5.yml
@@ -0,0 +1,33 @@
+languageId: kotlin
+command:
+  version: 7
+  spokenForm: change call
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionCall}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    fun main() {
+        val s = "test"
+        val l = with (s) { length }
+        println(l)
+    }
+  selections:
+    - anchor: {line: 2, character: 14}
+      active: {line: 2, character: 14}
+  marks: {}
+finalState:
+  documentContents: |-
+    fun main() {
+        val s = "test"
+        val l = 
+        println(l)
+    }
+  selections:
+    - anchor: {line: 2, character: 12}
+      active: {line: 2, character: 12}
diff --git a/queries/kotlin.scm b/queries/kotlin.scm
index 3578b229ff..6375eb9067 100644
--- a/queries/kotlin.scm
+++ b/queries/kotlin.scm
@@ -509,7 +509,6 @@
   (annotated_lambda) @argumentOrParameter
 )
 
-;; Note: trailing lambda mixed with regular arguments doesn't work due to bad tree sitter parse.
 (call_expression
   (call_suffix) @argumentOrParameter.iteration
 ) @argumentOrParameter.iteration.domain

From fb449f8c16201e2da5c3f1a081f3abdbd11cb820 Mon Sep 17 00:00:00 2001
From: James Stout <james.wolf.stout@gmail.com>
Date: Mon, 14 Oct 2024 20:47:27 -0700
Subject: [PATCH 2/2] Added test for Kotlin referring to null node.

---
 .../languages/kotlin/changeValue13.yml        | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 data/fixtures/recorded/languages/kotlin/changeValue13.yml

diff --git a/data/fixtures/recorded/languages/kotlin/changeValue13.yml b/data/fixtures/recorded/languages/kotlin/changeValue13.yml
new file mode 100644
index 0000000000..f86d7e0948
--- /dev/null
+++ b/data/fixtures/recorded/languages/kotlin/changeValue13.yml
@@ -0,0 +1,31 @@
+languageId: kotlin
+command:
+  version: 7
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    fun main() {
+        val n = null
+        println(n)
+    }
+  selections:
+    - anchor: {line: 1, character: 8}
+      active: {line: 1, character: 8}
+  marks: {}
+finalState:
+  documentContents: |-
+    fun main() {
+        val n = 
+        println(n)
+    }
+  selections:
+    - anchor: {line: 1, character: 12}
+      active: {line: 1, character: 12}