Merge fe54afd into 3e0bb77

neild3r · Aug 13, 2021 · 4ca362a · 4ca362a
2 parents 3e0bb77 + fe54afd
commit 4ca362a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Change Log
 
 All notable changes to the "php-docblocker" extension will be documented in this file.
+## [2.2.1] - 2021-10-13
+- Supported workspace trust
 
 ## [2.2.0] - 2021-10-11
 - Use esbundle to improve startup performance

diff --git a/README.md b/README.md
@@ -122,7 +122,7 @@ and can be triggered by typing @ then another characted (Provided your vscode se
 | @abstract                    | @abstract                               |
 | @after                       | @after                                  |
 | @afterClass                  | @afterClass                             |
-| @author                      | @author ${1:{{name}}} <${2:{{email}}}>  |
+| @author                      | @author \${1:name} <${2:email}>         |
 | @backupGlobals               | @backupGlobals ${1:switch}              |
 | @backupStaticAttributes      | @backupStaticAttributes ${1:switch}     |
 | @before                      | @before                                 |

diff --git a/package.json b/package.json
@@ -28,6 +28,11 @@
   "bugs": {
     "url": "https://github.com/neild3r/vscode-php-docblocker/issues"
   },
+  "capabilities": {
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+  },
   "icon": "images/logo.png",
   "main": "./out/src/extension.js",
   "contributes": {
@@ -39,7 +44,7 @@
     ],
     "configuration": {
       "type": "object",
-      "title": "PHP DocBlocker configuration",
+      "title": "PHP DocBlocker",
       "properties": {
         "php-docblocker.gap": {
           "type": "boolean",

diff --git a/src/block/function.ts b/src/block/function.ts
@@ -16,7 +16,7 @@ export default class FunctionBlock extends Block
     /**
      * @inheritdoc
      */
-    protected pattern:RegExp = /^\s*((.*)(protected|private|public))?(.*)?\s*function\s+&?([A-Za-z0-9_]+)\s*\(([^{;]*)/m;
+    protected pattern:RegExp = /^\s*((.*)(protected|private|public))?(.*)?\s*function\s+&?([a-z0-9_]+)\s*\(([^{;]*)/im;
 
     /**
      * @inheritdoc