Inlined some unnecessary rest properties (#2082)

This inlines a few unnecessary `rest` properties.
PrismJS · Oct 16, 2019 · ad3fa44 · ad3fa44
1 parent cfac94e
commit ad3fa44
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 64 deletions.
diff --git a/components/prism-actionscript.js b/components/prism-actionscript.js
@@ -9,9 +9,7 @@ if (Prism.languages.markup) {
 		'xml': {
 			pattern: /(^|[^.])<\/?\w+(?:\s+[^\s>\/=]+=("|')(?:\\[\s\S]|(?!\2)[^\\])*\2)*\s*\/?>/,
 			lookbehind: true,
-			inside: {
-				rest: Prism.languages.markup
-			}
+			inside: Prism.languages.markup
 		}
 	});
-}
+}
diff --git a/components/prism-actionscript.min.js b/components/prism-actionscript.min.js
diff --git a/components/prism-haml.js b/components/prism-haml.js
@@ -20,16 +20,12 @@
 			{
 				pattern: /((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*,[\t ]*(?:(?:\r?\n|\r)\2[\t ]+.*,[\t ]*)*(?:(?:\r?\n|\r)\2[\t ]+.+)/,
 				lookbehind: true,
-				inside: {
-					rest: Prism.languages.ruby
-				}
+				inside: Prism.languages.ruby
 			},
 			{
 				pattern: /((?:^|\r?\n|\r)([\t ]*)(?:[~-]|[&!]?=)).*\|[\t ]*(?:(?:\r?\n|\r)\2[\t ]+.*\|[\t ]*)*/,
 				lookbehind: true,
-				inside: {
-					rest: Prism.languages.ruby
-				}
+				inside: Prism.languages.ruby
 			}
 		],
 
@@ -48,9 +44,7 @@
 		'markup': {
 			pattern: /((?:^|\r?\n|\r)[\t ]*)<.+/,
 			lookbehind: true,
-			inside: {
-				rest: Prism.languages.markup
-			}
+			inside: Prism.languages.markup
 		},
 		'doctype': {
 			pattern: /((?:^|\r?\n|\r)[\t ]*)!!!(?: .+)?/,
@@ -67,9 +61,7 @@
 						// Allows for one nested group of braces
 						pattern: /(^|[^#])\{(?:\{[^}]+\}|[^}])+\}/,
 						lookbehind: true,
-						inside: {
-							rest: Prism.languages.ruby
-						}
+						inside: Prism.languages.ruby
 					},
 					{
 						pattern: /\([^)]+\)/,
@@ -84,9 +76,7 @@
 					},
 					{
 						pattern: /\[[^\]]+\]/,
-						inside: {
-							rest: Prism.languages.ruby
-						}
+						inside: Prism.languages.ruby
 					}
 				],
 				'punctuation': /[<>]/
@@ -95,9 +85,7 @@
 		'code': {
 			pattern: /((?:^|\r?\n|\r)[\t ]*(?:[~-]|[&!]?=)).+/,
 			lookbehind: true,
-			inside: {
-				rest: Prism.languages.ruby
-			}
+			inside: Prism.languages.ruby
 		},
 		// Interpolations in plain text
 		'interpolation': {
@@ -151,4 +139,4 @@
 
 	Prism.languages.insertBefore('haml', 'filter', all_filters);
 
-}(Prism));
+}(Prism));
diff --git a/components/prism-haml.min.js b/components/prism-haml.min.js
diff --git a/components/prism-http.js b/components/prism-http.js
@@ -66,9 +66,7 @@
 			options[contentType] = {
 				pattern: RegExp('(content-type:\\s*' + pattern + '[\\s\\S]*?)(?:\\r?\\n|\\r){2}[\\s\\S]*', 'i'),
 				lookbehind: true,
-				inside: {
-					rest: httpLanguages[contentType]
-				}
+				inside: httpLanguages[contentType]
 			};
 		}
 	}

diff --git a/components/prism-http.min.js b/components/prism-http.min.js
diff --git a/components/prism-kotlin.js b/components/prism-kotlin.js
@@ -42,7 +42,7 @@
 		{
 			pattern: /\$\{[^}]+\}/,
 			inside: {
-				delimiter: {
+				'delimiter': {
 					pattern: /^\$\{|\}$/,
 					alias: 'variable'
 				},

diff --git a/components/prism-php.js b/components/prism-php.js
@@ -64,9 +64,7 @@
 	var string_interpolation = {
 		pattern: /{\$(?:{(?:{[^{}]+}|[^{}]+)}|[^{}])+}|(^|[^\\{])\$+(?:\w+(?:\[.+?]|->\w+)*)/,
 		lookbehind: true,
-		inside: {
-			rest: Prism.languages.php
-		}
+		inside: Prism.languages.php
 	};
 
 	Prism.languages.insertBefore('php', 'string', {

diff --git a/components/prism-php.min.js b/components/prism-php.min.js
diff --git a/components/prism-pug.js b/components/prism-pug.js
@@ -22,9 +22,7 @@
 		'multiline-script': {
 			pattern: /(^([\t ]*)script\b.*\.[\t ]*)(?:(?:\r?\n|\r(?!\n))(?:\2[\t ]+.+|\s*?(?=\r?\n|\r)))+/m,
 			lookbehind: true,
-			inside: {
-				rest: Prism.languages.javascript
-			}
+			inside: Prism.languages.javascript
 		},
 
 		// See at the end of the file for known filters
@@ -46,9 +44,7 @@
 		'markup': {
 			pattern: /(^[\t ]*)<.+/m,
 			lookbehind: true,
-			inside: {
-				rest: Prism.languages.markup
-			}
+			inside: Prism.languages.markup
 		},
 		'doctype': {
 			pattern: /((?:^|\n)[\t ]*)doctype(?: .+)?/,
@@ -98,16 +94,14 @@
 						pattern: /^\+\w+/,
 						alias: 'function'
 					},
-					'rest': Prism.languages.javascript
+					rest: Prism.languages.javascript
 				}
 			}
 		],
 		'script': {
 			pattern: /(^[\t ]*script(?:(?:&[^(]+)?\([^)]+\))*[\t ]+).+/m,
 			lookbehind: true,
-			inside: {
-				rest: Prism.languages.javascript
-			}
+			inside: Prism.languages.javascript
 		},
 
 		'plain-text': {
@@ -121,19 +115,15 @@
 				'attributes': [
 					{
 						pattern: /&[^(]+\([^)]+\)/,
-						inside: {
-							rest: Prism.languages.javascript
-						}
+						inside: Prism.languages.javascript
 					},
 					{
 						pattern: /\([^)]+\)/,
 						inside: {
 							'attr-value': {
 								pattern: /(=\s*)(?:\{[^}]*\}|[^,)\r\n]+)/,
 								lookbehind: true,
-								inside: {
-									rest: Prism.languages.javascript
-								}
+								inside: Prism.languages.javascript
 							},
 							'attr-name': /[\w-]+(?=\s*!?=|\s*[,)])/,
 							'punctuation': /[!=(),]+/
@@ -147,9 +137,7 @@
 			{
 				pattern: /(^[\t ]*(?:-|!?=)).+/m,
 				lookbehind: true,
-				inside: {
-					rest: Prism.languages.javascript
-				}
+				inside: Prism.languages.javascript
 			}
 		],
 		'punctuation': /[.\-!=|]+/