Skip to content

Commit

Permalink
Merge branch 'Envoy'
Browse files Browse the repository at this point in the history
#Conflicts:
#	queries/injections.scm
  • Loading branch information
EmranMR committed Dec 3, 2023
2 parents 4aeb20f + 8353cbb commit e87e0b9
Show file tree
Hide file tree
Showing 16 changed files with 224,413 additions and 123,064 deletions.
28 changes: 14 additions & 14 deletions corpus/attributes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
--------------------------------------------------------------------------------

(blade
(php)
(text)
(attribute
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php))
(text))

================================================================================
@style
Expand All @@ -24,13 +24,13 @@
--------------------------------------------------------------------------------

(blade
(php)
(text)
(attribute
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php))
(text))

================================================================================
@checked
Expand All @@ -41,13 +41,13 @@
--------------------------------------------------------------------------------

(blade
(php)
(text)
(attribute
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php))
(text))

================================================================================
@selected
Expand All @@ -58,13 +58,13 @@
--------------------------------------------------------------------------------

(blade
(php)
(text)
(attribute
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php))
(text))

================================================================================
@disabled
Expand All @@ -75,13 +75,13 @@
--------------------------------------------------------------------------------

(blade
(php)
(text)
(attribute
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php))
(text))

================================================================================
@readonly
Expand All @@ -92,13 +92,13 @@
--------------------------------------------------------------------------------

(blade
(php)
(text)
(attribute
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php))
(text))

================================================================================
@required
Expand All @@ -109,10 +109,10 @@
--------------------------------------------------------------------------------

(blade
(php)
(text)
(attribute
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php))
(text))
76 changes: 32 additions & 44 deletions corpus/conditionals.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -40,7 +40,7 @@
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end))
(directive_end)))

Expand All @@ -64,16 +64,16 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(conditional_keyword
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php)
(text)
(conditional_keyword
(directive))
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -92,7 +92,7 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -111,7 +111,7 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -130,7 +130,7 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -146,7 +146,7 @@ conditional keywords
(blade
(conditional
(directive_start)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -165,7 +165,7 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -181,7 +181,7 @@ conditional keywords
(blade
(conditional
(directive_start)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -200,7 +200,7 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -216,7 +216,7 @@ conditional keywords
(blade
(conditional
(directive_start)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -235,7 +235,7 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -254,7 +254,7 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -273,7 +273,7 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -292,7 +292,7 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -316,20 +316,16 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(php)
(php)
(php)
(php)
(text)
(conditional_keyword
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php)
(text)
(conditional_keyword
(directive))
(php)
(text)
(directive_end))))

================================================================================
Expand All @@ -351,17 +347,13 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(php)
(php)
(php)
(php)
(text)
(conditional_keyword
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php)
(text)
(directive_end))))

================================================================================
Expand All @@ -383,17 +375,13 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(php)
(php)
(php)
(php)
(text)
(conditional_keyword
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php)
(text)
(directive_end))))

================================================================================
Expand All @@ -417,16 +405,16 @@ conditional keywords
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(conditional_keyword
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php)
(text)
(conditional_keyword
(directive))
(php)
(text)
(directive_end))))

================================================================================
Expand All @@ -453,23 +441,23 @@ custom directive
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(conditional_keyword
(directive)
(bracket_start)
(parameter)
(bracket_end))
(php)
(text)
(conditional_keyword
(directive))
(php)
(text)
(directive_end))
(conditional
(directive_start)
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end)))

================================================================================
Expand All @@ -494,6 +482,6 @@ complex custom directive
(bracket_start)
(parameter)
(bracket_end)
(php)
(text)
(directive_end))
(directive_end)))
Loading

0 comments on commit e87e0b9

Please sign in to comment.