You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+9-46Lines changed: 9 additions & 46 deletions
Original file line number
Diff line number
Diff line change
@@ -196,16 +196,7 @@ Use `settings.jsdoc.tagNamePreference` to configure a preferred alias name for a
196
196
}
197
197
```
198
198
199
-
<<<<<<< HEAD
200
-
<<<<<<< HEAD
201
199
One may also use an object with a `message` and `replacement`.
202
-
=======
203
-
One may also use an object with a `message` and `replacement`, with `{{tagName}}` and `{{preferredType}}` (or its alias `{{replacement}}`) as template variables to be
204
-
=======
205
-
One may also use an object with a `message` and `replacement`, with `{{tagName}}` and `{{preferredTag}}` (or its alias `{{replacement}}`) as template variables to be
206
-
>>>>>>> fix var. name in docs
207
-
substituted within `message`.
208
-
>>>>>>> feat(check-tag-names): allow rejecting normally valid tag names and/or providing custom error messages when suggesting tags to reject or replace (fixes #108)
209
200
210
201
The following will report the message `@extends is to be used over @augments as it is more evocative of classes than @augments` upon encountering `@augments`.
211
202
@@ -216,15 +207,7 @@ The following will report the message `@extends is to be used over @augments as
216
207
"jsdoc": {
217
208
"tagNamePreference": {
218
209
"augments": {
219
-
<<<<<<< HEAD
220
-
<<<<<<< HEAD
221
210
"message": "@extends is to be used over @augments as it is more evocative of classes than @augments",
222
-
=======
223
-
"message": "@{{replacement}} is to be used over @{{tagName}} as it is more evocative of classes than @augments",
224
-
>>>>>>> feat(check-tag-names): allow rejecting normally valid tag names and/or providing custom error messages when suggesting tags to reject or replace (fixes #108)
225
-
=======
226
-
"message": "@{{replacement}} is to be used over @{{tagName}} as it is more evocative of classes than @{{tagName}}",
227
-
>>>>>>> docs: Make consistent in case not removing templating
228
211
"replacement": "extends"
229
212
}
230
213
}
@@ -1381,11 +1364,7 @@ function quux () {
1381
1364
functionquux () {
1382
1365
1383
1366
}
1384
-
<<<<<<<HEAD
1385
1367
// Settings: {"jsdoc":{"tagNamePreference":{"todo":{"message":"Please use x-todo instead of todo","replacement":"x-todo"}}}}
1386
-
=======
1387
-
// Settings: {"jsdoc":{"tagNamePreference":{"todo":{"message":"Please use {{replacement}} instead of {{tagName}}","replacement":"x-todo"}}}}
1388
-
>>>>>>>feat(check-tag-names): allow rejecting normally valid tag names and/or providing custom error messages when suggesting tags to reject or replace (fixes #108)
1389
1368
// Message: Please use x-todo instead of todo
1390
1369
1391
1370
/**
@@ -1394,11 +1373,7 @@ function quux () {
1394
1373
functionquux () {
1395
1374
1396
1375
}
1397
-
<<<<<<<HEAD
1398
1376
// Settings: {"jsdoc":{"tagNamePreference":{"todo":{"message":"Please use x-todo instead of todo","replacement":"x-todo"}}}}
1399
-
=======
1400
-
// Settings: {"jsdoc":{"tagNamePreference":{"todo":{"message":"Please use {{preferredTagName}} instead of {{tagName}}","replacement":"x-todo"}}}}
1401
-
>>>>>>>feat(check-tag-names): allow rejecting normally valid tag names and/or providing custom error messages when suggesting tags to reject or replace (fixes #108)
1402
1377
// Message: Please use x-todo instead of todo
1403
1378
1404
1379
/**
@@ -2496,7 +2471,7 @@ tag should be linted with the `matchDescription` value (or the default).
This rule allows one optional string argument. If it is `"always"` then a problem is raised when there is a newline after the description. If it is `"never"` then a problem is raised when there is no newline after the description. The default value is `"always"`.
@@ -3124,7 +3099,7 @@ The following types are always considered defined.
This rule takes one optional string 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"`.
@@ -4151,11 +4126,7 @@ function quux () {
4151
4126
Checks for presence of jsdoc comments, on class declarations as well as
0 commit comments