Merge branch 'master' into sabre/event-5.0.3-#166.1.0

Author: felixfbecker

README.md

@@ -40,9 +40,11 @@ I recommend to disable VS Code's built-in PHP IntelliSense by setting `php.sugge
 ### Column-accurate error reporting
 ![Error reporting demo](images/publishDiagnostics.png)
 
-### Format code
+### Code style linting
 Please use a dedicated extension like [PHP CodeSniffer](https://marketplace.visualstudio.com/items?itemName=ikappas.phpcs).
 
+### Format code
+Please use a dedicated extension like [PHP CS Fixer](https://marketplace.visualstudio.com/items?itemName=junstyle.php-cs-fixer).
 
 ## Todo
  - Rename
@@ -54,7 +56,7 @@ Clone whole repository and in root directory execute:
 ```bash
 composer install
 npm install
-npm run compile
+npm run build
 code .
 ```
 The last command will open the folder in VS Code. Hit `F5` to launch an Extension Development Host with the extension.

composer.json

@@ -2,7 +2,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "felixfbecker/language-server": "v5.3.7"
+        "felixfbecker/language-server": "v5.4.0"
     },
     "scripts": {
         "parse-stubs": "LanguageServer\\ComposerScripts::parseStubs",

composer.lock

@@ -93,7 +93,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     // Options to control the language client
     const clientOptions: LanguageClientOptions = {
         // Register the server for php documents
-        documentSelector: ['php'],
+        documentSelector: [
+            { scheme: 'file', language: 'php' },
+            { scheme: 'untitled', language: 'php' }
+        ],
         uriConverters: {
             // VS Code by default %-encodes even the colon after the drive letter
             // NodeJS handles it much better