feat(tree-sitter): Add XML support (lapce#1554)

* Added XML syntax highlighting support. * feat(tree_sitter_xml); Updated CHANGELOG.md Co-authored-by: Dorian 'RenjiSann' Péron <dodo.savenay@gmail.com>
taraio · Oct 19, 2022 · b0f1620 · b0f1620
1 parent 64bf5eb
commit b0f1620
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features/Changes
 
+- [#272](https://github.com/lapce/issue/272): Added XML language support
 - [#1472](https://github.com/lapce/lapce/pull/1472) Added SQL language support
 - [#1531](https://github.com/lapce/lapce/pull/1531): Improved Ctrl+Left command on spaces at the beginning of a line
 - [#1491](https://github.com/lapce/lapce/pull/1491): Added Vim shift+c to delete remainder of line

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lapce-core/Cargo.toml b/lapce-core/Cargo.toml
@@ -66,6 +66,7 @@ tree-sitter-toml = { version = "0.20.0", optional = true }
 tree-sitter-typescript = { version = "0.20.0", optional = true }
 tree-sitter-vue = { version = "0.0.3", optional = true }
 tree-sitter-wgsl = { git = "https://github.com/szebniok/tree-sitter-wgsl", branch = "master", optional = true }
+tree-sitter-xml = { git = "https://github.com/RenjiSann/tree-sitter-xml", branch = "main", optional = true}
 tree-sitter-yaml = { git = "https://github.com/panekj/tree-sitter-yaml", branch = "master", optional = true }
 tree-sitter-zig = { git = "https://github.com/maxxnino/tree-sitter-zig", branch = "main", optional = true }
 # switch to upstream version after this is merged  https://github.com/m-novikov/tree-sitter-sql/pull/68
@@ -118,5 +119,6 @@ lang-typescript = ["dep:tree-sitter-typescript"]
 lang-vue = ["dep:tree-sitter-vue"]
 lang-wgsl = ["dep:tree-sitter-wgsl"]
 lang-yaml = ["dep:tree-sitter-yaml"]
+lang-xml = ["dep:tree-sitter-xml"]
 lang-zig = ["dep:tree-sitter-zig"]
 lang-sql = ["dep:tree-sitter-sql"]
diff --git a/lapce-core/src/language.rs b/lapce-core/src/language.rs
@@ -202,6 +202,8 @@ pub enum LapceLanguage {
     Vue,
     #[cfg(feature = "lang-wgsl")]
     Wgsl,
+    #[cfg(feature = "lang-xml")]
+    Xml,
     #[cfg(feature = "lang-yaml")]
     Yaml,
     #[cfg(feature = "lang-zig")]
@@ -793,6 +795,18 @@ const LANGUAGES: &[SyntaxProperties] = &[
         sticky_headers: &[],
         extensions: &["wgsl"],
     },
+    #[cfg(feature = "lang-xml")]
+    SyntaxProperties {
+        id: LapceLanguage::Xml,
+        language: tree_sitter_xml::language,
+        highlight: tree_sitter_xml::HIGHLIGHTS_QUERY,
+        injection: None,
+        comment: "//",
+        indent: "    ",
+        code_lens: (DEFAULT_CODE_LENS_LIST, DEFAULT_CODE_LENS_IGNORE_LIST),
+        sticky_headers: &[],
+        extensions: &["xml"],
+    },
     #[cfg(feature = "lang-yaml")]
     SyntaxProperties {
         id: LapceLanguage::Yaml,

diff --git a/lapce-core/src/syntax/highlight.rs b/lapce-core/src/syntax/highlight.rs
@@ -98,6 +98,7 @@ declare_language_highlights!(
     Typescript: "lang-typescript",
     Vue: "lang-vue",
     Wgsl: "lang-wgsl",
+    Xml: "lang-xml",
     Yaml: "lang-yaml",
     Zig: "lang-zig",
 );

diff --git a/lapce-ui/Cargo.toml b/lapce-ui/Cargo.toml
@@ -89,6 +89,7 @@ all-languages = [
     "lang-typescript",
     "lang-vue",
     "lang-wgsl",
+    "lang-xml",
     "lang-yaml",
     "lang-zig",
     "lang-sql",
@@ -136,5 +137,6 @@ lang-toml = ["lapce-core/lang-toml"]
 lang-typescript = ["lapce-core/lang-typescript"]
 lang-vue = ["lapce-core/lang-vue"]
 lang-wgsl = ["lapce-core/lang-wgsl"]
+lang-xml = ["lapce-core/lang-xml"]
 lang-yaml = ["lapce-core/lang-yaml"]
 lang-zig = ["lapce-core/lang-zig"]