sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename interpolation_identifier

pull/659/head
Johannes Coetzee 2023-07-20 14:42:40 +07:00
parent f1c0764722
commit dda875eae9
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
corpus/expressions.txt
Unescape Escape View File

@ -706,9 +706,9 @@ def matchTest(x: Int): String = x match {
(identifier) (identifier)
(interpolated_string (interpolated_string
(interpolation (interpolation
(dollar_identifier)) (interpolation_identifier))
(interpolation (interpolation
(dollar_identifier)))) (interpolation_identifier))))
(infix_expression (infix_expression
(identifier) (identifier)
(operator_identifier) (operator_identifier)

14
corpus/literals.txt
Unescape Escape View File

@ -53,7 +53,7 @@ val string7 = s"$$ $a"
(identifier) (identifier)
(interpolated_string (interpolated_string
(interpolation (interpolation
(dollar_identifier)) (interpolation_identifier))
(interpolation (interpolation
(block (block
(identifier)))))) (identifier))))))
@ -63,7 +63,7 @@ val string7 = s"$$ $a"
(identifier) (identifier)
(interpolated_string (interpolated_string
(interpolation (interpolation
(dollar_identifier))))) (interpolation_identifier)))))
(val_definition (val_definition
(identifier) (identifier)
(interpolated_string_expression (interpolated_string_expression
@ -86,28 +86,28 @@ val string7 = s"$$ $a"
(identifier) (identifier)
(interpolated_string (interpolated_string
(interpolation (interpolation
(dollar_identifier)) (interpolation_identifier))
(interpolation (interpolation
(block (block
(identifier))) (identifier)))
(interpolation (interpolation
(dollar_identifier))))) (interpolation_identifier)))))
(val_definition (val_definition
(identifier) (identifier)
(interpolated_string_expression (interpolated_string_expression
(identifier) (identifier)
(interpolated_string (interpolated_string
(interpolation (interpolation
(dollar_identifier)) (interpolation_identifier))
(interpolation (interpolation
(dollar_identifier))))) (interpolation_identifier)))))
(val_definition (val_definition
(identifier) (identifier)
(interpolated_string_expression (interpolated_string_expression
(identifier) (identifier)
(interpolated_string (interpolated_string
(interpolation (interpolation
(dollar_identifier)))))) (interpolation_identifier))))))
================================================================================ ================================================================================

6
corpus/patterns.txt
Unescape Escape View File

@ -104,13 +104,13 @@ def showNotification(notification: Notification): String = {
(match_expression (identifier) (case_block (match_expression (identifier) (case_block
(case_clause (case_clause
(case_class_pattern (type_identifier) (identifier) (identifier) (wildcard)) (case_class_pattern (type_identifier) (identifier) (identifier) (wildcard))
(interpolated_string_expression (identifier) (interpolated_string (interpolation (dollar_identifier)) (interpolation (dollar_identifier))))) (interpolated_string_expression (identifier) (interpolated_string (interpolation (interpolation_identifier)) (interpolation (interpolation_identifier)))))
(case_clause (case_clause
(case_class_pattern (type_identifier) (identifier) (identifier)) (case_class_pattern (type_identifier) (identifier) (identifier))
(interpolated_string_expression (identifier) (interpolated_string (interpolation (dollar_identifier)) (interpolation (dollar_identifier))))) (interpolated_string_expression (identifier) (interpolated_string (interpolation (interpolation_identifier)) (interpolation (interpolation_identifier)))))
(case_clause (case_clause
(case_class_pattern (type_identifier) (identifier) (identifier)) (case_class_pattern (type_identifier) (identifier) (identifier))
(interpolated_string_expression (identifier) (interpolated_string (interpolation (dollar_identifier)) (interpolation (dollar_identifier)))))))))) (interpolated_string_expression (identifier) (interpolated_string (interpolation (interpolation_identifier)) (interpolation (interpolation_identifier))))))))))
============================ ============================
Infix patterns Infix patterns

4
grammar.js
Unescape Escape View File

@ -1405,7 +1405,7 @@ module.exports = grammar({
* suffix and can be approximated as * suffix and can be approximated as
* /[A-Za-z_][A-Z_a-z0-9]/; * /[A-Za-z_][A-Z_a-z0-9]/;
*/ */
dollar_identifier: $ => interpolation_identifier: $ =>
/[\p{Lu}\p{Lt}\p{Nl}\p{Lo}\p{Lm}\p{Ll}_\u00AA\u00BB\u02B0-\u02B8\u02C0-\u02C1\u02E0-\u02E4\u037A\u1D78\u1D9B-\u1DBF\u2071\u207F\u2090-\u209C\u2C7C-\u2C7D\uA69C-\uA69D\uA770\uA7F8-\uA7F9\uAB5C-\uAB5F][\p{Lu}\p{Lt}\p{Nl}\p{Lo}\p{Lm}\p{Ll}_\u00AA\u00BB\u02B0-\u02B8\u02C0-\u02C1\u02E0-\u02E4\u037A\u1D78\u1D9B-\u1DBF\u2071\u207F\u2090-\u209C\u2C7C-\u2C7D\uA69C-\uA69D\uA770\uA7F8-\uA7F9\uAB5C-\uAB5F0-9_\p{Ll}]*/, /[\p{Lu}\p{Lt}\p{Nl}\p{Lo}\p{Lm}\p{Ll}_\u00AA\u00BB\u02B0-\u02B8\u02C0-\u02C1\u02E0-\u02E4\u037A\u1D78\u1D9B-\u1DBF\u2071\u207F\u2090-\u209C\u2C7C-\u2C7D\uA69C-\uA69D\uA770\uA7F8-\uA7F9\uAB5C-\uAB5F][\p{Lu}\p{Lt}\p{Nl}\p{Lo}\p{Lm}\p{Ll}_\u00AA\u00BB\u02B0-\u02B8\u02C0-\u02C1\u02E0-\u02E4\u037A\u1D78\u1D9B-\u1DBF\u2071\u207F\u2090-\u209C\u2C7C-\u2C7D\uA69C-\uA69D\uA770\uA7F8-\uA7F9\uAB5C-\uAB5F0-9_\p{Ll}]*/,
_backquoted_id: $ => /`[^\n`]+`/, _backquoted_id: $ => /`[^\n`]+`/,
@ -1514,7 +1514,7 @@ module.exports = grammar({
_dollar_escape: $ => seq('$', '$'), _dollar_escape: $ => seq('$', '$'),
interpolation: $ => seq("$", choice($.dollar_identifier, $.block)), interpolation: $ => seq("$", choice($.interpolation_identifier, $.block)),
interpolated_string: $ => interpolated_string: $ =>
choice( choice(

2
queries/scala/highlights.scm
Unescape Escape View File

@ -25,7 +25,7 @@
(self_type (identifier) @parameter) (self_type (identifier) @parameter)
(interpolation (dollar_identifier) @none) (interpolation (interpolation_identifier) @none)
(interpolation (block) @none) (interpolation (block) @none)
;; types ;; types

2
queries/scala/locals.scm
Unescape Escape View File

@ -28,4 +28,4 @@
(identifier) @local.reference (identifier) @local.reference
(dollar_identifier) @local.reference (interpolation_identifier) @local.reference