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

rename ui_qualified_id to (ui_)nested_identifier per base grammar

pull/361/head
Yuya Nishihara 2021-12-26 16:27:58 +07:00
parent 4c354bce1f
commit 5192867c58
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grammar.js
Unescape Escape View File

@ -24,7 +24,7 @@ module.exports = grammar(require('tree-sitter-typescript/typescript/grammar'), {
conflicts: ($, original) => original.concat([
[$.ui_property_modifier, $.ui_required], // required property name vs required property
[$.ui_qualified_id, $.primary_expression], // [Qualified.Obj {}] vs [member.expr]
[$.ui_nested_identifier, $.primary_expression], // Nested.Obj {} vs member.expr
]),
rules: {
@ -266,7 +266,7 @@ module.exports = grammar(require('tree-sitter-typescript/typescript/grammar'), {
// MemberExpression -> reparseAsQualifiedId()
_ui_qualified_id: $ => choice(
$._ui_identifier,
$.ui_qualified_id,
alias($.ui_nested_identifier, $.nested_identifier),
),
_ui_identifier: $ => choice(
@ -274,7 +274,7 @@ module.exports = grammar(require('tree-sitter-typescript/typescript/grammar'), {
alias($._reserved_identifier, $.identifier),
),
ui_qualified_id: $ => seq(
ui_nested_identifier: $ => seq(
$._ui_qualified_id,
'.',
$.identifier,

2
queries/highlights.scm
Unescape Escape View File

@ -3,7 +3,7 @@
(ui_binding
name: (identifier) @property)
(ui_binding
name: (ui_qualified_id
name: (nested_identifier
(identifier) @property))
(ui_property

24
test/corpus/declarative-ui.txt
Unescape Escape View File

@ -103,7 +103,7 @@ Item {
type_name: (identifier)
initializer: (ui_object_initializer))
(ui_object_definition
type_name: (ui_qualified_id
type_name: (nested_identifier
(identifier)
(identifier))
initializer: (ui_object_initializer)))))
@ -128,10 +128,10 @@ MyItem {
name: (identifier)
initializer: (ui_object_initializer))
(ui_object_definition_binding
type_name: (ui_qualified_id
type_name: (nested_identifier
(identifier)
(identifier))
name: (ui_qualified_id
name: (nested_identifier
(identifier)
(identifier))
initializer: (ui_object_initializer)))))
@ -184,7 +184,7 @@ MyItem {
name: (identifier)
value: (ui_object_array
(ui_object_definition
type_name: (ui_qualified_id
type_name: (nested_identifier
(identifier)
(identifier))
initializer: (ui_object_initializer))
@ -199,7 +199,7 @@ MyItem {
(ui_binding
name: (identifier)
value: (ui_object_definition
type_name: (ui_qualified_id
type_name: (nested_identifier
(identifier)
(identifier))
initializer: (ui_object_initializer))))))
@ -281,7 +281,7 @@ MyItem {
object: (identifier)
property: (property_identifier))))
(ui_binding
name: (ui_qualified_id
name: (nested_identifier
(identifier)
(identifier))
value: (expression_statement
@ -501,24 +501,24 @@ MyItem {
(identifier))
name: (identifier))
(ui_property
type: (ui_qualified_id
type: (nested_identifier
(identifier)
(identifier))
name: (identifier)
value: (ui_object_definition
type_name: (ui_qualified_id
type_name: (nested_identifier
(identifier)
(identifier))
initializer: (ui_object_initializer)))
(ui_property
type: (ui_list_property_type
(ui_qualified_id
(nested_identifier
(identifier)
(identifier)))
name: (identifier)
value: (ui_object_array
(ui_object_definition
type_name: (ui_qualified_id
type_name: (nested_identifier
(identifier)
(identifier))
initializer: (ui_object_initializer))))
@ -568,11 +568,11 @@ MyItem {
parameters: (ui_signal_parameters
(ui_signal_parameter
name: (identifier)
type: (ui_qualified_id
type: (nested_identifier
(identifier)
(identifier)))
(ui_signal_parameter
type: (ui_qualified_id
type: (nested_identifier
(identifier)
(identifier))
name: (identifier))

2
test/corpus/identifiers.txt
Unescape Escape View File

@ -601,7 +601,7 @@ OtObject {
(identifier)
(ui_object_initializer))
(ui_object_definition
(ui_qualified_id
(nested_identifier
(identifier)
(identifier))
(ui_object_initializer)))))