.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,4 @@
+
 <!--
 
 THERE IS A 99% CHANCE YOU ARE FILING THIS ISSUE IN THE WRONG REPOSITORY.

.gitignore

@@ -2,3 +2,4 @@ node_modules/
 out/
 vendor/
 .DS_Store
+package-lock.json

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.prettierignore

@@ -1,4 +0,0 @@
-package.json
-package-lock.json
-vendor/
-out/

.prettierrc

@@ -1,22 +0,0 @@
-{
-  "tabWidth": 4,
-  "printWidth": 120,
-  "proseWrap": "preserve",
-  "semi": false,
-  "trailingComma": "es5",
-  "singleQuote": true,
-  "overrides": [
-    {
-      "files": "{*.js?(on),*.y?(a)ml,.*.js?(on),.*.y?(a)ml,*.md,.prettierrc,.stylelintrc,.babelrc}",
-      "options": {
-        "tabWidth": 2
-      }
-    },
-    {
-      "files": "composer.{json,lock}",
-      "options": {
-        "tabWidth": 4
-      }
-    }
-  ]
-}

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - '7.1'
+  - '7.0'
 
 cache:
   directories:
@@ -9,11 +9,11 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  - nvm install '12.4.0'
+  - nvm install 8
-  - nvm use '12.4.0'
+  - nvm use 8
 
 install:
-  - npm ci
+  - npm install
 
 script:
   - npm run lint
@@ -23,9 +23,9 @@ jobs:
   include:
     - stage: test
     - stage: release
-      php: '7.1'
+      php: '7.0'
       install:
-        - npm ci
+        - npm install
         - composer install --prefer-dist --no-interaction --optimize-autoloader
       script:
         - npm run build
@@ -37,6 +37,5 @@ stages:
     if: branch = master AND type = push AND fork = false
 
 branches:
-  only:
+  except:
-    - master
+    - /^v\d+\.\d+\.\d+$/
-    - /^renovate\/.+/

.vscode/launch.json

@@ -7,7 +7,9 @@
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
+      "args": [
+        "--extensionDevelopmentPath=${workspaceRoot}"
+      ],
       "stopOnEntry": false,
       "sourceMaps": true,
       "outDir": "${workspaceRoot}/out"
@@ -17,7 +19,10 @@
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test"],
+      "args": [
+        "--extensionDevelopmentPath=${workspaceRoot}",
+        "--extensionTestsPath=${workspaceRoot}/out/test"
+      ],
       "stopOnEntry": false,
       "sourceMaps": true,
       "outDir": "${workspaceRoot}/out/test"

.vscode/settings.json

@@ -1,10 +1,10 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-  "files.exclude": {
+	"files.exclude": {
-    "out": false // set this to true to hide the "out" folder with the compiled JS files
+		"out": false // set this to true to hide the "out" folder with the compiled JS files
-  },
+	},
-  "search.exclude": {
+	"search.exclude": {
-    "out": true // set this to false to include "out" folder in search results
+		"out": true // set this to false to include "out" folder in search results
-  },
+	},
-  "typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version
+	"typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version
 }

.vscode/tasks.json

@@ -6,12 +6,16 @@
     {
       "type": "npm",
       "script": "build",
-      "problemMatcher": ["$tsc"]
+      "problemMatcher": [
+        "$tsc"
+      ]
     },
     {
       "type": "npm",
       "script": "watch",
-      "problemMatcher": ["$tsc-watch"]
+      "problemMatcher": [
+        "$tsc-watch"
+      ]
     }
   ]
 }

.vscodeignore

@@ -5,7 +5,6 @@ images/**
 out/test/**
 src/**
 vendor/jetbrains/phpstorm-stubs/**
-!vendor/jetbrains/phpstorm-stubs/PhpStormStubsMap.php
 vendor/bin/**
 **/.DS_Store
 **/.editorconfig

CHANGELOG.md

@@ -1 +1,2 @@
+
 # See [GitHub releases](https://github.com/felixfbecker/vscode-php-intellisense/releases)

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2018 Felix Becker
+Copyright (c) 2017 Felix Becker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # PHP IntelliSense
 
