Merge pull request #169 from StartAutomating/Irregular-Improvement

Irregular improvement

Author: StartAutomating

.github/workflows/RunIrregularAction.yml

@@ -1,4 +1,18 @@
-## 0.7.5:
+## 0.7.6:
+
+* New-RegEx improvements:
+  * Now supporting new character classes:  MarkSpacing, MarkEnclosing, MarkNonEnclosing (Fixes #168)
+
+* More CSharp Patterns:
+  * ?<CSharp_Class> (Fixes #164)
+  * ?<CSharp_Identifier> (Fixes #165)
+
+* Improved Patterns:
+  * ?<ANSI_4BitColor>/?<ANSI_Style>: Handling brightness bit before or after color (Fixes #166)
+
+---
+
+## 0.7.5:
 
 * Added Patterns for Liquid:
   * ?<Liquid_Expression> (Fixes #153)

CHANGELOG.md

@@ -2,7 +2,7 @@
 Push-Location $PSScriptRoot
 
 Import-BuildStep -ModuleName Irregular
-New-GitHubWorkflow -Name "Test, Tag, Release, and Publish" -Job PowerShellStaticAnalysis, TestPowerShellOnLinux, TagReleaseAndPublish, BuildModule -On Push, Demand |
+New-GitHubWorkflow -Name "Test, Tag, Release, and Publish" -Job PowerShellStaticAnalysis, TestPowerShellOnLinux, TagReleaseAndPublish, BuildIrregular -On Push, Demand |
     Set-Content .\.github\workflows\IrregularTests.yml -Encoding UTF8 -PassThru
 
 New-GitHubWorkflow -Name "Run GitHub Action" -On Push, Demand -Job UseIrregularAction |

Irregular.GitHubWorkflow.PSDevops.ps1

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-16"?>
-<!-- Generated with EZOut 1.9.6: Install-Module EZOut or https://github.com/StartAutomating/EZOut -->
+<!-- Generated with EZOut 1.9.7: Install-Module EZOut or https://github.com/StartAutomating/EZOut -->
 <Configuration>
   <ViewDefinitions>
     <View>

Irregular.format.ps1xml

@@ -1,5 +1,5 @@
 @{
-    ModuleVersion = '0.7.5'
+    ModuleVersion = '0.7.6'
     RootModule = 'Irregular.psm1'
     Description = 'Regular Expressions made Strangely Simple'
     FormatsToProcess = 'Irregular.format.ps1xml'
@@ -14,6 +14,20 @@
             LicenseURI = 'https://github.com/StartAutomating/Irregular/blob/master/LICENSE'
             IconURI    = 'https://github.com/StartAutomating/Irregular/blob/master/Assets/Irregular_600_Square.png'        
             ReleaseNotes = @'
+## 0.7.6:
+
+* New-RegEx improvements:
+  * Now supporting new character classes:  MarkSpacing, MarkEnclosing, MarkNonEnclosing (Fixes #168)
+
+* More CSharp Patterns:
+  * ?<CSharp_Class> (Fixes #164)
+  * ?<CSharp_Identifier> (Fixes #165)
+
+* Improved Patterns:
+  * ?<ANSI_4BitColor>/?<ANSI_Style>: Handling brightness bit before or after color (Fixes #166)
+
+---
+
 ## 0.7.5:
 
 * Added Patterns for Liquid:

Irregular.psd1

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-16"?>
-<!-- Generated with EZOut 1.9.6: Install-Module EZOut or https://github.com/StartAutomating/EZOut -->
+<!-- Generated with EZOut 1.9.7: Install-Module EZOut or https://github.com/StartAutomating/EZOut -->
 <Types>
   <Type>
     <Name>Irregular.Match.Extract</Name>

Irregular.types.ps1xml

@@ -82,6 +82,9 @@
         'CombiningMark' ,'\p{Mc}',
         'EnclosingMark' , '\p{Me}',
         'Mark' , '\p{M}',
+        'MarkSpacing' , '\p{Mc}',
+        'MarkNonSpacing' , '\p{Mn}',
+        'MarkEnclosing' , '\p{Me}',
         'Number' , '\p{N}',
         'NumberDecimalDigit' , '\p{Nd}',
         'NumberLetter' , '\p{Nl}',

New-RegEx.ps1

@@ -3,7 +3,7 @@
 <h2>Regular Expressions made Strangely Simple</h2>
 <h3>A PowerShell module that helps you understand, use, and build Regular Expressions.</h3>
 <h4>
-<a href='https://github.com/StartAutomating/Irregular/releases/tag/v0.7.5'>v 0.7.5 </a>
+<a href='https://github.com/StartAutomating/Irregular/releases/tag/v0.7.6'>v 0.7.6 </a>
 </h4>
 <a href='https://www.powershellgallery.com/packages/Irregular/'>
 <img src='https://img.shields.io/powershellgallery/dt/Irregular' />
@@ -32,7 +32,7 @@ Once you understand some basics of that syntax, regular expressions become a lot
 3. A Regex can have comments! ( # Like this in .NET  ( or like (?#this comment) in ECMAScript ) ).
 4. You don't have to do it all in one expression! 
 
-Irregular comes with 133 useful [named expressions](SavedPatterns.md), and lets you create more.
+Irregular comes with 134 useful [named expressions](SavedPatterns.md), and lets you create more.
 
 To see the expressions that ship with Irregular, run:
 
@@ -72,7 +72,7 @@ New-RegEx -StartAnchor StringStart -Pattern @(
 
 Irregular also contains a colorized PowerShell formatter for all Regular Expressions.
 This provides syntax highlighting that can make complicated expressions easier to read.
-![RegexSyntaxHighlighting](assets/images/RegexSyntaxHighlighting.gif)
+![RegexSyntaxHighlighting](assets/RegexSyntaxHighlighting.gif)
 
 
 #### Building Regular Expressions

README.md

@@ -82,7 +82,7 @@ New-RegEx -StartAnchor StringStart -Pattern @(
 
 Irregular also contains a colorized PowerShell formatter for all Regular Expressions.
 This provides syntax highlighting that can make complicated expressions easier to read.
-![RegexSyntaxHighlighting](assets/images/RegexSyntaxHighlighting.gif)
+![RegexSyntaxHighlighting](assets/RegexSyntaxHighlighting.gif)
 
 
 #### Building Regular Expressions

README.ps1.md

@@ -7,23 +7,28 @@ New-RegEx -Description "Matches an ANSI 3 or 4-bit color" |
     New-RegEx -Pattern (
 
         New-RegEx -Atomic -Or @(
+
             New-RegEx -Pattern 1 -Optional -Name IsBright |
-                New-RegEx -LiteralCharacter ';' -Min 0 -Max 1 |    
-                New-RegEx -Pattern '3' -Name IsForegroundColor
-            
+                New-RegEx -LiteralCharacter ';' -Min 0 -Max 1 -Comment "A 1 and a semicolon indicate a bright color" |    
+                New-RegEx -Pattern '3' -Name IsForegroundColor -Comment "A number that starts with 3 indicates foreground color"
+                        
             New-RegEx -Name IsBright (
                 New-RegEx -Pattern '9' -Name IsForegroundColor
-            )
+            ) -Comment "OR it could be a less common bright foreground color, which starts with 9"
 
             New-RegEx -Pattern 1 -Optional -Name IsBright |
-                New-RegEx -LiteralCharacter ';' -Min 0 -Max 1 |
-                New-RegEx -Pattern '4' -Name IsBackgroundColor
+                New-RegEx -LiteralCharacter ';' -Min 0 -Max 1 -Comment "A 1 and a semicolon indicate a bright color"|
+                New-RegEx -Pattern '4' -Name IsBackgroundColor -Comment "A number that starts with 3 indicates foreground color"
 
             New-RegEx -Name IsBright (
                 New-RegEx -Pattern '10' -Name IsBackgroundColor
-            )
-        ) |
-        New-RegEx -Pattern '[0-7]' -Name ColorNumber |
+            ) -Comment "OR it could be a less common bright foreground color, which starts with 9"
+        ) |        
+        New-RegEx -Pattern '[0-7]' -Name ColorNumber -Comment "The color number will be between 0 and 7" |
+        New-RegEx -NoCapture -Optional @(
+            New-RegEx -LiteralCharacter ';' -Min 0 -Max 1 |
+                New-RegEx -Pattern 1 -Optional -Name IsBright
+        ) -Comment "Brightness can also come after a color" |
         New-RegEx -LiteralCharacter 'm'
-    ) -Name Color | #>   
-    Set-Content -Path (Join-Path $myRoot $myName)
+    ) -Name Color |
+    Set-Content -Path (Join-Path $myRoot $myName) -PassThru