Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for escape sequences inside single line strings #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for escape sequences inside single line strings #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 59 additions & 27 deletions corpus/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,67 +63,67 @@ directive @dateFormat(format: String = "YY-MM-DD") on FIELD
(name) (fields_definition
(field_definition
(name)
(type (non_null_type (named_type
(type (non_null_type (named_type
(name)))))
(comment))))))
(definition (type_system_definition (type_definition (object_type_definition
(definition (type_system_definition (type_definition (object_type_definition
(name)
(implements_interfaces (named_type (name)))
(fields_definition (field_definition
(fields_definition (field_definition
(name)
(type (non_null_type (named_type
(type (non_null_type (named_type
(name))))))))))
(definition (type_system_definition (type_definition (object_type_definition
(definition (type_system_definition (type_definition (object_type_definition
(name)
(implements_interfaces (implements_interfaces (named_type
(implements_interfaces (implements_interfaces (named_type
(name)))
(named_type (name)))
(fields_definition (field_definition
(fields_definition (field_definition
(name)
(type (non_null_type (named_type (name)))))
(field_definition
(field_definition
(name)
(type (non_null_type (named_type (name)))))
(field_definition
(field_definition
(name)
(type (named_type (name))))
(field_definition
(field_definition
(name)
(type (named_type (name)))))))))
(definition (type_system_definition (type_definition (union_type_definition
(definition (type_system_definition (type_definition (union_type_definition
(name)
(union_member_types (union_member_types (named_type (name)))
(named_type (name)))))))
(definition (type_system_definition (type_definition (scalar_type_definition (name)))))
(definition (type_system_definition (type_definition (enum_type_definition
(definition (type_system_definition (type_definition (enum_type_definition
(name)
(enum_values_definition (enum_value_definition (enum_value (name)))
(enum_value_definition (enum_value (name))))))))
(definition (type_system_definition (type_definition (input_object_type_definition
(definition (type_system_definition (type_definition (input_object_type_definition
(name)
(input_fields_definition (input_value_definition
(input_fields_definition (input_value_definition
(name)
(type (non_null_type (named_type (name)))))
(input_value_definition
(input_value_definition
(name)
(type (non_null_type (named_type (name))))
(default_value (value (string_value)))))))))
(definition (type_system_extension (type_extension (object_type_extension
(definition (type_system_extension (type_extension (object_type_extension
(name)
(fields_definition (field_definition
(fields_definition (field_definition
(name)
(type (list_type (type (named_type (name))))))
(field_definition
(field_definition
(name)
(arguments_definition (input_value_definition
(arguments_definition (input_value_definition
(name)
(type (non_null_type (named_type (name))))))
(type (named_type (name)))))))))
(definition (type_system_extension (type_extension (object_type_extension
(definition (type_system_extension (type_extension (object_type_extension
(name)
(fields_definition (field_definition
(fields_definition (field_definition
(name)
(arguments_definition (input_value_definition
(arguments_definition (input_value_definition
(name)
(type (named_type (name)))))
(type (named_type (name)))))))))
Expand Down Expand Up @@ -190,7 +190,7 @@ fragment ContactFragment on Contact {
}

---
(source_file (document
(source_file (document
(definition (executable_definition (operation_definition
(operation_type)
(name)
Expand Down Expand Up @@ -218,7 +218,7 @@ fragment ContactFragment on Contact {
(name)
(arguments (argument
(name)
(value (variable (name)))))
(value (variable (name)))))
(selection_set
(selection (inline_fragment
(type_condition (named_type (name)))
Expand All @@ -243,7 +243,7 @@ fragment ContactFragment on Contact {
(value (variable (name)))))
(selection_set
(selection (field (name)))
(selection (field (name))))))))))
(selection (field (name))))))))))
(definition (executable_definition (operation_definition
(operation_type)
(selection_set
Expand All @@ -254,7 +254,7 @@ fragment ContactFragment on Contact {
(value (string_value))))
(selection_set
(selection (field (name)))
(selection (field
(selection (field
(name)
(selection_set
(selection (field (name)))
Expand Down Expand Up @@ -288,7 +288,7 @@ schema @deprecated {
(root_operation_type_definition
(operation_type)
(named_type (name)))
(root_operation_type_definition
(root_operation_type_definition
(operation_type)
(named_type (name))))))
(definition (type_system_definition (schema_definition
Expand All @@ -299,3 +299,35 @@ schema @deprecated {
(root_operation_type_definition
(operation_type)
(named_type (name))))))))

===
Escape sequences in strings
===

query ShipmentFilter {
city(method: "App\\GraphQL\\Controllers\\ShipmentController \"some\"") {
field
}
}

---
(source_file
(document
(definition
(executable_definition
(operation_definition
(operation_type)
(name)
(selection_set
(selection
(field
(name)
(arguments
(argument
(name)
(value
(string_value))))
(selection_set
(selection
(field
(name))))))))))))
25 changes: 24 additions & 1 deletion grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ module.exports = grammar({

extras: ($) => [/[\s\uFEFF\u0009\u0020\u000A\u000D]/, $.comma, $.comment],

inline: ($) => [$.string_fragment, $.escape_sequence],

rules: {
source_file: ($) => $.document,
document: ($) => repeat1($.definition),
Expand Down Expand Up @@ -280,7 +282,28 @@ module.exports = grammar({
string_value: ($) =>
choice(
seq('"""', /([^"]|\n|""?[^"])*/, '"""'),
seq('"', /[^"\\\n]*/, '"')
seq(
'"',
repeat(
choice(
$.string_fragment,
$.escape_sequence,
),
),
'"',
)
),
string_fragment: _ => seq(/[^"\\\r\n]+/),
escape_sequence: _ => seq(
'\\',
choice(
/[^xu0-7]/,
/[0-7]{1,3}/,
/x[0-9a-fA-F]{2}/,
/u[0-9a-fA-F]{4}/,
/u{[0-9a-fA-F]+}/,
/[\r?][\n\u2028\u2029]/,
),
),
int_value: ($) => /-?(0|[1-9][0-9]*)/,
float_value: ($) =>
Expand Down
69 changes: 65 additions & 4 deletions src/grammar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1689,8 +1689,20 @@
"value": "\""
},
{
"type": "PATTERN",
"value": "[^\"\\\\\\n]*"
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "string_fragment"
},
{
"type": "SYMBOL",
"name": "escape_sequence"
}
]
}
},
{
"type": "STRING",
Expand All @@ -1700,6 +1712,53 @@
}
]
},
"string_fragment": {
"type": "SEQ",
"members": [
{
"type": "PATTERN",
"value": "[^\"\\\\\\r\\n]+"
}
]
},
"escape_sequence": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "\\"
},
{
"type": "CHOICE",
"members": [
{
"type": "PATTERN",
"value": "[^xu0-7]"
},
{
"type": "PATTERN",
"value": "[0-7]{1,3}"
},
{
"type": "PATTERN",
"value": "x[0-9a-fA-F]{2}"
},
{
"type": "PATTERN",
"value": "u[0-9a-fA-F]{4}"
},
{
"type": "PATTERN",
"value": "u{[0-9a-fA-F]+}"
},
{
"type": "PATTERN",
"value": "[\\r?][\\n\\u2028\\u2029]"
}
]
}
]
},
"int_value": {
"type": "PATTERN",
"value": "-?(0|[1-9][0-9]*)"
Expand Down Expand Up @@ -2298,7 +2357,9 @@
"conflicts": [],
"precedences": [],
"externals": [],
"inline": [],
"inline": [
"string_fragment",
"escape_sequence"
],
"supertypes": []
}

4 changes: 4 additions & 0 deletions src/node-types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,10 @@
"type": "[",
"named": false
},
{
"type": "\\",
"named": false
},
{
"type": "]",
"named": false
Expand Down
Loading