[feat]: Add Dart Language Grammar (#35)

* add TreeSitterDart, update languages

* regenerate framework

* add Dart to CodeEditLanguages

* update file extensions

* remove no longer needed test case

Author: lukepistrol

.swiftpm/xcode/xcshareddata/xcschemes/CodeEditLanguages.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		2846B262296BA1CF005F60B6 /* TreeSitterDockerfile in Frameworks */ = {isa = PBXBuildFile; productRef = 2846B261296BA1CF005F60B6 /* TreeSitterDockerfile */; };
 		285BF67329AAA45B00641989 /* TreeSitterLua in Frameworks */ = {isa = PBXBuildFile; productRef = 285BF67229AAA45B00641989 /* TreeSitterLua */; };
 		2886C788298135540023E016 /* TreeSitterKotlin in Frameworks */ = {isa = PBXBuildFile; productRef = 2886C787298135540023E016 /* TreeSitterKotlin */; };
+		28AAB6AE29CA57D40087654B /* TreeSitterDart in Frameworks */ = {isa = PBXBuildFile; productRef = 28AAB6AD29CA57D40087654B /* TreeSitterDart */; };
 		28B3F010290C207D000CD04D /* CodeLanguages_Container.h in Headers */ = {isa = PBXBuildFile; fileRef = 28B3F00F290C207D000CD04D /* CodeLanguages_Container.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		28B3F02D290C35D9000CD04D /* TreeSitterC in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F02C290C35D9000CD04D /* TreeSitterC */; };
 		28B3F030290C35F9000CD04D /* TreeSitterCPP in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F02F290C35F9000CD04D /* TreeSitterCPP */; };
@@ -68,6 +69,7 @@
 				28B3F063290C372D000CD04D /* TreeSitterZig in Frameworks */,
 				28B3F045290C366E000CD04D /* TreeSitterHTML in Frameworks */,
 				28B3F05A290C36E5000CD04D /* TreeSitterRust in Frameworks */,
+				28AAB6AE29CA57D40087654B /* TreeSitterDart in Frameworks */,
 				28B3F054290C36C5000CD04D /* TreeSitterPython in Frameworks */,
 				28171CB829814CD800523F1C /* TreeSitterObjC in Frameworks */,
 				28B3F048290C367C000CD04D /* TreeSitterJava in Frameworks */,
@@ -178,6 +180,7 @@
 				282C119229AA32C8004F1EA6 /* TreeSitterSQL */,
 				285BF67229AAA45B00641989 /* TreeSitterLua */,
 				6CEC70FD29C3A85000B61C7A /* TreeSitterRegex */,
+				28AAB6AD29CA57D40087654B /* TreeSitterDart */,
 			);
 			productName = "CodeLanguages-Container";
 			productReference = 28B3F00C290C207D000CD04D /* CodeLanguages_Container.framework */;
@@ -190,7 +193,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastUpgradeCheck = 1410;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					28B3F00B290C207D000CD04D = {
 						CreatedOnToolsVersion = 14.1;
@@ -235,6 +238,7 @@
 				282C119129AA32C8004F1EA6 /* XCRemoteSwiftPackageReference "tree-sitter-sql" */,
 				285BF67129AAA45B00641989 /* XCRemoteSwiftPackageReference "tree-sitter-lua" */,
 				6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */,
+				28AAB6AC29CA57D40087654B /* XCRemoteSwiftPackageReference "tree-sitter-dart" */,
 			);
 			productRefGroup = 28B3F00D290C207D000CD04D /* Products */;
 			projectDirPath = "";
@@ -300,6 +304,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -363,6 +368,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -394,11 +400,13 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -409,6 +417,8 @@
 				);
 				MACH_O_TYPE = staticlib;
 				MARKETING_VERSION = 1.0;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.lukaspistrol.CodeLanguages-Container";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -427,11 +437,13 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -442,6 +454,8 @@
 				);
 				MACH_O_TYPE = staticlib;
 				MARKETING_VERSION = 1.0;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.lukaspistrol.CodeLanguages-Container";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -522,6 +536,14 @@
 				kind = branch;
 			};
 		};
+		28AAB6AC29CA57D40087654B /* XCRemoteSwiftPackageReference "tree-sitter-dart" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/lukepistrol/tree-sitter-dart.git";
+			requirement = {
+				branch = feature/spm;
+				kind = branch;
+			};
+		};
 		28B3F02B290C35D9000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-c" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/tree-sitter/tree-sitter-c.git";
@@ -723,6 +745,11 @@
 			package = 2886C786298135540023E016 /* XCRemoteSwiftPackageReference "tree-sitter-kotlin" */;
 			productName = TreeSitterKotlin;
 		};
