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

Support v0.24 binary concatenation operator (#39)

pull/844/head
Michael Davis 2022-10-27 22:54:52 +07:00 committed by GitHub
parent 926eb0262e
commit e21567343e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26724 additions and 24566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
grammar.js
Unescape Escape View File

@ -298,7 +298,8 @@ module.exports = grammar({
binaryExpr(prec.left, 7, "*.", $._expression), binaryExpr(prec.left, 7, "*.", $._expression),
binaryExpr(prec.left, 7, "/", $._expression), binaryExpr(prec.left, 7, "/", $._expression),
binaryExpr(prec.left, 7, "/.", $._expression), binaryExpr(prec.left, 7, "/.", $._expression),
binaryExpr(prec.left, 7, "%", $._expression) binaryExpr(prec.left, 7, "%", $._expression),
binaryExpr(prec.left, 7, "<>", $._expression)
), ),
// The way that this function is written in the Gleam parser is essentially // The way that this function is written in the Gleam parser is essentially
// incompatible with tree-sitter. It first parses some base expression, // incompatible with tree-sitter. It first parses some base expression,
@ -541,19 +542,24 @@ module.exports = grammar({
field("function", $._maybe_function_expression), field("function", $._maybe_function_expression),
field("arguments", $.arguments) field("arguments", $.arguments)
), ),
_pattern_expression: ($) =>
choice(
$.identifier,
$.discard,
$.record_pattern,
$.string,
$.integer,
$.float,
$.tuple_pattern,
alias($._pattern_bit_string, $.bit_string_pattern),
$.list_pattern,
alias($._pattern_binary_expression, $.binary_expression)
),
_pattern_binary_expression: ($) =>
binaryExpr(prec.left, 1, "<>", $._pattern_expression),
_pattern: ($) => _pattern: ($) =>
seq( seq(
choice( $._pattern_expression,
$.identifier,
$.discard,
$.record_pattern,
$.string,
$.integer,
$.float,
$.tuple_pattern,
alias($._pattern_bit_string, $.bit_string_pattern),
$.list_pattern
),
optional(field("assign", seq("as", $.identifier))) optional(field("assign", seq("as", $.identifier)))
), ),
record_pattern: ($) => record_pattern: ($) =>

165
src/grammar.json generated
Unescape Escape View File

@ -2582,6 +2582,39 @@
} }
] ]
} }
},
{
"type": "PREC_LEFT",
"value": 7,
"content": {
"type": "SEQ",
"members": [
{
"type": "FIELD",
"name": "left",
"content": {
"type": "SYMBOL",
"name": "_expression"
}
},
{
"type": "FIELD",
"name": "operator",
"content": {
"type": "STRING",
"value": "<>"
}
},
{
"type": "FIELD",
"name": "right",
"content": {
"type": "SYMBOL",
"name": "_expression"
}
}
]
}
} }
] ]
}, },
@ -4468,54 +4501,100 @@
} }
] ]
}, },
"_pattern": { "_pattern_expression": {
"type": "SEQ", "type": "CHOICE",
"members": [ "members": [
{ {
"type": "CHOICE", "type": "SYMBOL",
"members": [ "name": "identifier"
{ },
"type": "SYMBOL", {
"name": "identifier" "type": "SYMBOL",
}, "name": "discard"
{ },
"type": "SYMBOL", {
"name": "discard" "type": "SYMBOL",
}, "name": "record_pattern"
{ },
"type": "SYMBOL", {
"name": "record_pattern" "type": "SYMBOL",
}, "name": "string"
{ },
"type": "SYMBOL", {
"name": "string" "type": "SYMBOL",
}, "name": "integer"
{ },
"type": "SYMBOL", {
"name": "integer" "type": "SYMBOL",
}, "name": "float"
{ },
"type": "SYMBOL", {
"name": "float" "type": "SYMBOL",
}, "name": "tuple_pattern"
{ },
{
"type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "_pattern_bit_string"
},
"named": true,
"value": "bit_string_pattern"
},
{
"type": "SYMBOL",
"name": "list_pattern"
},
{
"type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "_pattern_binary_expression"
},
"named": true,
"value": "binary_expression"
}
]
},
"_pattern_binary_expression": {
"type": "PREC_LEFT",
"value": 1,
"content": {
"type": "SEQ",
"members": [
{
"type": "FIELD",
"name": "left",
"content": {
"type": "SYMBOL", "type": "SYMBOL",
"name": "tuple_pattern" "name": "_pattern_expression"
}, }
{ },
"type": "ALIAS", {
"content": { "type": "FIELD",
"type": "SYMBOL", "name": "operator",
"name": "_pattern_bit_string" "content": {
}, "type": "STRING",
"named": true, "value": "<>"
"value": "bit_string_pattern" }
}, },
{ {
"type": "FIELD",
"name": "right",
"content": {
"type": "SYMBOL", "type": "SYMBOL",
"name": "list_pattern" "name": "_pattern_expression"
} }
] }
]
}
},
"_pattern": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_pattern_expression"
}, },
{ {
"type": "CHOICE", "type": "CHOICE",

80
src/node-types.json generated
Unescape Escape View File

@ -198,6 +198,10 @@
"type": "as", "type": "as",
"named": false "named": false
}, },
{
"type": "binary_expression",
"named": true
},
{ {
"type": "bit_string_pattern", "type": "bit_string_pattern",
"named": true "named": true
@ -374,10 +378,18 @@
"type": "bit_string", "type": "bit_string",
"named": true "named": true
}, },
{
"type": "bit_string_pattern",
"named": true
},
{ {
"type": "case", "type": "case",
"named": true "named": true
}, },
{
"type": "discard",
"named": true
},
{ {
"type": "expression_group", "type": "expression_group",
"named": true "named": true
@ -410,6 +422,10 @@
"type": "list", "type": "list",
"named": true "named": true
}, },
{
"type": "list_pattern",
"named": true
},
{ {
"type": "negation", "type": "negation",
"named": true "named": true
@ -418,6 +434,10 @@
"type": "record", "type": "record",
"named": true "named": true
}, },
{
"type": "record_pattern",
"named": true
},
{ {
"type": "record_update", "type": "record_update",
"named": true "named": true
@ -438,6 +458,10 @@
"type": "tuple_access", "type": "tuple_access",
"named": true "named": true
}, },
{
"type": "tuple_pattern",
"named": true
},
{ {
"type": "{", "type": "{",
"named": false "named": false
@ -512,6 +536,10 @@
"type": "<=.", "type": "<=.",
"named": false "named": false
}, },
{
"type": "<>",
"named": false
},
{ {
"type": "==", "type": "==",
"named": false "named": false
@ -562,10 +590,18 @@
"type": "bit_string", "type": "bit_string",
"named": true "named": true
}, },
{
"type": "bit_string_pattern",
"named": true
},
{ {
"type": "case", "type": "case",
"named": true "named": true
}, },
{
"type": "discard",
"named": true
},
{ {
"type": "expression_group", "type": "expression_group",
"named": true "named": true
@ -598,6 +634,10 @@
"type": "list", "type": "list",
"named": true "named": true
}, },
{
"type": "list_pattern",
"named": true
},
{ {
"type": "negation", "type": "negation",
"named": true "named": true
@ -606,6 +646,10 @@
"type": "record", "type": "record",
"named": true "named": true
}, },
{
"type": "record_pattern",
"named": true
},
{ {
"type": "record_update", "type": "record_update",
"named": true "named": true
@ -626,6 +670,10 @@
"type": "tuple_access", "type": "tuple_access",
"named": true "named": true
}, },
{
"type": "tuple_pattern",
"named": true
},
{ {
"type": "{", "type": "{",
"named": false "named": false
@ -716,6 +764,10 @@
"type": "assert", "type": "assert",
"named": true "named": true
}, },
{
"type": "binary_expression",
"named": true
},
{ {
"type": "bit_string", "type": "bit_string",
"named": true "named": true
@ -1134,6 +1186,10 @@
"multiple": true, "multiple": true,
"required": true, "required": true,
"types": [ "types": [
{
"type": "binary_expression",
"named": true
},
{ {
"type": "bit_string_pattern", "type": "bit_string_pattern",
"named": true "named": true
@ -2190,6 +2246,10 @@
"type": "as", "type": "as",
"named": false "named": false
}, },
{
"type": "binary_expression",
"named": true
},
{ {
"type": "bit_string_pattern", "type": "bit_string_pattern",
"named": true "named": true
@ -2543,6 +2603,10 @@
"multiple": true, "multiple": true,
"required": false, "required": false,
"types": [ "types": [
{
"type": "binary_expression",
"named": true
},
{ {
"type": "bit_string_pattern", "type": "bit_string_pattern",
"named": true "named": true
@ -2798,6 +2862,10 @@
"type": "as", "type": "as",
"named": false "named": false
}, },
{
"type": "binary_expression",
"named": true
},
{ {
"type": "bit_string_pattern", "type": "bit_string_pattern",
"named": true "named": true
@ -3385,6 +3453,10 @@
"type": "as", "type": "as",
"named": false "named": false
}, },
{
"type": "binary_expression",
"named": true
},
{ {
"type": "bit_string_pattern", "type": "bit_string_pattern",
"named": true "named": true
@ -3701,6 +3773,10 @@
"multiple": true, "multiple": true,
"required": false, "required": false,
"types": [ "types": [
{
"type": "binary_expression",
"named": true
},
{ {
"type": "bit_string_pattern", "type": "bit_string_pattern",
"named": true "named": true
@ -4135,6 +4211,10 @@
"type": "<=.", "type": "<=.",
"named": false "named": false
}, },
{
"type": "<>",
"named": false
},
{ {
"type": "=", "type": "=",
"named": false "named": false

50953
src/parser.c generated
View File

File diff suppressed because it is too large Load Diff

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

@ -40,3 +40,57 @@ True && !False
(negation (negation
(record (record
(constructor_name))))) (constructor_name)))))
================================================================================
Concatenation
================================================================================
let concat = "a" <> "b"
case "12345" {
"0" <> rest -> rest
"12" <> "34" <> "5" -> "match"
_ -> ""
}
--------------------------------------------------------------------------------
(source_file
(let
(identifier)
(binary_expression
(string
(quoted_content))
(string
(quoted_content))))
(case
(case_subjects
(string
(quoted_content)))
(case_clauses
(case_clause
(case_clause_patterns
(case_clause_pattern
(binary_expression
(string
(quoted_content))
(identifier))))
(identifier))
(case_clause
(case_clause_patterns
(case_clause_pattern
(binary_expression
(binary_expression
(string
(quoted_content))
(string
(quoted_content)))
(string
(quoted_content)))))
(string
(quoted_content)))
(case_clause
(case_clause_patterns
(case_clause_pattern
(discard)))
(string)))))

8
test/highlight/expressions.gleam
Unescape Escape View File

@ -0,0 +1,8 @@
case "12345" {
"123" <> rest -> rest
// <- string
// ^ operator
// ^ variable
_ -> ""
// ^ string
}