Compare commits

..

1 Commits

Author SHA1 Message Date
Dependencies.io Bot 0ede5e3734 chore: Update husky from 0.14.3 to 1.0.0 2018-09-26 16:10:47 +00:00
24 changed files with 299 additions and 11325 deletions

View File

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

1
.gitignore vendored
View File

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

1
.npmrc Normal file
View File

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

View File

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

View File

@ -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
}
}
]
}

View File

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

9
.vscode/launch.json vendored
View File

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

16
.vscode/settings.json vendored
View File

@ -1,10 +1,10 @@
// Place your settings in this file to overwrite default and user settings. // 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
} }

8
.vscode/tasks.json vendored
View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
MIT License 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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -15,63 +15,50 @@ I recommend to disable VS Code's built-in PHP IntelliSense by setting `php.sugge
## Features ## Features
### Completion ### Completion
![Completion search demo](images/completion.gif) ![Completion search demo](images/completion.gif)
### Signature Help ### Signature Help
![Signature help demo](images/signatureHelp.gif) ![Signature help demo](images/signatureHelp.gif)
### Workspace symbol search ### Workspace symbol search
![Workspace symbol search demo](images/workspaceSymbol.gif) ![Workspace symbol search demo](images/workspaceSymbol.gif)
### Find all References ### Find all References
![Find References demo](images/references.png) ![Find References demo](images/references.png)
### Go to Definition ### Go to Definition
![Go To Definition demo](images/definition.gif) ![Go To Definition demo](images/definition.gif)
### Hover ### Hover
![Hover class demo](images/hoverClass.png) ![Hover class demo](images/hoverClass.png)
![Hover parameter demo](images/hoverParam.png) ![Hover parameter demo](images/hoverParam.png)
### Find all symbols ### Find all symbols
![Find all symbols demo](images/documentSymbol.gif) ![Find all symbols demo](images/documentSymbol.gif)
### Column-accurate error reporting ### Column-accurate error reporting
![Error reporting demo](images/publishDiagnostics.png) ![Error reporting demo](images/publishDiagnostics.png)
### Code style linting ### Code style linting
Please use a dedicated extension like [PHP CodeSniffer](https://marketplace.visualstudio.com/items?itemName=ikappas.phpcs). Please use a dedicated extension like [PHP CodeSniffer](https://marketplace.visualstudio.com/items?itemName=ikappas.phpcs).
### Format code ### Format code
Please use a dedicated extension like [PHP CS Fixer](https://marketplace.visualstudio.com/items?itemName=junstyle.php-cs-fixer). Please use a dedicated extension like [PHP CS Fixer](https://marketplace.visualstudio.com/items?itemName=junstyle.php-cs-fixer).
## Todo ## Todo
- Rename
- Rename - Signature help
- Signature help
## Contributing ## Contributing
Clone whole repository and in root directory execute: Clone whole repository and in root directory execute:
```bash ```bash
composer install composer install
npm install npm install
npm run build npm run build
code . code .
``` ```
The last command will open the folder in VS Code. Hit `F5` to launch an Extension Development Host with the extension. 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. 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,13 +1,8 @@
{ {
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true, "prefer-stable": true,
"config": {
"platform": {
"php": "7.1.0"
}
},
"require": { "require": {
"felixfbecker/language-server": "5.4.6" "felixfbecker/language-server": "5.4.2"
}, },
"scripts": { "scripts": {
"parse-stubs": "LanguageServer\\ComposerScripts::parseStubs", "parse-stubs": "LanguageServer\\ComposerScripts::parseStubs",

296
composer.lock generated
View File

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

View File

@ -1,33 +1,35 @@
collectors: collectors:
- type: js-npm
path: /
actors:
# pull requests for new major versions
- type: js-npm - 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: 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: "

10803
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -38,42 +38,32 @@
"workspaceContains:**/*.php" "workspaceContains:**/*.php"
], ],
"main": "./out/extension", "main": "./out/extension",
"husky": {
"hooks": {
"commit-msg": "commitlint -e $HUSKY_GIT_PARAMS"
}
},
"scripts": { "scripts": {
"build": "tsc -p .", "build": "tsc -p .",
"watch": "tsc -w -p .", "watch": "tsc -w -p .",
"postinstall": "node ./node_modules/vscode/bin/install", "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": "commitlint -e $GIT_PARAMS"
"semantic-release": "semantic-release"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "7.2.1", "@commitlint/cli": "7.1.1",
"@commitlint/config-conventional": "7.1.2", "@commitlint/config-conventional": "7.1.1",
"@types/execa": "0.9.0", "@types/mocha": "5.2.5",
"@types/mocha": "5.2.7",
"@types/mz": "0.0.32", "@types/mz": "0.0.32",
"@types/node": "8.10.29", "@types/node": "8.10.29",
"@types/semver": "6.2.0", "@types/semver": "5.5.0",
"husky": "1.1.3", "husky": "1.0.0",
"prettier": "1.15.3", "semantic-release": "15.9.12",
"semantic-release": "15.10.8",
"semantic-release-vsce": "2.1.2", "semantic-release-vsce": "2.1.2",
"tslint": "5.11.0", "tslint": "5.11.0",
"tslint-config-prettier": "1.15.0", "typescript": "3.0.3",
"typescript": "3.1.6",
"vscode": "1.1.21" "vscode": "1.1.21"
}, },
"dependencies": { "dependencies": {
"execa": "1.0.0",
"mz": "2.7.0", "mz": "2.7.0",
"semver": "6.3.0", "semver": "5.5.1",
"vscode-languageclient": "5.1.1" "vscode-languageclient": "5.0.1"
}, },
"commitlint": { "commitlint": {
"extends": [ "extends": [

View File

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

View File

@ -1,137 +1,120 @@
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> { 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') || '4095M';
if (memoryLimit !== '-1' && !/^\d+[KMG]?$/.exec(memoryLimit)) { if (memoryLimit !== '-1' && !/^\d+[KMG]?$/.exec(memoryLimit)) {
const selected = await vscode.window.showErrorMessage( const selected = await vscode.window.showErrorMessage(
'The memory limit you\'d provided is not numeric, nor "-1" nor valid php shorthand notation!', 'The memory limit you\'d provided is not numeric, nor "-1" nor valid php shorthand notation!',
'Open settings' 'Open settings'
) );
if (selected === '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) // Check path (if PHP is available and version is ^7.0.0)
let stdout: string let stdout: string;
try { try {
stdout = await execa.stdout(executablePath, ['--version']) [stdout] = await execFile(executablePath, ['--version']);
} catch (err) { } catch (err) {
if (err.code === 'ENOENT') { if (err.code === 'ENOENT') {
const selected = await vscode.window.showErrorMessage( 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', 'PHP executable not found. Install PHP 7 and add it to your PATH or set the php.executablePath setting',
'Open settings' 'Open settings'
) );
if (selected === 'Open settings') { if (selected === 'Open settings') {
await vscode.commands.executeCommand('workbench.action.openGlobalSettings') await vscode.commands.executeCommand('workbench.action.openGlobalSettings');
} }
} else { } 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 // 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) { 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 // Convert PHP prerelease format like 7.0.0rc1 to 7.0.0-rc1
if (!/^\d+.\d+.\d+$/.test(version)) { 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 // Options to control the language client
const clientOptions: LanguageClientOptions = { const clientOptions: LanguageClientOptions = {
// Register the server for php documents // Register the server for php documents
documentSelector: [{ scheme: 'file', language: 'php' }, { scheme: 'untitled', language: 'php' }], documentSelector: [
revealOutputChannelOn: RevealOutputChannelOn.Never, { scheme: 'file', language: 'php' },
{ scheme: 'untitled', language: 'php' }
],
uriConverters: { uriConverters: {
// VS Code by default %-encodes even the colon after the drive letter // VS Code by default %-encodes even the colon after the drive letter
// NodeJS handles it much better // NodeJS handles it much better
code2Protocol: uri => url.format(url.parse(uri.toString(true))), code2Protocol: uri => url.format(url.parse(uri.toString(true))),
protocol2Code: str => vscode.Uri.parse(str), protocol2Code: str => vscode.Uri.parse(str)
}, },
synchronize: { synchronize: {
// Synchronize the setting section 'php' to the server // Synchronize the setting section 'php' to the server
configurationSection: 'php', configurationSection: 'php',
// Notify the server about changes to PHP files in the workspace // 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. // 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 // Push the disposable to the context's subscriptions so that the
// client can be deactivated on extension deactivation // 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 // 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 // You can import and use all API from the 'vscode' module
// as well as import your extension to test it // 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 // Defines a Mocha test suite to group tests of similar kind together
suite('Extension Tests', () => { suite('Extension Tests', () => {
// Defines a Mocha unit test // Defines a Mocha unit test
test('Something 1', () => { 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));
}) });
}) });

View File

@ -10,13 +10,13 @@
// to report the results back to the caller. When the tests are finished, return // to report the results back to the caller. When the tests are finished, return
// a possible error to the callback or null if none. // 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 // 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 // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
testRunner.configure({ 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;

View File

@ -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, "noImplicitAny": true,
"sourceMap": true, "sourceMap": true,
"rootDir": "src", "rootDir": "src",
"strictNullChecks": true, "strictNullChecks": true,
"noImplicitThis": true, "noImplicitThis": true,
@ -15,6 +16,10 @@
"noUnusedLocals": true, "noUnusedLocals": true,
"allowUnreachableCode": false, "allowUnreachableCode": false,
"allowUnusedLabels": false "allowUnusedLabels": false
}, },
"exclude": ["node_modules", "out", "vendor"] "exclude": [
"node_modules",
"out",
"vendor"
]
} }

View File

@ -1,85 +1,43 @@
{ {
"extends": ["tslint:recommended", "tslint-config-prettier"],
"rules": { "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, "class-name": true,
"comment-format": [true, "check-space"], "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-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-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-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, 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"]
} }
} }