Add support for D

build.rs

@@ -82,6 +82,11 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-cmake-src",
             extra_files: vec!["scanner.c"],
         },
+        TreeSitterParser {
+            name: "tree-sitter-d",
+            src_dir: "vendored_parsers/tree-sitter-d-src",
+            extra_files: vec!["scanner.c"],
+        },
         TreeSitterParser {
             name: "tree-sitter-dart",
             src_dir: "vendored_parsers/tree-sitter-dart-src",

src/parse/guess_language.rs

@@ -28,6 +28,7 @@ pub(crate) enum Language {
     CPlusPlus,
     CSharp,
     Css,
+    D,
     Dart,
     DeviceTree,
     Elixir,
@@ -128,6 +129,7 @@ pub(crate) fn language_name(language: Language) -> &'static str {
         CPlusPlus => "C++",
         CSharp => "C#",
         Css => "CSS",
+        D => "D",
         Dart => "Dart",
         DeviceTree => "Device Tree",
         Elixir => "Elixir",
@@ -258,6 +260,7 @@ pub(crate) fn language_globs(language: Language) -> Vec<glob::Pattern> {
         ],
         CSharp => &["*.cs"],
         Css => &["*.css"],
+        D => &["*.d", "*.di"],
         Dart => &["*.dart"],
         DeviceTree => &["*.dts", "*.dtsi", "*.dtso", "*.its"],
         Elm => &["*.elm"],

src/parse/tree_sitter_parser.rs

@@ -73,6 +73,7 @@ extern "C" {
     fn tree_sitter_apex() -> ts::Language;
     fn tree_sitter_clojure() -> ts::Language;
     fn tree_sitter_cmake() -> ts::Language;
+    fn tree_sitter_d() -> ts::Language;
     fn tree_sitter_dart() -> ts::Language;
     fn tree_sitter_devicetree() -> ts::Language;
     fn tree_sitter_elisp() -> ts::Language;
@@ -278,6 +279,20 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
                 sub_languages: vec![],
             }
         }
+        D => {
+            let language = unsafe { tree_sitter_d() };
+            TreeSitterConfig {
+                language: language.clone(),
+                atom_nodes: ["string_literal", "char_literal"].into_iter().collect(),
+                delimiter_tokens: vec![("(", ")"), ("{", "}"), ("[", "]")],
+                highlight_query: ts::Query::new(
+                    &language,
+                    include_str!("../../vendored_parsers/highlights/d.scm"),
+                )
+                .unwrap(),
+                sub_languages: vec![],
+            }
+        }
         Dart => {
             let language = unsafe { tree_sitter_dart() };
             TreeSitterConfig {

vendored_parsers/tree-sitter-d/.clang-format

@@ -0,0 +1,16 @@
+BasedOnStyle: WebKit
+UseTab: ForIndentation
+IndentWidth: 8
+ColumnLimit: 79
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignTrailingComments: true
+AlignEscapedNewlines: Left
+PointerAlignment: Right
+DerivePointerAlignment: false
+ForEachMacros: ['NNI_LIST_FOREACH']
+AlwaysBreakAfterReturnType: TopLevelDefinitions
+SpaceAfterCStyleCast: true
+AllowShortFunctionsOnASingleLine: Inline
+BreakBeforeBinaryOperators: None
+TabWidth: 8

vendored_parsers/tree-sitter-d/.editorconfig

@@ -0,0 +1,39 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{json,toml,yml,gyp}]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.rs]
+indent_style = space
+indent_size = 4
+
+[*.{c,cc,h}]
+indent_style = space
+indent_size = 4
+
+[*.{py,pyi}]
+indent_style = space
+indent_size = 4
+
+[*.swift]
+indent_style = space
+indent_size = 4
+
+[*.go]
+indent_style = tab
+indent_size = 8
+
+[Makefile]
+indent_style = tab
+indent_size = 8

vendored_parsers/tree-sitter-d/.gitattributes

@@ -0,0 +1,3 @@
+/src/parser.c linguist-generated
+/src/*.json linguist-generated
+/src/tree_sitter/* linguist-vendored

vendored_parsers/tree-sitter-d/.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: [gdamore]
+tidelift: cargo/tree-sitter-d

vendored_parsers/tree-sitter-d/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.  If this is a grammar bug, please include a sample of grammar acceptable to DMD but rejected by this grammar.  For queries or highlighting issues, samples are also helpful.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+
+**Additional context**
+Add any other context about the problem here.
+Your OS, and tree-sitter version, and if you're using this in the context of another project (such as an editor that is making use of the grammar), that is useful

vendored_parsers/tree-sitter-d/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

vendored_parsers/tree-sitter-d/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: Build/test
+on:
+  push:
+    branches:
+      - "**"
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - run: npm install
+      - run: npm test

vendored_parsers/tree-sitter-d/.gitignore

@@ -0,0 +1,3 @@
+samples
+log.html
+output

vendored_parsers/tree-sitter-d/CODE_OF_CONDUCT.md

@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

vendored_parsers/tree-sitter-d/CONTRIBUTING.md

@@ -0,0 +1,58 @@
+We welcome additional contributions from the community!
+If you're thinking of contributing, here's what you should know.
+
+ 1. First check to make sure if an issue for the problem you're addressing,
+    or feature you're adding, has already been filed.  If not, file one here:
+
+	https://github.com/gdamore/tree-sitter-d/issues
+
+    Please indicate in the description of the issue that you're working on
+    the issue, so we don't duplicate effort.
+
+ 2. By submitting code to the project, you are asserting that the work is
+    either your own, or that you are authorized to submit it to this project.
+    Further, you are asserting that the project may continue to use, modify,
+    and redistribute your contribution under the terms in the LICENSE.txt file.
+
+ 3. We maintain an "always release ready" stance for the master branch.  That
+    is, at any point in time the tree should be in a state that a release
+    could be cut, and bisect should never find a point where an issue is
+    incompletely fixed or addressed.
+
+ 4. Your code must pass the CI checks.  You can test your grammar
+    using "tree-sitter test", and it must be clean.
+
+ 5. If you add content to the grammar.js, please make sure to run
+    the "npm format" script.  You will need "prettifier" to be
+    installed.
+
+ 6. If you change the scanner.c file, please observe the formatting.
+    You can format the code automatically using clang-format, and a
+    `.clang-format` file is provided for this purpose.
+
+ 7. Every issue must be fixed by at most one git commit, which shall normally
+    be identified in the first line of the commit message using the syntax
+
+	"fixes #<issue#> <exact issue synopsis>"
+
+    You can have multiple such lines if your commit addresses multiple issues,
+    but this is normally discouraged.
+
+ 8. No merge commits.  Rebase if you need to.
+
+ 9. Additional text may follow the above line(s), separated from them by an
+    empty line.  Normally this is not necessary, since the information should
+    be in the bug tracking system.  Look at the git log to see examples.
+
+10. Submit a GitHub pull request.  Ideally just one bug per PR if possible,
+    and based upon the latest commit in the GitHub master branch.
+
+11. We may rebase your changes, including squashing multiple commits,
+    or ask you to do so, if you have not followed the procedure above, or
+    if other changes have been made to the tree since you committed.
+
+12. If you wish to add a copyright notice, please do so after any
+    existing one and follow the existing style, and do not add new terms. 
+    (For example, do not add "All rights reserved.")
+
+Thank you for your contributions!

vendored_parsers/tree-sitter-d/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "tree-sitter-d"
+description = "d grammar for the tree-sitter parsing library"
+version = "0.8.2"
+keywords = ["incremental", "parsing", "d"]
+categories = ["parsing", "text-editors"]
+repository = "https://github.com/gdamore/tree-sitter-d"
+edition = "2021"
+license = "MIT"
+
+build = "bindings/rust/build.rs"
+include = [
+  "bindings/rust/*",
+  "grammar.js",
+  "queries/*",
+  "src/*",
+]
+
+[lib]
+path = "bindings/rust/lib.rs"
+
+[dependencies]
+tree-sitter-language = "0.1.0"
+
+[build-dependencies]
+cc = "1.0"

vendored_parsers/tree-sitter-d/LICENSE.txt

@@ -0,0 +1,19 @@
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.