From 25825fed3e632f983baa98da38c01b33ed8831bd Mon Sep 17 00:00:00 2001
From: Salem Ghoweri <salem.ghoweri@pega.com>
Date: Thu, 27 Apr 2017 23:48:17 -0400
Subject: [PATCH 1/3] Testing regex updates meant for composer.json-based
 consumption. Not nearly as easy as copying over from the config.yml file...

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8de2b05..878391e 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
 	"extra": {
 		"patternlab": {
 			"config": {
-				"lineageMatch": "{%([ ]+)?include( |\\()[&quot;\\&#039;]([A-Za-z0-9-_]+)[&quot;\\&#039;](\\))?(.*)%}",
+				"lineageMatch": "{%([ ]+)?(?:include|extends|embed)( |\\()[\"\\&#039;]([\/._\\-.@#A-Za-z0-9-_]+)[\"\\&#039;]([ \/._\\-.@#A-Za-z0-9-&}_\n{\":&#039;,\/. [\\]]+)%}",
 				"lineageMatchKey": 3,
 				"patternExtension": "twig",
 				"twigDebug": false,

From c07bf8a72c0647f1bec97877f759bc15556c80d2 Mon Sep 17 00:00:00 2001
From: Salem Ghoweri <salem.ghoweri@pega.com>
Date: Thu, 27 Apr 2017 23:57:30 -0400
Subject: [PATCH 2/3] Adding original for testing comparison

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 878391e..8de2b05 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
 	"extra": {
 		"patternlab": {
 			"config": {
-				"lineageMatch": "{%([ ]+)?(?:include|extends|embed)( |\\()[\"\\&#039;]([\/._\\-.@#A-Za-z0-9-_]+)[\"\\&#039;]([ \/._\\-.@#A-Za-z0-9-&}_\n{\":&#039;,\/. [\\]]+)%}",
+				"lineageMatch": "{%([ ]+)?include( |\\()[&quot;\\&#039;]([A-Za-z0-9-_]+)[&quot;\\&#039;](\\))?(.*)%}",
 				"lineageMatchKey": 3,
 				"patternExtension": "twig",
 				"twigDebug": false,

From e132ead0f98d36ab84555a8355dff6b3d14d4948 Mon Sep 17 00:00:00 2001
From: Salem Ghoweri <salem.ghoweri@pega.com>
Date: Mon, 1 May 2017 14:05:55 -0400
Subject: [PATCH 3/3] Testing updated and simplified regex which also fixes
 lineages when using D8 friendly Twig paths

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8de2b05..d86702a 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
 	"extra": {
 		"patternlab": {
 			"config": {
-				"lineageMatch": "{%([ ]+)?include( |\\()[&quot;\\&#039;]([A-Za-z0-9-_]+)[&quot;\\&#039;](\\))?(.*)%}",
+				"lineageMatch": "{%([ ]+)?(?:include|extends|embed)( |\\()[&quot;\\&#039;]([\\/.@A-Za-z0-9-_]+)[&quot;\\&#039;]([\\s\\S+]*?)%}",
 				"lineageMatchKey": 3,
 				"patternExtension": "twig",
 				"twigDebug": false,