Skip to content

Commit 14f7480

Browse files
committed
Merge branch 'master' into parse-typescript-types
2 parents 2d1e1fc + ea84996 commit 14f7480

32 files changed

+1192
-35
lines changed

.README/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ This table maps the rules between `eslint-plugin-jsdoc` and `jscs-jsdoc`.
1414

1515
| `eslint-plugin-jsdoc` | `jscs-jsdoc` |
1616
| --- | --- |
17+
| [`check-alignment`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-check-alignment) | N/A |
1718
| [`check-examples`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-check-examples) | N/A |
19+
| [`check-indentation`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-check-indentation) | N/A |
1820
| [`check-param-names`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-check-param-names) | [`checkParamNames`](https://github.com/jscs-dev/jscs-jsdoc#checkparamnames) |
21+
| [`check-syntax`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-check-syntax) | N/A |
1922
| [`check-tag-names`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-check-tag-names) | N/A ~ [`checkAnnotations`](https://github.com/jscs-dev/jscs-jsdoc#checkannotations) |
2023
| [`check-types`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-check-types) | [`checkTypes`](https://github.com/jscs-dev/jscs-jsdoc#checktypes) |
2124
| [`newline-after-description`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-newline-after-description) | [`requireNewlineAfterDescription`](https://github.com/jscs-dev/jscs-jsdoc#requirenewlineafterdescription) and [`disallowNewlineAfterDescription`](https://github.com/jscs-dev/jscs-jsdoc#disallownewlineafterdescription) |
@@ -28,6 +31,7 @@ This table maps the rules between `eslint-plugin-jsdoc` and `jscs-jsdoc`.
2831
| [`require-param-name`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-require-param-name) | N/A |
2932
| [`require-param-type`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-require-param-type) | [`requireParamTypes`](https://github.com/jscs-dev/jscs-jsdoc#requireparamtypes) |
3033
| [`require-returns`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-require-returns) | [`requireReturn`](https://github.com/jscs-dev/jscs-jsdoc#requirereturn) |
34+
| [`require-returns-check`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-require-returns-check) | [`requireReturn`](https://github.com/jscs-dev/jscs-jsdoc#requirereturncheck) |
3135
| [`require-returns-description`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-require-returns-description) | [`requireReturnDescription`](https://github.com/jscs-dev/jscs-jsdoc#requirereturndescription) |
3236
| [`require-returns-type`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-require-returns-type) | [`requireReturnTypes`](https://github.com/jscs-dev/jscs-jsdoc#requirereturntypes) |
3337
| [`valid-types`](https://github.com/gajus/eslint-plugin-jsdoc#eslint-plugin-jsdoc-rules-valid-types) | N/A |
@@ -70,8 +74,11 @@ Finally, enable all of the rules that you would like to use.
7074
```json
7175
{
7276
"rules": {
77+
"jsdoc/check-alignment": 1,
7378
"jsdoc/check-examples": 1,
79+
"jsdoc/check-indentation": 1,
7480
"jsdoc/check-param-names": 1,
81+
"jsdoc/check-syntax": 1,
7582
"jsdoc/check-tag-names": 1,
7683
"jsdoc/check-types": 1,
7784
"jsdoc/newline-after-description": 1,
@@ -85,6 +92,7 @@ Finally, enable all of the rules that you would like to use.
8592
"jsdoc/require-param-name": 1,
8693
"jsdoc/require-param-type": 1,
8794
"jsdoc/require-returns": 1,
95+
"jsdoc/require-returns-check": 1,
8896
"jsdoc/require-returns-description": 1,
8997
"jsdoc/require-returns-type": 1,
9098
"jsdoc/valid-types": 1
@@ -243,8 +251,11 @@ Finally, the following rule pertains to inline disable directives:
243251

244252
## Rules
245253

254+
{"gitdown": "include", "file": "./rules/check-alignment.md"}
246255
{"gitdown": "include", "file": "./rules/check-examples.md"}
256+
{"gitdown": "include", "file": "./rules/check-indentation.md"}
247257
{"gitdown": "include", "file": "./rules/check-param-names.md"}
258+
{"gitdown": "include", "file": "./rules/check-syntax.md"}
248259
{"gitdown": "include", "file": "./rules/check-tag-names.md"}
249260
{"gitdown": "include", "file": "./rules/check-types.md"}
250261
{"gitdown": "include", "file": "./rules/newline-after-description.md"}
@@ -259,5 +270,6 @@ Finally, the following rule pertains to inline disable directives:
259270
{"gitdown": "include", "file": "./rules/require-param.md"}
260271
{"gitdown": "include", "file": "./rules/require-returns-description.md"}
261272
{"gitdown": "include", "file": "./rules/require-returns-type.md"}
273+
{"gitdown": "include", "file": "./rules/require-returns-check.md"}
262274
{"gitdown": "include", "file": "./rules/require-returns.md"}
263275
{"gitdown": "include", "file": "./rules/valid-types.md"}

.README/rules/check-alignment.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
### `check-alignment`
2+
3+
Reports invalid alignment of JSDoc block asterisks.
4+
5+
|||
6+
|---|---|
7+
|Context|`ArrowFunctionExpression`, `FunctionDeclaration`, `FunctionExpression`|
8+
|Tags|N/A|
9+
10+
<!-- assertions checkAlignment -->

.README/rules/check-indentation.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
### `check-indentation`
2+
3+
Reports invalid padding inside JSDoc block.
4+
5+
|||
6+
|---|---|
7+
|Context|`ArrowFunctionExpression`, `FunctionDeclaration`, `FunctionExpression`|
8+
|Tags|N/A|
9+
10+
<!-- assertions checkIndentation -->

.README/rules/check-syntax.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
### `check-syntax`
2+
3+
Reports against Google Closure Compiler syntax.
4+
5+
|||
6+
|---|---|
7+
|Context|`ArrowFunctionExpression`, `FunctionDeclaration`, `FunctionExpression`|
8+
|Tags|N/A|
9+
10+
<!-- assertions checkSyntax -->

.README/rules/check-tag-names.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Valid [JSDoc 3 Block Tags](http://usejsdoc.org/#block-tags) are:
88
abstract
99
access
1010
alias
11+
async
1112
augments
1213
author
1314
borrows
@@ -28,7 +29,9 @@ external
2829
file
2930
fires
3031
function
32+
generator
3133
global
34+
hideconstructor
3235
ignore
3336
implements
3437
inheritdoc
@@ -47,6 +50,7 @@ module
4750
name
4851
namespace
4952
override
53+
package
5054
param
5155
private
5256
property
@@ -67,6 +71,7 @@ type
6771
typedef
6872
variation
6973
version
74+
yields
7075
```
7176

7277
|||

.README/rules/require-hyphen-before-param-description.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
Requires a hyphen before the `@param` description.
44

5+
This rule takes one argument. If it is `"always"` then a problem is raised when there is no hyphen before the description. If it is `"never"` then a problem is raised when there is a hyphen before the description. The default value is `"always"`.
6+
57
|||
68
|---|---|
79
|Context|`ArrowFunctionExpression`, `FunctionDeclaration`, `FunctionExpression`|
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
### `require-returns-check`
2+
3+
Checks if the return expression exists in function body and in the comment.
4+
5+
|||
6+
|---|---|
7+
|Context|`ArrowFunctionExpression`, `FunctionDeclaration`, `FunctionExpression`|
8+
|Tags|`returns`|
9+
10+
<!-- assertions requireReturnsCheck -->

0 commit comments

Comments
 (0)