Merge branch 'master' of https://github.com.cnpmjs.org/tianyiw2013/vs…

…code-php-docblocker into var

# Conflicts:
#	src/block.ts
#	src/block/function.ts
#	src/block/property.ts
#	test/fixtures/properties.php
#	test/helpers.ts
#	test/properties.test.ts

.github/workflows/test.yml

@@ -0,0 +1,26 @@
+name: Test Suite
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: 14.x
+
+    - name: Install dependencies
+      run: npm install
+
+    - name: Run tests
+      run: xvfb-run -a npm test
+
+    - name: Coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .vscode-test
+.vscode-test-web
 .nyc_output
 out
 node_modules

.vscode/launch.json

@@ -8,6 +8,7 @@
 			"runtimeExecutable": "${execPath}",
 			"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
 			"outFiles": ["${workspaceFolder}/out/**/*.js"],
+			"stopOnEntry": false,
 			"preLaunchTask": "npm: watch"
 		},
 		{
@@ -19,6 +20,7 @@
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/out/test/index"
 			],
+			"stopOnEntry": false,
 			"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
 			"preLaunchTask": "npm: watch"
 		}

.vscodeignore

@@ -1,5 +1,8 @@
 .vscode/**
 .vscode-test/**
+.vscode-test-web/**
+node_modules/**
+coverage/**
 out/test/**
 out/src/**
 !out/src/extension.js

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to the "php-docblocker" extension will be documented in this file.
 
+## [2.2.3] - 2021-10-18
+- Remove usage of FS module to fix start up errors in vscode web
+
+## [2.2.2] - 2021-10-18
+- Improve compatability with vscode web
+
 ## [2.2.1] - 2021-10-17
 - Supported workspace trust - Thanks @tianyiw2013
 - Add case insensitive matching - Thanks @tianyiw2013
@@ -121,7 +127,9 @@ All notable changes to the "php-docblocker" extension will be documented in this
 ## 0.1.0 - 2017-03-12
 - Initial release
 
-[Unreleased]: https://github.com/neild3r/vscode-php-docblocker/compare/v2.2.1...HEAD
+[Unreleased]: https://github.com/neild3r/vscode-php-docblocker/compare/v2.2.3...HEAD
+[2.2.3]: https://github.com/neild3r/vscode-php-docblocker/compare/v2.2.2...v2.2.3
+[2.2.2]: https://github.com/neild3r/vscode-php-docblocker/compare/v2.2.1...v2.2.2
 [2.2.1]: https://github.com/neild3r/vscode-php-docblocker/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/neild3r/vscode-php-docblocker/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/neild3r/vscode-php-docblocker/compare/v2.0.1...v2.1.0

README.md

@@ -1,6 +1,6 @@
 # PHP DocBlocker
 
-[![Latest Release](https://vsmarketplacebadge.apphb.com/version-short/neilbrayfield.php-docblocker.svg)](https://marketplace.visualstudio.com/items?itemName=neilbrayfield.php-docblocker) [![Installs](https://vsmarketplacebadge.apphb.com/installs/neilbrayfield.php-docblocker.svg)](https://marketplace.visualstudio.com/items?itemName=neilbrayfield.php-docblocker) [![Rating](https://vsmarketplacebadge.apphb.com/rating-short/neilbrayfield.php-docblocker.svg)](https://marketplace.visualstudio.com/items?itemName=neilbrayfield.php-docblocker) [![Build status](https://travis-ci.org/neild3r/vscode-php-docblocker.svg?branch=master)](https://travis-ci.org/neild3r/vscode-php-docblocker) [![Coverage status](https://coveralls.io/repos/github/neild3r/vscode-php-docblocker/badge.svg)](https://coveralls.io/github/neild3r/vscode-php-docblocker)
+[![Latest Release](https://vsmarketplacebadge.apphb.com/version-short/neilbrayfield.php-docblocker.svg)](https://marketplace.visualstudio.com/items?itemName=neilbrayfield.php-docblocker) [![Installs](https://vsmarketplacebadge.apphb.com/installs/neilbrayfield.php-docblocker.svg)](https://marketplace.visualstudio.com/items?itemName=neilbrayfield.php-docblocker) [![Rating](https://vsmarketplacebadge.apphb.com/rating-short/neilbrayfield.php-docblocker.svg)](https://marketplace.visualstudio.com/items?itemName=neilbrayfield.php-docblocker) [![Test Suite](https://github.com/neild3r/vscode-php-docblocker/actions/workflows/test.yml/badge.svg)](https://github.com/neild3r/vscode-php-docblocker/actions/workflows/test.yml) [![Coverage status](https://coveralls.io/repos/github/neild3r/vscode-php-docblocker/badge.svg)](https://coveralls.io/github/neild3r/vscode-php-docblocker)
 
 Basic PHP DocBlocking extension.