Fix match regex expression

edwinhuish · Nov 20, 2023 · 8a9a80b · 8a9a80b
1 parent 3a1250d
commit 8a9a80b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,6 +41,9 @@ jobs:
     permissions:
       contents: write
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## [3.0.8] (2023-11-20)
+
+### Bug Fixes
+
+* Fix match regex expression.
+
+# Change Log
+
 ## [3.0.8] (2023-10-26)
 
 ### Bug Fixes

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "displayName": "Better Comments (with embedded languages support)",
     "icon": "icon.png",
     "description": "Improve your code commenting by annotating with alert, informational, TODOs, and more!",
-    "version": "3.0.8",
+    "version": "3.0.9",
     "publisher": "edwinhuish",
     "author": {
         "name": "Edwin Xu"

diff --git a/src/parser.ts b/src/parser.ts
@@ -65,16 +65,16 @@ export class Parser {
       this.singleLinePicker = new RegExp(`(^)+([ \\t]*[ \\t]*)(${characters.join('|')})+(.*)`, 'igm');
     } else {
       // start by finding the delimiter (//, --, #, ') with optional spaces or tabs
-      this.singleLinePicker = new RegExp(`(${this.delimiter})+( |\t)(${characters.join('|')})+(.*)`, 'gm');
+      this.singleLinePicker = new RegExp(`(${this.delimiter})+([ |\t]?)(${characters.join('|')})+(.*)`, 'gm');
     }
 
     // Block expression
-    this.blockPickers = this.blockComments.map(mark => new RegExp(`(^|[ \\t])(${mark[0]}[\\s])+([\\s\\S]*?)(${mark[1]})`, 'gm'));
-    this.blockLinePicker = new RegExp(`^([ \\t]*)(${characters.join('|')})([ ]*|[:])+([^*\/][^\\r\\n]*)`, 'igm');
+    this.blockPickers = this.blockComments.map(mark => new RegExp(`(^|[ \\t]*)(${mark[0]}[\\s])+([\\s\\S]*?)(${mark[1]})`, 'gm'));
+    this.blockLinePicker = new RegExp(`([ \\t]*)(${characters.join('|')})([ ]*|[:])+([^*\/][^\\r\\n]*)`, 'igm');
 
     // Doc expression
-    this.docPicker = /(^|[ \t])(\/\*\*)+([\s\S]*?)(\*\/)/gm;
-    this.docLinePicker = new RegExp(`(^)+([ \\t]*\\*[ \\t]*)(${characters.join('|')})([ ]*|[:])+([^*/][^\\r\\n]*)`, 'igm');
+    this.docPicker = /(^|[ \t]*)(\/\*\*)+([\s\S]*?)(\*\/)/gm;
+    this.docLinePicker = new RegExp(`(^)+([ \\t]*\\*[ \\t]?)(${characters.join('|')})([ ]*|[:])+([^*/][^\\r\\n]*)`, 'igm');
   }
 
   /**