fix: resolve conflict

jcs090218 · jcs090218 · commit 6672bf19df40 · 2025-12-29T16:04:05.000+08:00
diff --git a/.github/workflows/update-grammars.yml b/.github/workflows/update-grammars.yml
@@ -56,6 +56,7 @@ jobs:
           - gleam
           - glsl
           - go
+          - go-mod
           - gpr
           - graphql
           - groovy
diff --git a/.gitmodules b/.gitmodules
@@ -673,3 +673,9 @@
 	branch = main
 	update = none
 	ignore = dirty
+[submodule "repos/go-mod"]
+	path = repos/go-mod
+	url = https://github.com/camdencheek/tree-sitter-go-mod
+	update = none
+	ignore = dirty
+	branch = main
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+- Add `Go Mod` support
 
 ## 0.12.358 - 2025-12-29
 
diff --git a/queries/go-mod/highlights.scm b/queries/go-mod/highlights.scm
@@ -0,0 +1,18 @@
+[
+  "require"
+  "replace"
+  "go"
+  "toolchain"
+  "exclude"
+  "retract"
+  "module"
+] @keyword
+
+"=>" @operator
+
+(comment) @comment
+
+[
+(version)
+(go_version)
+] @string
diff --git a/repos/go-mod b/repos/go-mod
@@ -0,0 +1 @@
+Subproject commit 2e886870578eeba1927a2dc4bd2e2b3f598c5f9a
diff --git a/tree-sitter-langs.el b/tree-sitter-langs.el
@@ -144,6 +144,7 @@ See `tree-sitter-langs-repos'."
                  (gleam-mode             . gleam)
                  (glsl-mode              . glsl)
                  (go-mode                . go)
+                 (go-dot-mod-mode        . go-mod)
                  (gpr-mode               . gpr)
                  (graphql-mode           . graphql)
                  (groovy-mode            . groovy)

-Original file line number
+Diff line change
           - gleam
           - glsl
           - go
 +          - go-mod
           - gpr
           - graphql
           - groovy