Compare commits

...

33 Commits

Author SHA1 Message Date
Felix Becker 6001269db0 build: fix package-lock.json 2019-12-26 19:05:54 +01:00
Dylan McGannon 4898e75f4e fix: prevent focusing the output tab (#454) 2019-12-26 18:50:27 +01:00
Renovate Bot 9785d23da7 chore(deps): update dependency semver to v6 2019-12-14 20:51:02 +00:00
Felix Becker 5e61b44249 build: add package-lock.json 2019-09-20 17:38:06 +02:00
Felix Becker 18c03ef974 fix: bump PHP version requirement to 7.1
PHP 7.0 reached end of life: https://www.php.net/supported-versions.php

Fixes #447
2019-09-20 17:34:37 +02:00
Felix Becker 7281961bde fix: include stubs autoloader map 2019-09-19 14:23:48 +02:00
Felix Becker ab20916e50 fix: set the minimum php version to 7.0 2019-09-19 11:28:27 +02:00
Felix Becker 3bd389a5e6 fix: update dependencies 2019-09-19 11:20:20 +02:00
Renovate Bot 51e9ca1cdb chore(deps): update dependency @types/mocha to v5.2.7 2019-08-10 09:52:42 +00:00
Renovate Bot 3fdd166950 chore(deps): update dependency @types/mocha to v5.2.6 2019-02-14 00:38:26 +00:00
Renovate Bot 3b78c60524 chore(deps): update dependency prettier to v1.15.3 2018-11-30 09:17:37 +01:00
MarvinJWendt ff778bb66b docs: update copyright year (#397) 2018-11-22 09:08:15 +01:00
Renovate Bot aed701a705 fix(deps): update dependency felixfbecker/language-server to v5.4.6 2018-11-14 00:57:16 +01:00
Felix Becker 9e4e9ce240 chore(renovate): separate minor and patch
to make commit type config work
2018-11-13 22:35:18 +01:00
Renovate Bot 00bac7d66d chore(deps): pin dependency tslint-config-prettier to 1.15.0 2018-11-11 19:43:49 +01:00
Felix Becker 207b078038 chore(renovate): fix semanticCommitType
https://github.com/renovatebot/renovate/issues/2796#issuecomment-437687873
2018-11-11 18:37:45 +01:00
Felix Becker 0c2985e776 style: use prettier 2018-11-11 18:32:27 +01:00
renovate[bot] edd8806ab7 fix(deps): update dependency felixfbecker/language-server to v5.4.5 (#390) 2018-11-11 14:11:48 +01:00
renovate[bot] 331f59a6a4 chore(deps): update dependency vscode-languageclient to v5.1.1 (#389) 2018-11-11 12:49:33 +01:00
Felix Becker 99749d96dd chore(renovate): set no schedule for language server updates 2018-11-11 05:32:36 +01:00
Felix Becker 36107c80a8 chore(renovate): group updates together 2018-11-11 05:29:28 +01:00
Renovate Bot c18c02ac42 fix(deps): update dependency semver to v5.6.0 2018-11-11 05:25:55 +01:00
Renovate Bot 4fd20ab036 chore(deps): update dependency typescript to v3.1.6 2018-11-11 05:25:29 +01:00
Renovate Bot 4e4185634d chore(deps): update dependency semantic-release to v15.10.8 2018-11-11 05:25:19 +01:00
Felix Becker 9765c68f5d fix: improve handling of php executable 2018-11-11 05:16:58 +01:00
Felix Becker ba3c42d35a fix: log stderr output to output channel
e.g. stack traces from crashes
2018-11-11 05:16:09 +01:00
Felix Becker aeab9204a0 chore(renovate): disable rollback PRs 2018-11-11 04:24:51 +01:00
Felix Becker 118dd76487 chore: fix package.json 2018-11-11 04:24:28 +01:00
Felix Becker a687c4a454 chore(deps): update husky to 1.1.3 2018-11-11 04:22:06 +01:00
Renovate Bot e40b07e227 chore(deps): update commitlint monorepo 2018-11-11 04:18:36 +01:00
Felix Becker 9e7351dea5 perf: update language server to 5.4.3 2018-11-11 04:17:37 +01:00
Dependencies.io Bot a81b48e7fa fix: Update felixfbecker/advanced-json-rpc from v3.0.1 to v3.0.3 2018-11-11 04:06:15 +01:00
Dependencies.io Bot 09149c5317 fix: Update microsoft/tolerant-php-parser from v0.0.13 to v0.0.15 2018-11-11 04:05:58 +01:00
24 changed files with 11328 additions and 302 deletions

View File

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

1
.gitignore vendored
View File

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

1
.npmrc
View File

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

4
.prettierignore Normal file
View File

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

22
.prettierrc Normal file
View File

@ -0,0 +1,22 @@
{
"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
}
}
]
}

View File

@ -1,7 +1,7 @@
language: php
php:
- '7.0'
- '7.1'
cache:
directories:
@ -9,11 +9,11 @@ cache:
- $HOME/.composer/cache
before_install:
- nvm install 8
- nvm use 8
- nvm install '12.4.0'
- nvm use '12.4.0'
install:
- npm install
- npm ci
script:
- npm run lint
@ -23,9 +23,9 @@ jobs:
include:
- stage: test
- stage: release
php: '7.0'
php: '7.1'
install:
- npm install
- npm ci
- composer install --prefer-dist --no-interaction --optimize-autoloader
script:
- npm run build

9
.vscode/launch.json vendored
View File

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

8
.vscode/tasks.json vendored
View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
MIT License
Copyright (c) 2017 Felix Becker
Copyright (c) 2017-2018 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

View File

@ -15,50 +15,63 @@ 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
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
- Signature help
- Rename
- Signature help
## Contributing
Clone whole repository and in root directory execute:
```bash
composer install
npm install
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.
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.

View File

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

300
composer.lock generated
View File

@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "59363482d333a66c4380ed5e00f8fe43",
"content-hash": "9c2828a729b23a2d11872a4acf98a8e5",
"packages": [
{
"name": "composer/xdebug-handler",
"version": "1.3.0",
"version": "1.3.3",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
"reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c"
"reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/b8e9745fb9b06ea6664d8872c4505fb16df4611c",
"reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
"reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
"shasum": ""
},
"require": {
@ -48,20 +48,20 @@
"Xdebug",
"performance"
],
"time": "2018-08-31T19:07:57+00:00"
"time": "2019-05-27T17:52:04+00:00"
},
{
"name": "felixfbecker/advanced-json-rpc",
"version": "v3.0.1",
"version": "v3.0.4",
"source": {
"type": "git",
"url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
"reference": "29f1d8c2c17f8c04f9768d382b72aeeb0715ebb8"
"reference": "23366dd0cab0a0f3fd3016bf3c0b36dec74348e7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/29f1d8c2c17f8c04f9768d382b72aeeb0715ebb8",
"reference": "29f1d8c2c17f8c04f9768d382b72aeeb0715ebb8",
"url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/23366dd0cab0a0f3fd3016bf3c0b36dec74348e7",
"reference": "23366dd0cab0a0f3fd3016bf3c0b36dec74348e7",
"shasum": ""
},
"require": {
@ -89,25 +89,26 @@
}
],
"description": "A more advanced JSONRPC implementation",
"time": "2017-10-28T21:26:16+00:00"
"time": "2019-09-12T22:41:08+00:00"
},
{
"name": "felixfbecker/language-server",
"version": "v5.4.2",
"version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/felixfbecker/php-language-server.git",
"reference": "3931c8848ff4b5696501d26cad165520cca813a8"
"reference": "1da3328bc23ebd6418529035d357481c8c028640"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/felixfbecker/php-language-server/zipball/3931c8848ff4b5696501d26cad165520cca813a8",
"reference": "3931c8848ff4b5696501d26cad165520cca813a8",
"url": "https://api.github.com/repos/felixfbecker/php-language-server/zipball/1da3328bc23ebd6418529035d357481c8c028640",
"reference": "1da3328bc23ebd6418529035d357481c8c028640",
"shasum": ""
},
"require": {
"composer/xdebug-handler": "^1.0",
"felixfbecker/advanced-json-rpc": "^3.0.0",
"felixfbecker/language-server-protocol": "^1.0.1",
"jetbrains/phpstorm-stubs": "dev-master",
"microsoft/tolerant-php-parser": "0.0.*",
"netresearch/jsonmapper": "^1.0",
@ -160,7 +161,54 @@
"studio",
"visual"
],
"time": "2018-08-22T18:48:14+00:00"
"time": "2018-11-13T17:33:21+00:00"
},
{
"name": "felixfbecker/language-server-protocol",
"version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/felixfbecker/php-language-server-protocol.git",
"reference": "378801f6139bb74ac215d81cca1272af61df9a9f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/378801f6139bb74ac215d81cca1272af61df9a9f",
"reference": "378801f6139bb74ac215d81cca1272af61df9a9f",
"shasum": ""
},
"require": {
"php": "^7.0"
},
"require-dev": {
"phpstan/phpstan": "*",
"phpunit/phpunit": "^6.3",
"squizlabs/php_codesniffer": "^3.1"
},
"type": "library",
"autoload": {
"psr-4": {
"LanguageServerProtocol\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"ISC"
],
"authors": [
{
"name": "Felix Becker",
"email": "felix.b@outlook.com"
}
],
"description": "PHP classes for the Language Server Protocol",
"keywords": [
"language",
"microsoft",
"php",
"server"
],
"time": "2019-06-23T21:03:50+00:00"
},
{
"name": "jetbrains/phpstorm-stubs",
@ -168,20 +216,26 @@
"source": {
"type": "git",
"url": "https://github.com/JetBrains/phpstorm-stubs.git",
"reference": "435257758651096093209ff56fa0ae1a6e63ec56"
"reference": "f3a010af18f763091fe2182b16c041333ba6a7fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/435257758651096093209ff56fa0ae1a6e63ec56",
"reference": "435257758651096093209ff56fa0ae1a6e63ec56",
"url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/f3a010af18f763091fe2182b16c041333ba6a7fb",
"reference": "f3a010af18f763091fe2182b16c041333ba6a7fb",
"shasum": ""
},
"require-dev": {
"nikic/php-parser": "v4.0.1",
"nikic/php-parser": "^4",
"php": "^7.1",
"phpdocumentor/reflection-docblock": "^4.3",
"phpunit/phpunit": "7.1.4"
"phpunit/phpunit": "^7"
},
"type": "library",
"autoload": {
"files": [
"PhpStormStubsMap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
@ -198,20 +252,20 @@
"stubs",
"type"
],
"time": "2018-08-13T13:39:18+00:00"
"time": "2019-09-18T14:39:59+00:00"
},
{
"name": "microsoft/tolerant-php-parser",
"version": "v0.0.13",
"version": "v0.0.18",
"source": {
"type": "git",
"url": "https://github.com/Microsoft/tolerant-php-parser.git",
"reference": "89ade271e639e0612deeccb0555f13c2224ecf84"
"url": "https://github.com/microsoft/tolerant-php-parser.git",
"reference": "e255aa978b45729094da2a1a6f9954044a244ff2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Microsoft/tolerant-php-parser/zipball/89ade271e639e0612deeccb0555f13c2224ecf84",
"reference": "89ade271e639e0612deeccb0555f13c2224ecf84",
"url": "https://api.github.com/repos/microsoft/tolerant-php-parser/zipball/e255aa978b45729094da2a1a6f9954044a244ff2",
"reference": "e255aa978b45729094da2a1a6f9954044a244ff2",
"shasum": ""
},
"require": {
@ -239,23 +293,27 @@
}
],
"description": "Tolerant PHP-to-AST parser designed for IDE usage scenarios",
"time": "2018-08-07T04:52:21+00:00"
"time": "2019-07-01T02:21:00+00:00"
},
{
"name": "netresearch/jsonmapper",
"version": "v1.4.0",
"version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/cweiske/jsonmapper.git",
"reference": "3868fe1128ce1169228acdb623359dca74db5ef3"
"reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/3868fe1128ce1169228acdb623359dca74db5ef3",
"reference": "3868fe1128ce1169228acdb623359dca74db5ef3",
"url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06",
"reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-pcre": "*",
"ext-reflection": "*",
"ext-spl": "*",
"php": ">=5.6"
},
"require-dev": {
@ -275,45 +333,43 @@
"authors": [
{
"name": "Christian Weiske",
"role": "Developer",
"email": "cweiske@cweiske.de",
"homepage": "http://github.com/cweiske/jsonmapper/",
"role": "Developer"
"homepage": "http://github.com/cweiske/jsonmapper/"
}
],
"description": "Map nested JSON structures onto PHP classes",
"time": "2017-11-28T21:30:01+00:00"
"time": "2019-08-15T19:41:25+00:00"
},
{
"name": "phpdocumentor/reflection-common",
"version": "1.0.1",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git",
"reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
"reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
"reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
"reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
"shasum": ""
},
"require": {
"php": ">=5.5"
"php": ">=7.1"
},
"require-dev": {
"phpunit/phpunit": "^4.6"
"phpunit/phpunit": "~6"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "2.x-dev"
}
},
"autoload": {
"psr-4": {
"phpDocumentor\\Reflection\\": [
"src"
]
"phpDocumentor\\Reflection\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -335,30 +391,30 @@
"reflection",
"static analysis"
],
"time": "2017-09-11T18:02:19+00:00"
"time": "2018-08-07T13:53:10+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "4.3.0",
"version": "4.3.2",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "94fd0001232e47129dd3504189fa1c7225010d08"
"reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
"reference": "94fd0001232e47129dd3504189fa1c7225010d08",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
"reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
"shasum": ""
},
"require": {
"php": "^7.0",
"phpdocumentor/reflection-common": "^1.0.0",
"phpdocumentor/type-resolver": "^0.4.0",
"phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
"phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
"doctrine/instantiator": "~1.0.5",
"doctrine/instantiator": "^1.0.5",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^6.4"
},
@ -386,41 +442,40 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2017-11-30T07:14:17+00:00"
"time": "2019-09-12T14:27:41+00:00"
},
{
"name": "phpdocumentor/type-resolver",
"version": "0.4.0",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
"reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
"reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
"shasum": ""
},
"require": {
"php": "^5.5 || ^7.0",
"phpdocumentor/reflection-common": "^1.0"
"php": "^7.1",
"phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^5.2||^4.8.24"
"ext-tokenizer": "^7.1",
"mockery/mockery": "~1",
"phpunit/phpunit": "^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"phpDocumentor\\Reflection\\": [
"src/"
]
"phpDocumentor\\Reflection\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -433,20 +488,21 @@
"email": "me@mikevanriel.com"
}
],
"time": "2017-07-14T14:27:02+00:00"
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "2019-08-22T18:11:29+00:00"
},
{
"name": "psr/log",
"version": "1.0.2",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": ""
},
"require": {
@ -480,7 +536,7 @@
"psr",
"psr-3"
],
"time": "2016-10-10T12:19:37+00:00"
"time": "2018-11-20T15:27:04+00:00"
},
{
"name": "sabre/event",
@ -521,9 +577,9 @@
"authors": [
{
"name": "Evert Pot",
"role": "Developer",
"email": "me@evertpot.com",
"homepage": "http://evertpot.com/",
"role": "Developer"
"homepage": "http://evertpot.com/"
}
],
"description": "sabre/event is a library for lightweight event-based programming",
@ -544,24 +600,23 @@
},
{
"name": "sabre/uri",
"version": "2.1.1",
"version": "2.1.3",
"source": {
"type": "git",
"url": "https://github.com/sabre-io/uri.git",
"reference": "a42126042c7dcb53e2978dadb6d22574d1359b4c"
"reference": "18f454324f371cbcabdad3d0d3755b4b0182095d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sabre-io/uri/zipball/a42126042c7dcb53e2978dadb6d22574d1359b4c",
"reference": "a42126042c7dcb53e2978dadb6d22574d1359b4c",
"url": "https://api.github.com/repos/sabre-io/uri/zipball/18f454324f371cbcabdad3d0d3755b4b0182095d",
"reference": "18f454324f371cbcabdad3d0d3755b4b0182095d",
"shasum": ""
},
"require": {
"php": ">=7"
},
"require-dev": {
"phpunit/phpunit": "^6.0",
"sabre/cs": "~1.0.0"
"phpunit/phpunit": "^6"
},
"type": "library",
"autoload": {
@ -591,28 +646,86 @@
"uri",
"url"
],
"time": "2017-02-20T20:02:35+00:00"
"time": "2019-09-09T23:00:25+00:00"
},
{
"name": "webmozart/assert",
"version": "1.3.0",
"name": "symfony/polyfill-ctype",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "0df1908962e7a3071564e857d86874dad1ef204a"
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "550ebaac289296ce228a706d0867afc34687e3f4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
"reference": "0df1908962e7a3071564e857d86874dad1ef204a",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
"reference": "550ebaac289296ce228a706d0867afc34687e3f4",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0"
"php": ">=5.3.3"
},
"suggest": {
"ext-ctype": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.12-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for ctype functions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"ctype",
"polyfill",
"portable"
],
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "webmozart/assert",
"version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
"reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"phpunit/phpunit": "^4.6",
"sebastian/version": "^1.0.1"
"phpunit/phpunit": "^4.8.36 || ^7.5.13"
},
"type": "library",
"extra": {
@ -641,7 +754,7 @@
"check",
"validate"
],
"time": "2018-01-29T19:49:41+00:00"
"time": "2019-08-24T08:43:50+00:00"
},
{
"name": "webmozart/glob",
@ -744,5 +857,8 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": [],
"platform-dev": []
"platform-dev": [],
"platform-overrides": {
"php": "7.1.0"
}
}

View File

@ -1,35 +1,33 @@
collectors:
- type: js-npm
- type: js-npm
path: /
actors:
# pull requests for new major versions
- type: js-npm
versions: "Y.0.0"
versions: 'Y.0.0'
settings:
# these updates should generally not have an effect on users
commit_message_prefix: "chore: "
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
# 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
actors:
- type: php-composer
versions: 'L.L.Y'
settings:
commit_message_prefix: 'fix: '
- type: php-composer
versions: "L.L.Y"
versions: 'L.Y.0'
settings:
commit_message_prefix: "fix: "
commit_message_prefix: 'feat: '
- type: php-composer
versions: "L.Y.0"
versions: 'Y.0.0'
settings:
commit_message_prefix: "feat: "
- type: php-composer
versions: "Y.0.0"
settings:
commit_message_prefix: "chore: "
commit_message_prefix: 'chore: '

10803
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -38,32 +38,42 @@
"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": "tslint -c tslint.json \"src/**/*.ts\"",
"semantic-release": "semantic-release",
"commitmsg": "commitlint -e $GIT_PARAMS"
"lint": "npm run prettier && npm run tslint",
"tslint": "tslint -p tsconfig.json -c tslint.json \"src/**/*.ts\"",
"prettier": "prettier '**/{*.{js?(on),ts,yml},.*.js?(on),.*.yml,.prettierrc,*.md}' --write --list-different",
"semantic-release": "semantic-release"
},
"devDependencies": {
"@commitlint/cli": "7.1.1",
"@commitlint/config-conventional": "7.1.1",
"@types/mocha": "5.2.5",
"@commitlint/cli": "7.2.1",
"@commitlint/config-conventional": "7.1.2",
"@types/execa": "0.9.0",
"@types/mocha": "5.2.7",
"@types/mz": "0.0.32",
"@types/node": "8.10.29",
"@types/semver": "5.5.0",
"husky": "0.14.3",
"semantic-release": "15.9.12",
"@types/semver": "6.2.0",
"husky": "1.1.3",
"prettier": "1.15.3",
"semantic-release": "15.10.8",
"semantic-release-vsce": "2.1.2",
"tslint": "5.11.0",
"typescript": "3.0.3",
"tslint-config-prettier": "1.15.0",
"typescript": "3.1.6",
"vscode": "1.1.21"
},
"dependencies": {
"execa": "1.0.0",
"mz": "2.7.0",
"semver": "5.5.1",
"vscode-languageclient": "5.0.1"
"semver": "6.3.0",
"vscode-languageclient": "5.1.1"
},
"commitlint": {
"extends": [

View File

@ -4,10 +4,21 @@
"rangeStrategy": "pin",
"semanticCommits": true,
"npm": {
"semanticCommitType": "chore"
"packageRules": [
{
"packagePatterns": ["*"],
"semanticCommitType": "chore",
"minor": {
"groupName": "all non-major dependencies",
"groupSlug": "all-minor-patch"
}
}
]
},
"separateMinorPatch": true,
"composer": {
"enabled": true
"enabled": true,
"rollbackPrs": false
},
"packageRules": [
{
@ -16,12 +27,15 @@
},
{
"packageNames": ["felixfbecker/language-server"],
"minor": {
"schedule": [],
"updateTypes": ["minor"],
"semanticCommitType": "feat"
},
"patch": {
{
"packageNames": ["felixfbecker/language-server"],
"schedule": [],
"updateTypes": ["patch"],
"semanticCommitType": "fix"
}
}
]
}

View File

@ -1,120 +1,137 @@
import * as path from 'path';
import { spawn, execFile, ChildProcess } from 'mz/child_process';
import * as vscode from 'vscode';
import { LanguageClient, LanguageClientOptions, StreamInfo } from 'vscode-languageclient';
import * as semver from 'semver';
import * as net from 'net';
import * as url from 'url';
import execa from 'execa'
import { ChildProcess, spawn } from 'mz/child_process'
import * as net from 'net'
import * as path from 'path'
import * as semver from 'semver'
import * as url from 'url'
import * as vscode from 'vscode'
import { LanguageClient, LanguageClientOptions, RevealOutputChannelOn, StreamInfo } from 'vscode-languageclient'
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 conf = vscode.workspace.getConfiguration('php');
const executablePath = conf.get<string>('executablePath') || 'php';
const memoryLimit = conf.get<string>('memoryLimit') || '4095M';
const memoryLimit = conf.get<string>('memoryLimit') || '4095M'
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 execFile(executablePath, ['--version']);
stdout = await execa.stdout(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);
console.error(err);
vscode.window.showErrorMessage('Error spawning PHP: ' + err.message)
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');
return;
vscode.window.showErrorMessage('Error parsing PHP version. Please check the output of php --version')
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, '7.0.0')) {
vscode.window.showErrorMessage('The language server needs at least PHP 7 installed. Version found: ' + version);
return;
if (semver.lt(version, composerJson.config.platform.php)) {
vscode.window.showErrorMessage('The language server needs at least PHP 7.1 installed. Version found: ' + version)
return
}
const serverOptions = () => new Promise<ChildProcess | StreamInfo>((resolve, reject) => {
let client: LanguageClient
const serverOptions = () =>
new Promise<ChildProcess | StreamInfo>((resolve, reject) => {
// Use a TCP socket because of problems with blocking STDIO
const server = net.createServer(socket => {
// 'connection' listener
console.log('PHP process connected');
console.log('PHP process connected')
socket.on('end', () => {
console.log('PHP process disconnected');
});
server.close();
resolve({ reader: socket, writer: socket });
});
console.log('PHP process disconnected')
})
server.close()
resolve({ reader: socket, writer: socket })
})
// Listen on random port
server.listen(0, '127.0.0.1', () => {
// The server is implemented in PHP
const childProcess = spawn(executablePath, [
context.asAbsolutePath(path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php')),
context.asAbsolutePath(
path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php')
),
'--tcp=127.0.0.1:' + server.address().port,
'--memory-limit=' + memoryLimit
]);
'--memory-limit=' + memoryLimit,
])
childProcess.stderr.on('data', (chunk: Buffer) => {
console.error(chunk + '');
});
childProcess.stdout.on('data', (chunk: Buffer) => {
console.log(chunk + '');
});
return childProcess;
});
});
const str = chunk.toString()
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: [{ scheme: 'file', language: 'php' }, { scheme: 'untitled', language: '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.
const disposable = new LanguageClient('PHP Language Server', serverOptions, clientOptions).start();
client = new LanguageClient('PHP Language Server', serverOptions, clientOptions)
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)
}

View File

@ -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,10 +13,9 @@ 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(0));
});
});
assert.equal(-1, [1, 2, 3].indexOf(5))
assert.equal(-1, [1, 2, 3].indexOf(0))
})
})

View File

@ -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.)
useColors: true // colored output from test results
});
useColors: true, // colored output from test results
})
module.exports = testRunner;
module.exports = testRunner

View File

@ -4,9 +4,8 @@
"module": "commonjs",
"moduleResolution": "node",
"outDir": "out",
"lib": [
"es6"
],
"esModuleInterop": true,
"lib": ["es6"],
"noImplicitAny": true,
"sourceMap": true,
"rootDir": "src",
@ -17,9 +16,5 @@
"allowUnreachableCode": false,
"allowUnusedLabels": false
},
"exclude": [
"node_modules",
"out",
"vendor"
]
"exclude": ["node_modules", "out", "vendor"]
}

View File

@ -1,43 +1,85 @@
{
"extends": ["tslint:recommended", "tslint-config-prettier"],
"rules": {
"class-name": true,
"comment-format": [true, "check-space"],
"indent": [true, "spaces"],
"no-eval": true,
"no-internal-module": true,
"no-trailing-whitespace": true,
"no-var-keyword": true,
"one-line": [true, "check-catch", "check-finally", "check-else", "check-open-brace", "check-whitespace"],
"quotemark": [true, "single"],
"semicolon": [true, "always"],
"triple-equals": [true, "allow-null-check"],
"typedef-whitespace": [
"adjacent-overload-signatures": true,
"array-type": [true, "array"],
"arrow-return-shorthand": [true, "multiline"],
"await-promise": [true, "Thenable"],
"ban": [
true,
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
"name": ["*", "forEach"]
},
["describe", "only"],
["it", "only"]
],
"callable-types": true,
"class-name": true,
"comment-format": [true, "check-space"],
"curly": true,
"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-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,
"no-void-expression": false,
"object-literal-shorthand": true,
"object-literal-sort-keys": false,
"one-variable-per-declaration": [true, "ignore-for-loop"],
"only-arrow-functions": [true, "allow-declarations", "allow-named-functions"],
"prefer-const": [
true,
{
"call-signature": "onespace",
"index-signature": "onespace",
"parameter": "onespace",
"property-declaration": "onespace",
"variable-declaration": "onespace"
"destructuring": "all"
}
],
"variable-name": [true, "ban-keywords"],
"whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type"],
"jsdoc-format": true,
"no-consecutive-blank-lines": true,
"one-variable-per-declaration": [true, "ignore-for-loop"],
"curly": true,
"no-empty": true,
"no-unused-expression": true,
"eofline": true,
"trailing-comma": [true, {"singleline": "never", "multiline": "never"}],
"align": [true, "parameters", "statements"]
"prefer-for-of": true,
"prefer-template": [false, "allow-single-concat"],
"return-undefined": true,
"triple-equals": [true],
"typedef": [true, "call-signature"],
"unified-signatures": true,
"variable-name": [true, "ban-keywords"]
}
}