Commit 86fe1c880c27be942c0519c58ed3f8553772274c

Lea Verou 2014-05-25T10:45:11

Merge pull request #267 from nauzilus/grammar-update Remove escaped entities from pattern match.

diff --git a/components/prism-aspnet.js b/components/prism-aspnet.js
index e497719..bfbc546 100644
--- a/components/prism-aspnet.js
+++ b/components/prism-aspnet.js
@@ -1,15 +1,15 @@
 Prism.languages.aspnet = Prism.languages.extend('markup', {
 	'page-directive tag': {
-		pattern: /(<|&lt;)%\s*@.*%>/gi,
+		pattern: /<%\s*@.*%>/gi,
 		inside: {
-			'page-directive tag': /&lt;%\s*@\s*(?:Assembly|Control|Implements|Import|Master|MasterType|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/ig,
+			'page-directive tag': /<%\s*@\s*(?:Assembly|Control|Implements|Import|Master|MasterType|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/ig,
 			rest: Prism.languages.markup.tag.inside
 		}
 	},
 	'directive tag': {
-		pattern: /(<|&lt;)%.*%>/gi,
+		pattern: /<%.*%>/gi,
 		inside: {
-			'directive tag': /(<|&lt;)%\s*?[$=%#:]{0,2}|%>/gi,
+			'directive tag': /<%\s*?[$=%#:]{0,2}|%>/gi,
 			rest: Prism.languages.csharp
 		}
 	}
@@ -21,16 +21,16 @@ Prism.languages.insertBefore('inside', 'punctuation', {
 }, Prism.languages.aspnet.tag.inside["attr-value"]);
 
 Prism.languages.insertBefore('aspnet', 'comment', {
-	'asp comment': /&lt;%--[\w\W]*?--%>/g
+	'asp comment': /<%--[\w\W]*?--%>/g
 });
 
 // script runat="server" contains csharp, not javascript
 Prism.languages.insertBefore('aspnet', Prism.languages.javascript ? 'script' : 'tag', {
 	'asp script': {
-		pattern: /(&lt;|<)script(?=.*runat=['"]?server['"]?)[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/script(>|&gt;)/ig,
+		pattern: /<script(?=.*runat=['"]?server['"]?)[\w\W]*?>[\w\W]*?<\/script>/ig,
 		inside: {
 			tag: {
-				pattern: /&lt;\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,
+				pattern: /<\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,
 				inside: Prism.languages.aspnet.tag.inside
 			},
 			rest: Prism.languages.csharp || {}
@@ -40,7 +40,7 @@ Prism.languages.insertBefore('aspnet', Prism.languages.javascript ? 'script' : '
 
 // Hacks to fix eager tag matching finishing too early: <script src="<% Foo.Bar %>"> => <script src="<% Foo.Bar %>
 if ( Prism.languages.aspnet.style ) {
-	Prism.languages.aspnet.style.inside.tag.pattern = /&lt;\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi;
+	Prism.languages.aspnet.style.inside.tag.pattern = /<\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi;
 	Prism.languages.aspnet.style.inside.tag.inside = Prism.languages.aspnet.tag.inside;
 }
 if ( Prism.languages.aspnet.script ) {
diff --git a/components/prism-aspnet.min.js b/components/prism-aspnet.min.js
index 8647e7b..f7dfd2d 100644
--- a/components/prism-aspnet.min.js
+++ b/components/prism-aspnet.min.js
@@ -1 +1 @@
-Prism.languages.aspnet=Prism.languages.extend("markup",{"page-directive tag":{pattern:/(<|&lt;)%\s*@.*%>/gi,inside:{"page-directive tag":/&lt;%\s*@\s*(?:Assembly|Control|Implements|Import|Master|MasterType|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/ig,rest:Prism.languages.markup.tag.inside}},"directive tag":{pattern:/(<|&lt;)%.*%>/gi,inside:{"directive tag":/(<|&lt;)%\s*?[$=%#:]{0,2}|%>/gi,rest:Prism.languages.csharp}}});Prism.languages.insertBefore("inside","punctuation",{"directive tag":Prism.languages.aspnet["directive tag"]},Prism.languages.aspnet.tag.inside["attr-value"]);Prism.languages.insertBefore("aspnet","comment",{"asp comment":/&lt;%--[\w\W]*?--%>/g});Prism.languages.insertBefore("aspnet",Prism.languages.javascript?"script":"tag",{"asp script":{pattern:/(&lt;|<)script(?=.*runat=['"]?server['"]?)[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/script(>|&gt;)/ig,inside:{tag:{pattern:/&lt;\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,inside:Prism.languages.aspnet.tag.inside},rest:Prism.languages.csharp||{}}}});if(Prism.languages.aspnet.style){Prism.languages.aspnet.style.inside.tag.pattern=/&lt;\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi;Prism.languages.aspnet.style.inside.tag.inside=Prism.languages.aspnet.tag.inside}if(Prism.languages.aspnet.script){Prism.languages.aspnet.script.inside.tag.pattern=Prism.languages.aspnet["asp script"].inside.tag.pattern;Prism.languages.aspnet.script.inside.tag.inside=Prism.languages.aspnet.tag.inside}
\ No newline at end of file
+Prism.languages.aspnet=Prism.languages.extend("markup",{"page-directive tag":{pattern:/<%\s*@.*%>/gi,inside:{"page-directive tag":/<%\s*@\s*(?:Assembly|Control|Implements|Import|Master|MasterType|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/gi,rest:Prism.languages.markup.tag.inside}},"directive tag":{pattern:/<%.*%>/gi,inside:{"directive tag":/<%\s*?[$=%#:]{0,2}|%>/gi,rest:Prism.languages.csharp}}}),Prism.languages.insertBefore("inside","punctuation",{"directive tag":Prism.languages.aspnet["directive tag"]},Prism.languages.aspnet.tag.inside["attr-value"]),Prism.languages.insertBefore("aspnet","comment",{"asp comment":/<%--[\w\W]*?--%>/g}),Prism.languages.insertBefore("aspnet",Prism.languages.javascript?"script":"tag",{"asp script":{pattern:/<script(?=.*runat=['"]?server['"]?)[\w\W]*?>[\w\W]*?<\/script>/gi,inside:{tag:{pattern:/<\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,inside:Prism.languages.aspnet.tag.inside},rest:Prism.languages.csharp||{}}}}),Prism.languages.aspnet.style&&(Prism.languages.aspnet.style.inside.tag.pattern=/<\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,Prism.languages.aspnet.style.inside.tag.inside=Prism.languages.aspnet.tag.inside),Prism.languages.aspnet.script&&(Prism.languages.aspnet.script.inside.tag.pattern=Prism.languages.aspnet["asp script"].inside.tag.pattern,Prism.languages.aspnet.script.inside.tag.inside=Prism.languages.aspnet.tag.inside);
\ No newline at end of file