Version 0.6.0 - add interpolated string support

This lacks any support for queries, but at least the grammar
will not be utterly confused.

Author: gdamore

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-d"
 description = "d grammar for the tree-sitter parsing library"
-version = "0.5.1"
+version = "0.6.0"
 keywords = ["incremental", "parsing", "d"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/gdamore/tree-sitter-d"

Makefile

@@ -107,7 +107,7 @@ clean:
 test:
 	$(TS) test
 
-version: pyproject_version cargo_version
+version: pyproject_version cargo_version pkgconfig_version
 
 pyproject_version:
 	sed -e 's|^version = ".*"|version = "$(VERSION)"|' < pyproject.toml > pyproject.toml.new
@@ -117,4 +117,8 @@ cargo_version:
 	sed -e 's|^version = ".*"|version = "$(VERSION)"|' < Cargo.toml > Cargo.toml.new
 	mv Cargo.toml.new Cargo.toml
 
+pkgconfig_version:
+	sed -e 's|^Version: .*|Version: $(VERSION)|' < $(LANGUAGE_NAME).pc > $(LANGUAGE_NAME).pc.new
+	mv $(LANGUAGE_NAME).pc.new $(LANGUAGE_NAME).pc
+
 .PHONY: all install uninstall clean test version pyproject_version cargo_version

VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

grammar.js

@@ -1214,11 +1214,7 @@ module.exports = grammar({
 
     raw_string: ($) =>
       choice(
-        seq(
-          "`",
-          token.immediate(prec(1, /[^`]*/)),
-          token.immediate(/`[cdw]?/),
-        ),
+        seq("`", token.immediate(prec(1, /[^`]*/)), token.immediate(/`[cdw]?/)),
         seq(
           'r"',
           token.immediate(prec(1, /[^"]*/)),
@@ -1240,6 +1236,46 @@ module.exports = grammar({
         token.immediate(/"[cdw]?/),
       ),
 
+    // interpolated strings
+    interpolation_expression: ($) => seq("$(", $.expression, ")"),
+
+    interpolated_raw_string: ($) =>
+      seq(
+        "i`",
+        repeat(choice(/[^`$]+/, /\$[^(`]/, $.interpolation_expression)),
+        choice("`", "$`"), // tailing "$" special
+      ),
+
+    interpolated_escape: ($) => "\\$",
+
+    interpolated_quoted_string: ($) =>
+      seq(
+        'i"',
+        repeat(
+          choice(
+            /[^"$\\]+/,
+            /\$[^(]/,
+            $.escape_sequence,
+            $.interpolated_escape,
+            $.interpolation_expression,
+          ),
+        ),
+        choice('"', '$"'), // tailing "$" special
+      ),
+
+    interpolated_token_string: ($) =>
+      seq("iq{", optional($._i_token_string_tokens), "}"),
+
+    // we aren't tokenizing this yet
+    _i_token_string_tokens: ($) =>
+      repeat1(choice($._token_string_token, $.interpolation_expression)),
+
+    _i_token_string_token: ($) =>
+      choice(
+        seq("{", optional($._i_token_string_tokens), "}"),
+        choice($._token_no_braces, $.interpolation_expression),
+      ),
+
     // string literal stuff
     string_literal: ($) =>
       choice(
@@ -1248,6 +1284,9 @@ module.exports = grammar({
         $.hex_string,
         $.quoted_string,
         $.token_string,
+        $.interpolated_raw_string,
+        $.interpolated_quoted_string,
+        $.interpolated_token_string,
       ),
 
     char_literal: ($) => choice(/'[^\\']'/, seq("'", $.escape_sequence, "'")),

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tree-sitter-d"
 description = "D grammar for tree-sitter"
-version = "0.5.1"
+version = "0.6.0"
 keywords = ["incremental", "parsing", "tree-sitter", "d"]
 classifiers = [
   "Intended Audience :: Developers",