-[![vs marketplace](https://img.shields.io/vscode-marketplace/v/felixfbecker.php-intellisense.svg?label=vs%20marketplace)](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-intellisense) [![downloads](https://img.shields.io/vscode-marketplace/d/felixfbecker.php-intellisense.svg)](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-intellisense) [![rating](https://img.shields.io/vscode-marketplace/r/felixfbecker.php-intellisense.svg)](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-intellisense) [![build](https://travis-ci.org/felixfbecker/vscode-php-intellisense.svg?branch=master)](https://travis-ci.org/felixfbecker/vscode-php-intellisense) [![php: >=7.0.0](https://img.shields.io/badge/php->=7.0-8892BF.svg)](https://php.net/) [![chat: on gitter](https://badges.gitter.im/felixfbecker/vscode-php-intellisense.svg)](https://gitter.im/felixfbecker/vscode-php-intellisense?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+[![vs marketplace](https://img.shields.io/vscode-marketplace/v/felixfbecker.php-intellisense.svg?label=vs%20marketplace)](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-intellisense) [![downloads](https://img.shields.io/vscode-marketplace/d/felixfbecker.php-intellisense.svg)](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-intellisense) [![rating](https://img.shields.io/vscode-marketplace/r/felixfbecker.php-intellisense.svg)](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-intellisense) [![build](https://travis-ci.org/felixfbecker/vscode-php-intellisense.svg?branch=master)](https://travis-ci.org/felixfbecker/vscode-php-intellisense) [![dependencies](https://gemnasium.com/felixfbecker/vscode-php-intellisense.svg)](https://gemnasium.com/felixfbecker/vscode-php-intellisense) [![php: >=7.0.0](https://img.shields.io/badge/php->=7.0-8892BF.svg)](https://php.net/) [![chat: on gitter](https://badges.gitter.im/felixfbecker/vscode-php-intellisense.svg)](https://gitter.im/felixfbecker/vscode-php-intellisense?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
 Advanced PHP IntelliSense for Visual Studio Code.
 
@@ -15,63 +15,45 @@ I recommend to disable VS Code's built-in PHP IntelliSense by setting `php.sugge
 ## Features
 
 ### Completion
-
 ![Completion search demo](images/completion.gif)
 
-### Signature Help
-
-![Signature help demo](images/signatureHelp.gif)
-
 ### Workspace symbol search
-
 ![Workspace symbol search demo](images/workspaceSymbol.gif)
 
 ### Find all References
-
 ![Find References demo](images/references.png)
 
 ### Go to Definition
-
 ![Go To Definition demo](images/definition.gif)
 
 ### Hover
-
 ![Hover class demo](images/hoverClass.png)
 
 ![Hover parameter demo](images/hoverParam.png)
 
 ### Find all symbols
-
 ![Find all symbols demo](images/documentSymbol.gif)
 
 ### Column-accurate error reporting
-
 ![Error reporting demo](images/publishDiagnostics.png)
 
-### Code style linting
+### Format code
-
 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
-- Rename
+ - Signature help
-- Signature help
 
 ## Contributing
 
 Clone whole repository and in root directory execute:
-
 ```bash
 composer install
 npm install
-npm run build
+npm run compile
 code .
 ```
-
 The last command will open the folder in VS Code. Hit `F5` to launch an Extension Development Host with the extension.
 For working on the language server, the easiest way is to replace the language server installation from composer in `vendor/felixfbecker/language-server` with a symlink to your local clone.
 

composer.json

@@ -1,13 +1,8 @@
 {
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "config": {
-        "platform": {
-            "php": "7.1.0"
-        }
-    },
     "require": {
-        "felixfbecker/language-server": "5.4.6"
+        "felixfbecker/language-server": "^5.0.0"
     },
     "scripts": {
         "parse-stubs": "LanguageServer\\ComposerScripts::parseStubs",

dependencies.yml

@@ -1,33 +1,35 @@
 collectors:
+
+- type: js-npm
+  path: /
+  actors:
+  # pull requests for new major versions
   - type: js-npm
-    path: /
+    versions: "Y.0.0"
-    actors:
-      # pull requests for new major versions
-      - type: js-npm
-        versions: 'Y.0.0'
-        settings:
-          # these updates should generally not have an effect on users
-          commit_message_prefix: 'chore: '
-
-  # receive pull requests to update composer.lock for any update to the language server or dependencies of it
-  # after merging, depending on whether it was a patch or feature update,
-  # semantic-release will bundle a new patch or feature version of the extension
-  - type: php-composer
-    path: /
     settings:
-      collect_transitive: true
+      # these updates should generally not have an effect on users
-    actors:
+      commit_message_prefix: "chore: "
-      - type: php-composer
-        versions: 'L.L.Y'
-        settings:
-          commit_message_prefix: 'fix: '
 
-      - type: php-composer
+# receive pull requests to update composer.lock for any update to the language server or dependencies of it
-        versions: 'L.Y.0'
+# after merging, depending on whether it was a patch or feature update,
-        settings:
+# semantic-release will bundle a new patch or feature version of the extension
-          commit_message_prefix: 'feat: '
+- type: php-composer
+  path: /
+  settings:
+    collect_transitive: true
+  actors:
 
-      - type: php-composer
+  - type: php-composer
-        versions: 'Y.0.0'
+    versions: "L.L.Y"
-        settings:
+    settings:
-          commit_message_prefix: 'chore: '
+      commit_message_prefix: "fix: "
+
+  - type: php-composer
+    versions: "L.Y.0"
+    settings:
+      commit_message_prefix: "feat: "
+
+  - type: php-composer
+    versions: "Y.0.0"
+    settings:
+      commit_message_prefix: "chore: "

package.json

@@ -9,7 +9,7 @@
   "preview": false,
   "version": "1.5.4",
   "engines": {
-    "vscode": "^1.26.1"
+    "vscode": "^1.17.1"
   },
   "keywords": [
     "php",
@@ -19,7 +19,7 @@
     "refactor"
   ],
   "categories": [
-    "Programming Languages"
+    "Languages"
   ],
   "icon": "images/logo.png",
   "galleryBanner": {
@@ -38,59 +38,50 @@
     "workspaceContains:**/*.php"
   ],
   "main": "./out/extension",
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -e $HUSKY_GIT_PARAMS"
-    }
-  },
   "scripts": {
     "build": "tsc -p .",
     "watch": "tsc -w -p .",
     "postinstall": "node ./node_modules/vscode/bin/install",
-    "lint": "npm run prettier && npm run tslint",
+    "lint": "tslint -c tslint.json \"src/**/*.ts\"",
-    "tslint": "tslint -p tsconfig.json -c tslint.json \"src/**/*.ts\"",
+    "semantic-release": "semantic-release",
-    "prettier": "prettier '**/{*.{js?(on),ts,yml},.*.js?(on),.*.yml,.prettierrc,*.md}' --write --list-different",
+    "commitmsg": "validate-commit-msg"
-    "semantic-release": "semantic-release"
   },
   "devDependencies": {
-    "@commitlint/cli": "7.2.1",
+    "@semantic-release/github": "^2.0.0",
-    "@commitlint/config-conventional": "7.1.2",
+    "@types/mocha": "^2.2.42",
-    "@types/execa": "0.9.0",
+    "@types/mz": "^0.0.31",
-    "@types/mocha": "5.2.7",
+    "@types/node": "^8.0.24",
-    "@types/mz": "0.0.32",
+    "@types/semver": "^5.3.34",
-    "@types/node": "8.10.29",
+    "cz-conventional-changelog": "^2.0.0",
-    "@types/semver": "6.2.0",
+    "husky": "^0.14.3",
-    "husky": "1.1.3",
+    "semantic-release": "^11.0.0",
-    "prettier": "1.15.3",
+    "semantic-release-vsce": "^1.0.0",
-    "semantic-release": "15.10.8",
+    "tslint": "^5.0.0",
-    "semantic-release-vsce": "2.1.2",
+    "typescript": "^2.1.4",
-    "tslint": "5.11.0",
+    "validate-commit-msg": "^2.14.0",
-    "tslint-config-prettier": "1.15.0",
+    "vscode": "^1.0.0"
-    "typescript": "3.1.6",
-    "vscode": "1.1.21"
   },
   "dependencies": {
-    "execa": "1.0.0",
+    "mz": "^2.4.0",
-    "mz": "2.7.0",
+    "semver": "^5.3.0",
-    "semver": "6.3.0",
+    "vscode-languageclient": "^3.0.3"
-    "vscode-languageclient": "5.1.1"
   },
-  "commitlint": {
+  "config": {
-    "extends": [
+    "commitizen": {
-      "@commitlint/config-conventional"
+      "path": "./node_modules/cz-conventional-changelog"
-    ]
+    }
   },
   "release": {
     "verifyConditions": [
       "semantic-release-vsce",
       "@semantic-release/github"
     ],
-    "prepare": {
+    "getLastRelease": "semantic-release-vsce",
-      "path": "semantic-release-vsce",
-      "packageVsix": "php-intellisense.vsix"
-    },
     "publish": [
-      "semantic-release-vsce",
+      {
+        "path": "semantic-release-vsce",
+        "packageVsix": "php-intellisense.vsix"
+      },
       {
         "path": "@semantic-release/github",
         "assets": "php-intellisense.vsix"
@@ -104,8 +95,8 @@
       "properties": {
         "php.memoryLimit": {
           "type": "string",
-          "default": "4095M",
+          "default": "-1",
-          "description": "The memory limit of the php language server. [Number][K|M|G]. Use '-1' to allow unlimited use of the RAM (default is 4G).",
+          "description": "The memory limit of the php language server. [Number][K|M|G]. Use '-1' to allow unlimited use of the RAM(default).",
           "pattern": "^\\d+[KMG]?$"
         },
         "php.executablePath": {

renovate.json

@@ -1,41 +0,0 @@
-{
-  "extends": ["config:base", ":maintainLockFilesMonthly"],
-  "prCreation": "not-pending",
-  "rangeStrategy": "pin",
-  "semanticCommits": true,
-  "npm": {
-    "packageRules": [
-      {
-        "packagePatterns": ["*"],
-        "semanticCommitType": "chore",
-        "minor": {
-          "groupName": "all non-major dependencies",
-          "groupSlug": "all-minor-patch"
-        }
-      }
-    ]
-  },
-  "separateMinorPatch": true,
-  "composer": {
-    "enabled": true,
-    "rollbackPrs": false
-  },
-  "packageRules": [
-    {
-      "packagePatterns": ["^@types/"],
-      "automerge": true
-    },
-    {
-      "packageNames": ["felixfbecker/language-server"],
-      "schedule": [],
-      "updateTypes": ["minor"],
-      "semanticCommitType": "feat"
-    },
-    {
-      "packageNames": ["felixfbecker/language-server"],
-      "schedule": [],
-      "updateTypes": ["patch"],
-      "semanticCommitType": "fix"
-    }
-  ]
-}

src/extension.ts

@@ -1,137 +1,117 @@
-import execa from 'execa'
+
-import { ChildProcess, spawn } from 'mz/child_process'
+import * as path from 'path';
-import * as net from 'net'
+import { spawn, execFile, ChildProcess } from 'mz/child_process';
-import * as path from 'path'
+import * as vscode from 'vscode';
-import * as semver from 'semver'
+import { LanguageClient, LanguageClientOptions, StreamInfo } from 'vscode-languageclient';
-import * as url from 'url'
+import * as semver from 'semver';
-import * as vscode from 'vscode'
+import * as net from 'net';
-import { LanguageClient, LanguageClientOptions, RevealOutputChannelOn, StreamInfo } from 'vscode-languageclient'
+import * as url from 'url';
-const composerJson = require('../composer.json')
 
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
-    const conf = vscode.workspace.getConfiguration('php')
-    const executablePath =
-        conf.get<string>('executablePath') ||
-        conf.get<string>('validate.executablePath') ||
-        (process.platform === 'win32' ? 'php.exe' : 'php')
 
-    const memoryLimit = conf.get<string>('memoryLimit') || '4095M'
+    const conf = vscode.workspace.getConfiguration('php');
+    const executablePath = conf.get<string>('executablePath') || 'php';
+
+    const memoryLimit = conf.get<string>('memoryLimit') || '-1';
 
     if (memoryLimit !== '-1' && !/^\d+[KMG]?$/.exec(memoryLimit)) {
         const selected = await vscode.window.showErrorMessage(
             'The memory limit you\'d provided is not numeric, nor "-1" nor valid php shorthand notation!',
             'Open settings'
-        )
+        );
         if (selected === 'Open settings') {
-            await vscode.commands.executeCommand('workbench.action.openGlobalSettings')
+            await vscode.commands.executeCommand('workbench.action.openGlobalSettings');
         }
-        return
+        return;
     }
 
     // Check path (if PHP is available and version is ^7.0.0)
-    let stdout: string
+    let stdout: string;
     try {
-        stdout = await execa.stdout(executablePath, ['--version'])
+        [stdout] = await execFile(executablePath, ['--version']);
     } catch (err) {
         if (err.code === 'ENOENT') {
             const selected = await vscode.window.showErrorMessage(
                 'PHP executable not found. Install PHP 7 and add it to your PATH or set the php.executablePath setting',
                 'Open settings'
-            )
+            );
             if (selected === 'Open settings') {
-                await vscode.commands.executeCommand('workbench.action.openGlobalSettings')
+                await vscode.commands.executeCommand('workbench.action.openGlobalSettings');
             }
         } else {
-            vscode.window.showErrorMessage('Error spawning PHP: ' + err.message)
+            vscode.window.showErrorMessage('Error spawning PHP: ' + err.message);
-            console.error(err)
+            console.error(err);
         }
-        return
+        return;
     }
 
     // Parse version and discard OS info like 7.0.8--0ubuntu0.16.04.2
-    const match = stdout.match(/^PHP ([^\s]+)/m)
+    const match = stdout.match(/^PHP ([^\s]+)/m);
     if (!match) {
-        vscode.window.showErrorMessage('Error parsing PHP version. Please check the output of php --version')
+        vscode.window.showErrorMessage('Error parsing PHP version. Please check the output of php --version');
-        return
+        return;
     }
-    let version = match[1].split('-')[0]
+    let version = match[1].split('-')[0];
     // Convert PHP prerelease format like 7.0.0rc1 to 7.0.0-rc1
     if (!/^\d+.\d+.\d+$/.test(version)) {
-        version = version.replace(/(\d+.\d+.\d+)/, '$1-')
+        version = version.replace(/(\d+.\d+.\d+)/, '$1-');
     }
-    if (semver.lt(version, composerJson.config.platform.php)) {
+    if (semver.lt(version, '7.0.0')) {
-        vscode.window.showErrorMessage('The language server needs at least PHP 7.1 installed. Version found: ' + version)
+        vscode.window.showErrorMessage('The language server needs at least PHP 7 installed. Version found: ' + version);
-        return
+        return;
     }
 
-    let client: LanguageClient
+    const serverOptions = () => new Promise<ChildProcess | StreamInfo>((resolve, reject) => {
-
+        // Use a TCP socket because of problems with blocking STDIO
-    const serverOptions = () =>
+        const server = net.createServer(socket => {
-        new Promise<ChildProcess | StreamInfo>((resolve, reject) => {
+            // 'connection' listener
-            // Use a TCP socket because of problems with blocking STDIO
+            console.log('PHP process connected');
-            const server = net.createServer(socket => {
+            socket.on('end', () => {
-                // 'connection' listener
+                console.log('PHP process disconnected');
-                console.log('PHP process connected')
+            });
-                socket.on('end', () => {
+            server.close();
-                    console.log('PHP process disconnected')
+            resolve({ reader: socket, writer: socket });
-                })
+        });
-                server.close()
+        // Listen on random port
-                resolve({ reader: socket, writer: socket })
+        server.listen(0, '127.0.0.1', () => {
-            })
+            // The server is implemented in PHP
-            // Listen on random port
+            const childProcess = spawn(executablePath, [
-            server.listen(0, '127.0.0.1', () => {
+                context.asAbsolutePath(path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php')),
-                // The server is implemented in PHP
+                '--tcp=127.0.0.1:' + server.address().port,
-                const childProcess = spawn(executablePath, [
+                '--memory-limit=' + memoryLimit
-                    context.asAbsolutePath(
+            ]);
-                        path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php')
+            childProcess.stderr.on('data', (chunk: Buffer) => {
-                    ),
+                console.error(chunk + '');
-                    '--tcp=127.0.0.1:' + server.address().port,
+            });
-                    '--memory-limit=' + memoryLimit,
+            childProcess.stdout.on('data', (chunk: Buffer) => {
-                ])
+                console.log(chunk + '');
-                childProcess.stderr.on('data', (chunk: Buffer) => {
+            });
-                    const str = chunk.toString()
+            return childProcess;
-                    console.log('PHP Language Server:', str)
+        });
-                    client.outputChannel.appendLine(str)
+    });
-                })
-                // childProcess.stdout.on('data', (chunk: Buffer) => {
-                //     console.log('PHP Language Server:', chunk + '');
-                // });
-                childProcess.on('exit', (code, signal) => {
-                    client.outputChannel.appendLine(
-                        `Language server exited ` + (signal ? `from signal ${signal}` : `with exit code ${code}`)
-                    )
-                    if (code !== 0) {
-                        client.outputChannel.show()
-                    }
-                })
-                return childProcess
-            })
-        })
 
     // Options to control the language client
     const clientOptions: LanguageClientOptions = {
         // Register the server for php documents
-        documentSelector: [{ scheme: 'file', language: 'php' }, { scheme: 'untitled', language: 'php' }],
+        documentSelector: ['php'],
-        revealOutputChannelOn: RevealOutputChannelOn.Never,
         uriConverters: {
             // VS Code by default %-encodes even the colon after the drive letter
             // NodeJS handles it much better
             code2Protocol: uri => url.format(url.parse(uri.toString(true))),
-            protocol2Code: str => vscode.Uri.parse(str),
+            protocol2Code: str => vscode.Uri.parse(str)
         },
         synchronize: {
             // Synchronize the setting section 'php' to the server
             configurationSection: 'php',
             // Notify the server about changes to PHP files in the workspace
-            fileEvents: vscode.workspace.createFileSystemWatcher('**/*.php'),
+            fileEvents: vscode.workspace.createFileSystemWatcher('**/*.php')
-        },
+        }
-    }
+    };
 
     // Create the language client and start the client.
-    client = new LanguageClient('PHP Language Server', serverOptions, clientOptions)
+    const disposable = new LanguageClient('PHP Language Server', serverOptions, clientOptions).start();
-    const disposable = client.start()
 
     // Push the disposable to the context's subscriptions so that the
     // client can be deactivated on extension deactivation
-    context.subscriptions.push(disposable)
+    context.subscriptions.push(disposable);
 }

src/test/extension.test.ts

@@ -4,7 +4,7 @@
 //
 
 // The module 'assert' provides assertion methods from node
-import * as assert from 'assert'
+import * as assert from 'assert';
 
 // You can import and use all API from the 'vscode' module
 // as well as import your extension to test it
@@ -13,9 +13,10 @@ import * as assert from 'assert'
 
 // Defines a Mocha test suite to group tests of similar kind together
 suite('Extension Tests', () => {
+
     // Defines a Mocha unit test
     test('Something 1', () => {
-        assert.equal(-1, [1, 2, 3].indexOf(5))
+        assert.equal(-1, [1, 2, 3].indexOf(5));
-        assert.equal(-1, [1, 2, 3].indexOf(0))
+        assert.equal(-1, [1, 2, 3].indexOf(0));
-    })
+    });
-})
+});

src/test/index.ts

@@ -10,13 +10,13 @@
 // to report the results back to the caller. When the tests are finished, return
 // a possible error to the callback or null if none.
 
-const testRunner = require('vscode/lib/testrunner')
+const testRunner = require('vscode/lib/testrunner');
 
 // You can directly control Mocha options by uncommenting the following lines
 // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
 testRunner.configure({
-    ui: 'tdd', // the TDD UI is being used in extension.test.ts (suite, test, etc.)
+    ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-    useColors: true, // colored output from test results
+    useColors: true // colored output from test results
-})
+});
 
