Powershell: Add support for two levels of nested brackets inside name…

…space pattern. Fixes #1317
PrismJS · Mar 1, 2018 · 3bc3e9c · 3bc3e9c
1 parent 8c3fa00
commit 3bc3e9c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/components/prism-powershell.js b/components/prism-powershell.js
@@ -27,7 +27,8 @@ Prism.languages.powershell = {
 		}
 	],
 	// Matches name spaces as well as casts, attribute decorators. Force starting with letter to avoid matching array indices
-	'namespace': /\[[a-z][\s\S]*?\]/i,
+	// Supports two levels of nested brackets (e.g. `[OutputType([System.Collections.Generic.List[int]])]`)
+	'namespace': /\[[a-z](?:\[(?:\[[^\]]*]|[^\[\]])*]|[^\[\]])*]/i,
 	'boolean': /\$(?:true|false)\b/i,
 	'variable': /\$\w+\b/i,
 	// Cmdlets and aliases. Aliases should come last, otherwise "write" gets preferred over "write-host" for example

diff --git a/components/prism-powershell.min.js b/components/prism-powershell.min.js
diff --git a/tests/languages/powershell/namespace_feature.test b/tests/languages/powershell/namespace_feature.test
@@ -1,13 +1,17 @@
 [System.String]::Empty;
 [Foo.Bar+Baz]::Abc;
 [int] 42;
+[string[]]
+[OutputType([System.Collections.Generic.List[int]])]
 
 ----------------------------------------------------
 
 [
 	["namespace", "[System.String]"],"::Empty",["punctuation", ";"],
 	["namespace", "[Foo.Bar+Baz]"],"::Abc",["punctuation", ";"],
-	["namespace", "[int]"]," 42",["punctuation", ";"]
+	["namespace", "[int]"]," 42",["punctuation", ";"],
+	["namespace", "[string[]]"],
+	["namespace", "[OutputType([System.Collections.Generic.List[int]])]"]
 ]
 ----------------------------------------------------