Skip to content

Commit be931be

Browse files
authored
Merge pull request #165 from ckipp01/interpolator
feat: add an explicit interpolator field
2 parents 64aaf09 + 71b408e commit be931be

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

grammar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ module.exports = grammar({
12811281
)),
12821282

12831283
interpolated_string_expression: $ => seq(
1284-
$.identifier,
1284+
field('interpolator', $.identifier),
12851285
$.interpolated_string
12861286
),
12871287

queries/highlights.scm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
(class_parameter
2424
name: (identifier) @parameter)
2525

26-
2726
(interpolation) @none
2827

2928
;; types
@@ -33,7 +32,6 @@
3332

3433
(type_identifier) @type
3534

36-
3735
;; val/var definitions/declarations
3836

3937
(val_definition
@@ -78,7 +76,6 @@
7876

7977
; method invocation
8078

81-
8279
(call_expression
8380
function: (identifier) @function.call)
8481

@@ -96,6 +93,9 @@
9693
(generic_function
9794
function: (identifier) @function.call)
9895

96+
(interpolated_string_expression
97+
interpolator: (identifier) @function.call)
98+
9999
; function definitions
100100

101101
(function_definition

test/highlight/basics.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,9 @@ object Hello {
5454
type A = B[({ type f[x] = M[S, x] })#f]
5555
// ^keyword
5656
// ^type.definition
57+
58+
val hello = c"some $stuff"
59+
// ^function.call
60+
// ^punctuation.special
5761
}
5862

0 commit comments

Comments
 (0)