-module.exports = testRunner
+module.exports = testRunner;

tsconfig.json

@@ -1,13 +1,14 @@
 {
-  "compilerOptions": {
+	"compilerOptions": {
-    "target": "ES6",
+		"target": "ES6",
-    "module": "commonjs",
+		"module": "commonjs",
-    "moduleResolution": "node",
+		"moduleResolution": "node",
-    "outDir": "out",
+		"outDir": "out",
-    "esModuleInterop": true,
+		"lib": [
-    "lib": ["es6"],
+      "es6"
+    ],
     "noImplicitAny": true,
-    "sourceMap": true,
+		"sourceMap": true,
     "rootDir": "src",
     "strictNullChecks": true,
     "noImplicitThis": true,
@@ -15,6 +16,9 @@
     "noUnusedLocals": true,
     "allowUnreachableCode": false,
     "allowUnusedLabels": false
-  },
+	},
-  "exclude": ["node_modules", "out", "vendor"]
+	"exclude": [
+		"node_modules",
+    "out"
+	]
 }

tslint.json

@@ -1,85 +1,43 @@
 {
-  "extends": ["tslint:recommended", "tslint-config-prettier"],
   "rules": {
-    "adjacent-overload-signatures": true,
-    "array-type": [true, "array"],
-    "arrow-return-shorthand": [true, "multiline"],
-    "await-promise": [true, "Thenable"],
-    "ban": [
-      true,
-      {
-        "name": ["*", "forEach"]
-      },
-      ["describe", "only"],
-      ["it", "only"]
-    ],
-    "callable-types": true,
     "class-name": true,
     "comment-format": [true, "check-space"],
-    "curly": true,
+    "indent": [true, "spaces"],
-    "deprecation": {
-      "severity": "warning"
-    },
-    "interface-name": [false],
-    "interface-over-type-literal": true,
-    "jsdoc-format": true,
-    "max-classes-per-file": false,
-    "member-access": [true, "check-accessor"],
-    "member-ordering": [false],
-    "no-angle-bracket-type-assertion": true,
-    "no-arg": true,
-    "no-bitwise": false,
-    "no-boolean-literal-compare": true,
-    "no-conditional-assignment": true,
-    "no-console": [false],
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-super": true,
-    "no-duplicate-variable": true,
-    "no-empty": true,
-    "no-empty-interface": false,
     "no-eval": true,
-    "no-floating-promises": [true],
-    "no-for-in-array": true,
-    "no-inferrable-types": [true],
-    "no-inferred-empty-object-type": true,
     "no-internal-module": true,
-    "no-invalid-template-strings": true,
+    "no-trailing-whitespace": true,
-    "no-magic-numbers": false,
-    "no-misused-new": true,
-    "no-namespace": [false, "allow-declarations"],
-    "no-reference-import": true,
-    "no-shadowed-variable": false,
-    "no-sparse-arrays": true,
-    "no-string-literal": true,
-    "no-string-throw": true,
-    "no-unbound-method": true,
-    "no-unnecessary-callback-wrapper": false,
-    "no-unnecessary-qualifier": true,
-    "no-unnecessary-type-assertion": false,
-    "no-unsafe-any": false,
-    "no-unsafe-finally": true,
-    "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
-    "no-var-requires": false,
+    "one-line": [true, "check-catch", "check-finally", "check-else", "check-open-brace", "check-whitespace"],
-    "no-void-expression": false,
+    "quotemark": [true, "single"],
-    "object-literal-shorthand": true,
+    "semicolon": [true, "always"],
-    "object-literal-sort-keys": false,
+    "triple-equals": [true, "allow-null-check"],
-    "one-variable-per-declaration": [true, "ignore-for-loop"],
+    "typedef-whitespace": [
-    "only-arrow-functions": [true, "allow-declarations", "allow-named-functions"],
-    "prefer-const": [
       true,
       {
-        "destructuring": "all"
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      },
+      {
+        "call-signature": "onespace",
+        "index-signature": "onespace",
+        "parameter": "onespace",
+        "property-declaration": "onespace",
+        "variable-declaration": "onespace"
       }
     ],
-    "prefer-for-of": true,
+    "variable-name": [true, "ban-keywords"],
-    "prefer-template": [false, "allow-single-concat"],
+    "whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type"],
-    "return-undefined": true,
+    "jsdoc-format": true,
-    "triple-equals": [true],
+    "no-consecutive-blank-lines": true,
-    "typedef": [true, "call-signature"],
+    "one-variable-per-declaration": [true, "ignore-for-loop"],
-    "unified-signatures": true,
+    "curly": true,
-    "variable-name": [true, "ban-keywords"]
+    "no-empty": true,
+    "no-unused-expression": true,
+    "eofline": true,
+    "trailing-comma": [true, {"singleline": "never", "multiline": "never"}],
+    "align": [true, "parameters", "statements"]
   }
 }