From e5f0d5ca1194e8b54aed8b092d0a2297e0119e40 Mon Sep 17 00:00:00 2001
From: Hannes <33062605+HannesGitH@users.noreply.github.com>
Date: Thu, 22 May 2025 12:15:28 +0200
Subject: [PATCH 1/2] update tree-sitter-dart to the upstream, maintained
 version

---
 Cargo.lock | 5 ++---
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f2e31de..d0ce8fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1008,9 +1008,8 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-dart"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19f1f70b80ce41343e14aafcef67b5ba2e9de89587535b4aabbabb8036f4e38a"
+version = "0.0.1"
+source = "git+https://github.com/cfping/tree-sitter-dart#1f66f40b7fb2ae7d1d759c9c7024a6b285cea49f"
 dependencies = [
  "cc",
  "tree-sitter",
diff --git a/Cargo.toml b/Cargo.toml
index b66e306..e1d42a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ tree-sitter-xml = "0.7.0"
 tree-sitter-go = "0.23.4"
 tree-sitter-gomod-orchard = "0.4"
 tree-sitter-gosum-orchard = "0.2"
-tree-sitter-dart = "0.0.4"
+tree-sitter-dart = { git = "https://github.com/cfping/tree-sitter-dart"} # temporary fork, better use upstream: https://github.com/UserNobody14/tree-sitter-dart when they update their tree-sitter to 0.25
 tree-sitter-typescript = "0.23.2"
 tree-sitter-python = "0.23.6"
 tree-sitter-php = "0.23"
-- 
2.47.3


From 8dd701eeb773e0072086915991ffbe58caad99cd Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Fri, 1 Aug 2025 23:07:20 +0200
Subject: [PATCH 2/2] Switch to tree-sitter-dart-orchard

---
 Cargo.lock             | 11 ++++++-----
 Cargo.toml             |  2 +-
 src/supported_langs.rs |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d0ce8fc..1102226 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -546,7 +546,7 @@ dependencies = [
  "tree-sitter",
  "tree-sitter-c-sharp",
  "tree-sitter-cpp",
- "tree-sitter-dart",
+ "tree-sitter-dart-orchard",
  "tree-sitter-devicetree",
  "tree-sitter-elixir",
  "tree-sitter-go",
@@ -1007,12 +1007,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "tree-sitter-dart"
-version = "0.0.1"
-source = "git+https://github.com/cfping/tree-sitter-dart#1f66f40b7fb2ae7d1d759c9c7024a6b285cea49f"
+name = "tree-sitter-dart-orchard"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf9973e9fe08eca1985da9e670cdf039909002d4f51bddefd8ee167ba6731ec"
 dependencies = [
  "cc",
- "tree-sitter",
+ "tree-sitter-language",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e1d42a5..9ee6bee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ tree-sitter-xml = "0.7.0"
 tree-sitter-go = "0.23.4"
 tree-sitter-gomod-orchard = "0.4"
 tree-sitter-gosum-orchard = "0.2"
-tree-sitter-dart = { git = "https://github.com/cfping/tree-sitter-dart"} # temporary fork, better use upstream: https://github.com/UserNobody14/tree-sitter-dart when they update their tree-sitter to 0.25
+tree-sitter-dart-orchard = "0.1"
 tree-sitter-typescript = "0.23.2"
 tree-sitter-python = "0.23.6"
 tree-sitter-php = "0.23"
diff --git a/src/supported_langs.rs b/src/supported_langs.rs
index b1ebdff..a773e53 100644
--- a/src/supported_langs.rs
+++ b/src/supported_langs.rs
@@ -705,7 +705,7 @@ pub static SUPPORTED_LANGUAGES: LazyLock<Vec<LangProfile>> = LazyLock::new(|| {
             alternate_names: &[],
             extensions: vec!["dart"],
             file_names: vec![],
-            language: tree_sitter_dart::language(),
+            language: tree_sitter_dart_orchard::LANGUAGE.into(),
             atomic_nodes: vec!["import_or_export"],
             commutative_parents: vec![
                 CommutativeParent::without_delimiters("program", "\n"),
-- 
2.47.3