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

Merge pull request #9 from akinsho/unhide-final-const-var-nodes 

Unhide final and const nodes
pull/185/head
UserNobody14 2020-08-07 01:31:58 +07:00 committed by GitHub
parent 63f902d950 29fbe36547
commit 07fc459547
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 3463 additions and 3355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
grammar.js
Unescape Escape View File

@ -221,8 +221,8 @@ module.exports = grammar({
// final or const static final declaration list
seq(
choice(
$._final_builtin,
$._const_builtin
$.final_builtin,
$.const_builtin
),
optional($._type),
$.static_final_declaration_list,
@ -230,7 +230,7 @@ module.exports = grammar({
),
seq(
$._late_builtin,
$._final_builtin,
$.final_builtin,
optional($._type),
$.initialized_identifier_list,
$._semicolon
@ -472,12 +472,12 @@ module.exports = grammar({
***************************************************************************************************
***************************************************************************************************/
list_literal: $ => seq(
optional($._const_builtin), optional($.type_arguments), '[',
optional($.const_builtin), optional($.type_arguments), '[',
commaSepTrailingComma($._element),
']'
),
set_or_map_literal: $ => seq(
optional($._const_builtin), optional($.type_arguments), '{',
optional($.const_builtin), optional($.type_arguments), '{',
commaSepTrailingComma(
$._element
),
@ -1018,7 +1018,7 @@ module.exports = grammar({
)
),
const_object_expression: $ => seq(
$._const_builtin,
$.const_builtin,
$._type_not_void,
optional(
$._dot_identifier
@ -1707,11 +1707,11 @@ module.exports = grammar({
seq($.constant_constructor_signature, optional(choice($.redirection, $.initializers))),
seq($.constructor_signature, optional(choice($.redirection, $.initializers))),
seq($._external,
optional($._const_builtin),
optional($.const_builtin),
$.factory_constructor_signature
),
seq(
optional($._const_builtin),
optional($.const_builtin),
$.factory_constructor_signature, $._native
),
seq($._external,
@ -1751,7 +1751,7 @@ module.exports = grammar({
$.static_final_declaration_list
),
seq(
optional($._late_builtin), $._final_builtin,
optional($._late_builtin), $.final_builtin,
optional($._type),
$.initialized_identifier_list
),
@ -1818,8 +1818,8 @@ module.exports = grammar({
$._static
),
_final_or_const: $ => choice(
$._final_builtin,
$._const_builtin
$.final_builtin,
$.const_builtin
),
static_initializer: $ => seq(
@ -1872,7 +1872,7 @@ module.exports = grammar({
),
redirecting_factory_constructor_signature: $ => seq(
optional($._const_builtin),
optional($.const_builtin),
$._factory,
sep1($.identifier, '.'),
$.formal_parameter_list,
@ -1901,7 +1901,7 @@ module.exports = grammar({
field('parameters', $.formal_parameter_list)
),
constant_constructor_signature: $ => seq(
$._const_builtin,
$.const_builtin,
$.qualified,
$.formal_parameter_list
),
@ -1972,8 +1972,8 @@ module.exports = grammar({
// Types
_final_const_var_or_type: $ => choice(
seq(optional($._late_builtin), $._final_builtin, optional($._type)),
seq($._const_builtin, optional(
seq(optional($._late_builtin), $.final_builtin, optional($._type)),
seq($.const_builtin, optional(
$._type
)),
seq(optional($._late_builtin),
@ -2510,8 +2510,8 @@ module.exports = grammar({
DART_PREC.BUILTIN,
'new',
),
_const_builtin: $ => token('const'),
_final_builtin: $ => token('final'),
const_builtin: $ => token('const'),
final_builtin: $ => token('final'),
_late_builtin: $ => prec(
DART_PREC.BUILTIN,
'late',

34
src/grammar.json
Unescape Escape View File

@ -232,11 +232,11 @@
"members": [
{
"type": "SYMBOL",
"name": "_final_builtin"
"name": "final_builtin"
},
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
}
]
},
@ -271,7 +271,7 @@
},
{
"type": "SYMBOL",
"name": "_final_builtin"
"name": "final_builtin"
},
{
"type": "CHOICE",
@ -1447,7 +1447,7 @@
"members": [
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
},
{
"type": "BLANK"
@ -1529,7 +1529,7 @@
"members": [
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
},
{
"type": "BLANK"
@ -3143,7 +3143,7 @@
"members": [
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
},
{
"type": "SYMBOL",
@ -6335,7 +6335,7 @@
"members": [
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
},
{
"type": "BLANK"
@ -6356,7 +6356,7 @@
"members": [
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
},
{
"type": "BLANK"
@ -6558,7 +6558,7 @@
},
{
"type": "SYMBOL",
"name": "_final_builtin"
"name": "final_builtin"
},
{
"type": "CHOICE",
@ -6849,11 +6849,11 @@
"members": [
{
"type": "SYMBOL",
"name": "_final_builtin"
"name": "final_builtin"
},
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
}
]
},
@ -7055,7 +7055,7 @@
"members": [
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
},
{
"type": "BLANK"
@ -7216,7 +7216,7 @@
"members": [
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
},
{
"type": "SYMBOL",
@ -7583,7 +7583,7 @@
},
{
"type": "SYMBOL",
"name": "_final_builtin"
"name": "final_builtin"
},
{
"type": "CHOICE",
@ -7604,7 +7604,7 @@
"members": [
{
"type": "SYMBOL",
"name": "_const_builtin"
"name": "const_builtin"
},
{
"type": "CHOICE",
@ -9520,14 +9520,14 @@
"value": "new"
}
},
"_const_builtin": {
"const_builtin": {
"type": "TOKEN",
"content": {
"type": "STRING",
"value": "const"
}
},
"_final_builtin": {
"final_builtin": {
"type": "TOKEN",
"content": {
"type": "STRING",

128
src/node-types.json
Unescape Escape View File

@ -772,7 +772,7 @@
]
},
"operator": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -826,7 +826,7 @@
]
},
"right": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -968,7 +968,7 @@
]
},
"operator": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -1022,7 +1022,7 @@
]
},
"right": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -2121,7 +2121,7 @@
"named": true,
"fields": {
"alternative": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -2255,7 +2255,7 @@
]
},
"consequence": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -2558,6 +2558,10 @@
"type": "arguments",
"named": true
},
{
"type": "const_builtin",
"named": true
},
{
"type": "function_type",
"named": true
@ -2585,6 +2589,10 @@
"multiple": true,
"required": true,
"types": [
{
"type": "const_builtin",
"named": true
},
{
"type": "formal_parameter_list",
"named": true
@ -2631,6 +2639,14 @@
"multiple": true,
"required": true,
"types": [
{
"type": "const_builtin",
"named": true
},
{
"type": "final_builtin",
"named": true
},
{
"type": "formal_parameter_list",
"named": true
@ -2723,6 +2739,10 @@
"multiple": true,
"required": true,
"types": [
{
"type": "const_builtin",
"named": true
},
{
"type": "constant_constructor_signature",
"named": true
@ -2735,6 +2755,10 @@
"type": "factory_constructor_signature",
"named": true
},
{
"type": "final_builtin",
"named": true
},
{
"type": "function_signature",
"named": true
@ -3090,7 +3114,7 @@
]
},
"object": {
"multiple": false,
"multiple": true,
"required": false,
"types": [
{
@ -3400,7 +3424,7 @@
]
},
"class": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -3622,7 +3646,7 @@
"named": true,
"fields": {
"body": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -3764,7 +3788,7 @@
]
},
"condition": {
"multiple": false,
"multiple": true,
"required": false,
"types": [
{
@ -4156,7 +4180,7 @@
]
},
"value": {
"multiple": false,
"multiple": true,
"required": false,
"types": [
{
@ -4290,6 +4314,14 @@
"type": "annotation",
"named": true
},
{
"type": "const_builtin",
"named": true
},
{
"type": "final_builtin",
"named": true
},
{
"type": "function_type",
"named": true
@ -4336,7 +4368,7 @@
]
},
"condition": {
"multiple": false,
"multiple": true,
"required": false,
"types": [
{
@ -4728,7 +4760,7 @@
]
},
"value": {
"multiple": false,
"multiple": true,
"required": false,
"types": [
{
@ -4862,6 +4894,14 @@
"type": "annotation",
"named": true
},
{
"type": "const_builtin",
"named": true
},
{
"type": "final_builtin",
"named": true
},
{
"type": "function_type",
"named": true
@ -4916,10 +4956,18 @@
"type": "annotation",
"named": true
},
{
"type": "const_builtin",
"named": true
},
{
"type": "constructor_param",
"named": true
},
{
"type": "final_builtin",
"named": true
},
{
"type": "formal_parameter_list",
"named": true
@ -5120,7 +5168,7 @@
]
},
"parameters": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -5395,7 +5443,7 @@
"named": true,
"fields": {
"alternative": {
"multiple": false,
"multiple": true,
"required": false,
"types": [
{
@ -5547,7 +5595,7 @@
]
},
"consequence": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -5695,7 +5743,7 @@
"named": true,
"fields": {
"first": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -5822,7 +5870,7 @@
},
"second": {
"multiple": true,
"required": false,
"required": true,
"types": [
{
"type": "(",
@ -6188,7 +6236,7 @@
]
},
"value": {
"multiple": false,
"multiple": true,
"required": false,
"types": [
{
@ -6322,6 +6370,14 @@
"type": "annotation",
"named": true
},
{
"type": "const_builtin",
"named": true
},
{
"type": "final_builtin",
"named": true
},
{
"type": "function_type",
"named": true
@ -6596,6 +6652,10 @@
"type": "conditional_expression",
"named": true
},
{
"type": "const_builtin",
"named": true
},
{
"type": "const_object_expression",
"named": true
@ -7545,7 +7605,7 @@
"fields": {},
"children": {
"multiple": true,
"required": true,
"required": false,
"types": [
{
"type": "_literal",
@ -7705,7 +7765,7 @@
"named": true,
"fields": {
"key": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -7831,7 +7891,7 @@
]
},
"value": {
"multiple": false,
"multiple": true,
"required": true,
"types": [
{
@ -8235,6 +8295,10 @@
"type": "class_definition",
"named": true
},
{
"type": "const_builtin",
"named": true
},
{
"type": "enum_declaration",
"named": true
@ -8243,6 +8307,10 @@
"type": "extension_declaration",
"named": true
},
{
"type": "final_builtin",
"named": true
},
{
"type": "function_body",
"named": true
@ -8345,6 +8413,10 @@
"multiple": true,
"required": true,
"types": [
{
"type": "const_builtin",
"named": true
},
{
"type": "formal_parameter_list",
"named": true
@ -8740,6 +8812,10 @@
"type": "conditional_expression",
"named": true
},
{
"type": "const_builtin",
"named": true
},
{
"type": "const_object_expression",
"named": true
@ -11235,6 +11311,10 @@
"type": "class",
"named": false
},
{
"type": "const_builtin",
"named": true
},
{
"type": "continue",
"named": false
@ -11303,6 +11383,10 @@
"type": "false",
"named": false
},
{
"type": "final_builtin",
"named": true
},
{
"type": "finally",
"named": false

6530
src/parser.c
View File

File diff suppressed because it is too large Load Diff

50
src/tree_sitter/parser.h
Unescape Escape View File

@ -62,13 +62,13 @@ typedef struct {
TSStateId state;
bool extra : 1;
bool repetition : 1;
};
} shift;
struct {
TSSymbol symbol;
int16_t dynamic_precedence;
uint8_t child_count;
uint8_t production_id;
};
} reduce;
} params;
TSParseActionType type : 4;
} TSParseAction;
@ -83,7 +83,7 @@ typedef union {
struct {
uint8_t count;
bool reusable : 1;
};
} entry;
} TSParseActionEntry;
struct TSLanguage {
@ -167,22 +167,28 @@ struct TSLanguage {
#define ACTIONS(id) id
#define SHIFT(state_value) \
{ \
{ \
.type = TSParseActionTypeShift, \
.params = {.state = state_value}, \
} \
#define SHIFT(state_value) \
{ \
{ \
.params = { \
.shift = { \
.state = state_value \
} \
}, \
.type = TSParseActionTypeShift \
} \
}
#define SHIFT_REPEAT(state_value) \
{ \
{ \
.type = TSParseActionTypeShift, \
.params = { \
.state = state_value, \
.repetition = true \
.shift = { \
.state = state_value, \
.repetition = true \
} \
}, \
.type = TSParseActionTypeShift \
} \
}
@ -194,20 +200,26 @@ struct TSLanguage {
#define SHIFT_EXTRA() \
{ \
{ \
.type = TSParseActionTypeShift, \
.params = {.extra = true} \
.params = { \
.shift = { \
.extra = true \
} \
}, \
.type = TSParseActionTypeShift \
} \
}
#define REDUCE(symbol_val, child_count_val, ...) \
{ \
{ \
.type = TSParseActionTypeReduce, \
.params = { \
.symbol = symbol_val, \
.child_count = child_count_val, \
__VA_ARGS__ \
} \
.reduce = { \
.symbol = symbol_val, \
.child_count = child_count_val, \
__VA_ARGS__ \
}, \
}, \
.type = TSParseActionTypeReduce \
} \
}

6
test/corpus/dart.txt
Unescape Escape View File

@ -201,8 +201,10 @@ final set = {"hello", "world"};
---
(program
(final_builtin)
(static_final_declaration_list (static_final_declaration (identifier)
(set_or_map_literal (pair (string_literal) (string_literal)))))
(final_builtin)
(static_final_declaration_list (static_final_declaration (identifier)
(set_or_map_literal (string_literal) (string_literal)))))
@ -217,7 +219,7 @@ final dynamic opts = <dynamic, dynamic>{
---
(program (type_identifier) (static_final_declaration_list (static_final_declaration (identifier)
(program (final_builtin) (type_identifier) (static_final_declaration_list (static_final_declaration (identifier)
(set_or_map_literal (type_arguments (type_identifier) (type_identifier)) (pair (string_literal)
(list_literal (string_literal))) (pair (string_literal) (true))))))
@ -309,7 +311,7 @@ abstract class MyDataClass implements _$MyDataClass {
(marker_annotation (identifier))
(class_definition (identifier) (interfaces (type_identifier))
(class_body
(declaration (redirecting_factory_constructor_signature (identifier) (identifier) (formal_parameter_list
(declaration (redirecting_factory_constructor_signature (const_builtin) (identifier) (identifier) (formal_parameter_list
(optional_formal_parameters (formal_parameter
(annotation (identifier) (arguments (false))) (type_identifier) (identifier)))) (type_identifier)))
(method_signature (factory_constructor_signature (identifier) (identifier) (formal_parameter_list)))

20
test/corpus/declarations.txt
Unescape Escape View File

@ -371,6 +371,7 @@ final y = 0;
(program
(marker_annotation (identifier))
(final_builtin)
(static_final_declaration_list (static_final_declaration (identifier) (decimal_integer_literal))))
@ -386,9 +387,13 @@ const String z1 = "100";
---
(program
(final_builtin)
(static_final_declaration_list (static_final_declaration (identifier) (decimal_floating_point_literal)))
(final_builtin)
(type_identifier) (static_final_declaration_list (static_final_declaration (identifier) (decimal_floating_point_literal)))
(const_builtin)
(static_final_declaration_list (static_final_declaration (identifier) (string_literal)))
(const_builtin)
(type_identifier) (static_final_declaration_list (static_final_declaration (identifier) (string_literal))))
@ -401,6 +406,7 @@ final $y$ = 0;
---
(program
(final_builtin)
(static_final_declaration_list (static_final_declaration (identifier) (decimal_integer_literal))))
@ -469,6 +475,7 @@ class MyClass {
(program
(type_identifier) (type_arguments (type_identifier))
(initialized_identifier_list (initialized_identifier (identifier) (list_literal (string_literal) (string_literal) (string_literal) (string_literal) (string_literal))))
(final_builtin)
(type_identifier) (static_final_declaration_list (static_final_declaration (identifier) (string_literal)))
(class_definition (identifier) (class_body)))
@ -500,6 +507,7 @@ const my.MyType newMyType = my.MyType();
---
(program
(const_builtin)
(type_identifier) (type_identifier)
(static_final_declaration_list
(static_final_declaration
@ -522,8 +530,8 @@ const my.MyType newMytype;
---
(program
(local_variable_declaration (initialized_variable_definition (type_identifier) (type_identifier) (identifier)))
(local_variable_declaration (initialized_variable_definition (type_identifier) (type_identifier) (identifier)))
(local_variable_declaration (initialized_variable_definition (const_builtin) (type_identifier) (type_identifier) (identifier)))
(local_variable_declaration (initialized_variable_definition (const_builtin) (type_identifier) (type_identifier) (identifier)))
)
==================================
@ -541,13 +549,13 @@ if (blah) {
---
(program
(local_variable_declaration (initialized_variable_definition (type_identifier) (type_identifier) (identifier) (identifier) (selector
(local_variable_declaration (initialized_variable_definition (final_builtin) (type_identifier) (type_identifier) (identifier) (identifier) (selector
(assignable_selector (unconditional_assignable_selector (identifier)))) (selector (argument_part (arguments)))))
(local_variable_declaration (initialized_variable_definition (type_identifier) (type_identifier) (identifier)))
(local_variable_declaration (initialized_variable_definition (final_builtin) (type_identifier) (type_identifier) (identifier)))
(if_statement (parenthesized_expression (identifier))
(block
(local_variable_declaration (initialized_variable_definition (type_identifier) (type_identifier) (identifier) (identifier)))
(local_variable_declaration (initialized_variable_definition (identifier) (decimal_integer_literal)))
(local_variable_declaration (initialized_variable_definition (const_builtin) (type_identifier) (type_identifier) (identifier) (identifier)))
(local_variable_declaration (initialized_variable_definition (const_builtin) (identifier) (decimal_integer_literal)))
)
)
)

6
test/corpus/expressions.txt
Unescape Escape View File

@ -325,10 +325,10 @@ void main() async {
(program (function_signature (void_type) (identifier) (formal_parameter_list))
(function_body (block
(local_variable_declaration (initialized_variable_definition (identifier) (unary_expression
(local_variable_declaration (initialized_variable_definition (final_builtin) (identifier) (unary_expression
(await_expression (identifier) (selector (assignable_selector (unconditional_assignable_selector (identifier))))
(selector (argument_part (arguments
(const_object_expression (type_identifier)
(const_object_expression (const_builtin) (type_identifier)
(arguments (named_argument (label (identifier)) (decimal_integer_literal))))))))))))))
================================
@ -346,7 +346,7 @@ void main() {
(program (function_signature (void_type) (identifier) (formal_parameter_list))
(function_body (block
(local_variable_declaration (initialized_variable_definition (identifier) (false)))
(local_variable_declaration (initialized_variable_definition (final_builtin) (identifier) (false)))
(if_statement (parenthesized_expression (unary_expression (prefix_operator (negation_operator)) (identifier)))
(block (expression_statement (assignment_expression (assignable_expression (identifier)) (identifier))))))))

8
test/corpus/flutter.txt
Unescape Escape View File

@ -28,7 +28,7 @@ class MyApp extends StatelessWidget {
(arguments (identifier) (selector (argument_part (arguments)))))))))
(class_definition (identifier) (superclass (type_identifier))
(class_body
(declaration (constant_constructor_signature (qualified (identifier))
(declaration (constant_constructor_signature (const_builtin) (qualified (identifier))
(formal_parameter_list (optional_formal_parameters (formal_parameter (type_identifier) (identifier)))))
(initializers (initializer_list_entry (arguments (named_argument (label (identifier)) (identifier))))))
(marker_annotation (identifier))
@ -79,10 +79,10 @@ class CatalogThumbnailUI extends StatelessWidget {
(program
(class_definition (identifier) (superclass (type_identifier))
(class_body
(declaration (static_final_declaration_list (static_final_declaration (identifier) (string_literal))))
(declaration (const_builtin) (static_final_declaration_list (static_final_declaration (identifier) (string_literal))))
(declaration (constructor_signature (identifier)
(formal_parameter_list (formal_parameter (constructor_param (this) (identifier))))))
(declaration (type_identifier) (initialized_identifier_list (initialized_identifier (identifier))))
(declaration (final_builtin) (type_identifier) (initialized_identifier_list (initialized_identifier (identifier))))
(marker_annotation (identifier))
(method_signature
(function_signature (type_identifier) (identifier)
@ -215,7 +215,7 @@ class AWidget extends StatelessWidget {
(function_body (block
(return_statement (identifier)
(selector (argument_part (arguments (named_argument (label (identifier))
(list_literal (identifier)
(list_literal (const_builtin) (identifier)
(selector (argument_part (arguments (named_argument (label (identifier)) (identifier)
(selector (argument_part (arguments (named_argument (label (identifier)) (identifier)
(selector (assignable_selector (unconditional_assignable_selector (identifier)))))))))))) (identifier)

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

@ -132,7 +132,9 @@ final mixedStr = r'''(["'])((?:\\{2})*|(?:.*?[^\\](?:\\{2})*))\2|''' // with quo
---
(program
(final_builtin)
(static_final_declaration_list (static_final_declaration (identifier) (string_literal)))
(final_builtin)
(static_final_declaration_list (static_final_declaration (identifier) (string_literal (comment)))))