+		28AAB6AD29CA57D40087654B /* TreeSitterDart */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 28AAB6AC29CA57D40087654B /* XCRemoteSwiftPackageReference "tree-sitter-dart" */;
+			productName = TreeSitterDart;
+		};
 		28B3F02C290C35D9000CD04D /* TreeSitterC */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 28B3F02B290C35D9000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-c" */;

CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -27,6 +27,7 @@ extern TSLanguage *tree_sitter_c();
 extern TSLanguage *tree_sitter_cpp();
 extern TSLanguage *tree_sitter_c_sharp();
 extern TSLanguage *tree_sitter_css();
+extern TSLanguage *tree_sitter_dart();
 extern TSLanguage *tree_sitter_dockerfile();
 extern TSLanguage *tree_sitter_elixir();
 extern TSLanguage *tree_sitter_go();

CodeLanguages-Container/CodeLanguages-Container/CodeLanguages_Container.h

@@ -53,6 +53,7 @@ In order to add support for additional languages we have a complete guide on how
 | [C++](https://github.com/tree-sitter/tree-sitter-cpp) | ✅ | ✅ |
 | [C#](https://github.com/tree-sitter/tree-sitter-c-sharp) | ✅ | ✅ |
 | [CSS](https://github.com/lukepistrol/tree-sitter-css) | ✅ | ✅ |
+| [Dart](https://github.com/lukepistrol/tree-sitter-dart/tree/feature/spm) | ✅ | ✅ |
 | [Dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | ✅ | ✅ |
 | [Elixir](https://github.com/elixir-lang/tree-sitter-elixir) | ✅ | ✅ |
 | [ERB, EJS](https://github.com/tree-sitter/tree-sitter-embedded-template) |  |  |

CodeLanguagesContainer.xcframework.zip

@@ -16,6 +16,7 @@ public extension CodeLanguage {
         .cpp,
         .cSharp,
         .css,
+        .dart,
         .dockerfile,
         .elixir,
         .go,
@@ -46,21 +47,21 @@ public extension CodeLanguage {
     static let bash: CodeLanguage = .init(
         id: .bash,
         tsName: "bash",
-        extensions: ["sh"]
+        extensions: ["sh", "bash"]
     )
 
     /// A language structure for `C`
     static let c: CodeLanguage = .init(
         id: .c,
         tsName: "c",
-        extensions: ["c", "h", "o"]
+        extensions: ["c", "h"]
     )
 
     /// A language structure for `C++`
     static let cpp: CodeLanguage = .init(
         id: .cpp,
         tsName: "cpp",
-        extensions: ["cpp", "h", "hpp", "cc"],
+        extensions: ["cc", "cpp", "hpp", "h"],
         parentURL: CodeLanguage.c.queryURL,
         highlights: ["injections"]
     )
@@ -79,6 +80,13 @@ public extension CodeLanguage {
         extensions: ["css"]
     )
 
+    /// A language structure for `Dart`
+    static let dart: CodeLanguage = .init(
+        id: .dart,
+        tsName: "dart",
+        extensions: ["dart"]
+    )
+
     /// A language structure for `Dockerfile`
     static let dockerfile: CodeLanguage = .init(
         id: .dockerfile,
@@ -172,7 +180,7 @@ public extension CodeLanguage {
     static let objc: CodeLanguage = .init(
         id: .objc,
         tsName: "objc",
-        extensions: ["m"]
+        extensions: ["m", "h"]
     )
 
     /// A language structure for `OCaml`

README.md

@@ -76,6 +76,8 @@ public struct CodeLanguage {
             return tree_sitter_c_sharp()
         case .css:
             return tree_sitter_css()
+        case .dart:
+            return tree_sitter_dart()
         case .dockerfile:
             return tree_sitter_dockerfile()
         case .elixir:

Sources/CodeEditLanguages/CodeLanguage+Definitions.swift

@@ -24,6 +24,7 @@ let language = CodeLanguage.detectLanguageFrom(url: fileURL)
 - C++
 - C#
 - CSS
+- Dart
 - Dockerfile
 - Elixir
 - Go
@@ -73,6 +74,7 @@ let language = CodeLanguage.detectLanguageFrom(url: fileURL)
 - ``cpp``
 - ``cSharp``
 - ``css``
+- ``dart``
 - ``dockerfile``
 - ``elixir``
 - ``go``

Sources/CodeEditLanguages/CodeLanguage.swift

@@ -37,6 +37,7 @@ let query = TreeSitterModel.shared.swiftQuery
 - ``cppQuery``
 - ``cSharpQuery``
 - ``cssQuery``
+- ``dartQuery``
 - ``dockerfileQuery``
 - ``elixirQuery``
 - ``goQuery``