Skip to content

Commit 0d2bd8f

Browse files
sheetalkamatsheetalkamat
committed
Update jsdoc regex to atom/language-javascript#70a6c530b8fdc678086e2883e348fb909c9e4b77
Fixes #445 and #435
1 parent f2cdd8b commit 0d2bd8f

12 files changed

+2352
-925
lines changed

‎TypeScript.YAML-tmLanguage‎

Lines changed: 351 additions & 239 deletions
Large diffs are not rendered by default.

‎TypeScript.tmLanguage‎

Lines changed: 755 additions & 255 deletions
Large diffs are not rendered by default.

‎TypeScriptReact.tmLanguage‎

Lines changed: 755 additions & 255 deletions
Large diffs are not rendered by default.

‎tests/baselines/Issue153.baseline.txt‎

Lines changed: 68 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,19 @@ Grammar: TypeScript.tmLanguage
111111
> * @export
112112
^^^
113113
source.ts comment.block.documentation.ts
114-
^^^^^^^
115-
source.ts comment.block.documentation.ts storage.type.class.jsdoc
114+
^
115+
source.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
116+
^^^^^^
117+
source.ts comment.block.documentation.ts storage.type.class.jsdoc
116118
^^
117119
source.ts comment.block.documentation.ts
118120
> * @class Matrix3x3
119121
^^^
120122
source.ts comment.block.documentation.ts
121-
^^^^^^
122-
source.ts comment.block.documentation.ts storage.type.class.jsdoc
123+
^
124+
source.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
125+
^^^^^
126+
source.ts comment.block.documentation.ts storage.type.class.jsdoc
123127
^^^^^^^^^^^^
124128
source.ts comment.block.documentation.ts
125129
> */
@@ -353,33 +357,45 @@ Grammar: TypeScript.tmLanguage
353357
> * @param {number} index The index of the column (0 .. 2).
354358
^^^^^^^
355359
source.ts meta.class.ts comment.block.documentation.ts
356-
^^^^^^
357-
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc
360+
^
361+
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
362+
^^^^^
363+
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc
358364
^
359-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc
360-
^^^^^^^^
361-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc
365+
source.ts meta.class.ts comment.block.documentation.ts
366+
^
367+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.begin.jsdoc
368+
^^^^^^
369+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
370+
^
371+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.end.jsdoc
362372
^
363-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc
373+
source.ts meta.class.ts comment.block.documentation.ts
364374
^^^^^
365-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc
366-
^
367-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc
368-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
369-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc
375+
source.ts meta.class.ts comment.block.documentation.ts variable.other.jsdoc
376+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
377+
source.ts meta.class.ts comment.block.documentation.ts
370378
> * @returns {Vector3} A vector representing the column.
371379
^^^^^^^
372380
source.ts meta.class.ts comment.block.documentation.ts
373-
^^^^^^^^
374-
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc
381+
^
382+
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
383+
^^^^^^^
384+
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc
375385
^
376386
source.ts meta.class.ts comment.block.documentation.ts
377-
^^^^^^^^^
378-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc
387+
^
388+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.begin.jsdoc
389+
^^^^^^^
390+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
391+
^
392+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.end.jsdoc
379393
^
380-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc
381-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
382-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc
394+
source.ts meta.class.ts comment.block.documentation.ts
395+
^
396+
source.ts meta.class.ts comment.block.documentation.ts
397+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
398+
source.ts meta.class.ts comment.block.documentation.ts
383399
> */
384400
^^^^^
385401
source.ts meta.class.ts comment.block.documentation.ts
@@ -745,33 +761,45 @@ Grammar: TypeScript.tmLanguage
745761
> * @param {number} index The index of the column (0 .. 2).
746762
^^^^^^^
747763
source.ts meta.class.ts comment.block.documentation.ts
748-
^^^^^^
749-
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc
764+
^
765+
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
766+
^^^^^
767+
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc
750768
^
751-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc
752-
^^^^^^^^
753-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc
769+
source.ts meta.class.ts comment.block.documentation.ts
770+
^
771+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.begin.jsdoc
772+
^^^^^^
773+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
774+
^
775+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.end.jsdoc
754776
^
755-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc
777+
source.ts meta.class.ts comment.block.documentation.ts
756778
^^^^^
757-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc
758-
^
759-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc
760-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
761-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc
779+
source.ts meta.class.ts comment.block.documentation.ts variable.other.jsdoc
780+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
781+
source.ts meta.class.ts comment.block.documentation.ts
762782
> * @returns {Vector3} A vector representing the column.
763783
^^^^^^^
764784
source.ts meta.class.ts comment.block.documentation.ts
765-
^^^^^^^^
766-
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc
785+
^
786+
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
787+
^^^^^^^
788+
source.ts meta.class.ts comment.block.documentation.ts storage.type.class.jsdoc
767789
^
768790
source.ts meta.class.ts comment.block.documentation.ts
769-
^^^^^^^^^
770-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc
791+
^
792+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.begin.jsdoc
793+
^^^^^^^
794+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
795+
^
796+
source.ts meta.class.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.end.jsdoc
771797
^
772-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc
773-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
774-
source.ts meta.class.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc
798+
source.ts meta.class.ts comment.block.documentation.ts
799+
^
800+
source.ts meta.class.ts comment.block.documentation.ts
801+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
802+
source.ts meta.class.ts comment.block.documentation.ts
775803
> */
776804
^^^^^
777805
source.ts meta.class.ts comment.block.documentation.ts

‎tests/baselines/Issue276.baseline.txt‎

Lines changed: 51 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,48 +20,74 @@ Grammar: TypeScript.tmLanguage
2020
> * @param {string} value
2121
^^^
2222
source.ts comment.block.documentation.ts
23-
^^^^^^
24-
source.ts comment.block.documentation.ts storage.type.class.jsdoc
23+
^
24+
source.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
25+
^^^^^
26+
source.ts comment.block.documentation.ts storage.type.class.jsdoc
2527
^
26-
source.ts comment.block.documentation.ts other.meta.jsdoc
27-
^^^^^^^^
28-
source.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc
28+
source.ts comment.block.documentation.ts
29+
^
30+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.begin.jsdoc
31+
^^^^^^
32+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
33+
^
34+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.end.jsdoc
2935
^
30-
source.ts comment.block.documentation.ts other.meta.jsdoc
36+
source.ts comment.block.documentation.ts
3137
^^^^^
32-
source.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc
38+
source.ts comment.block.documentation.ts variable.other.jsdoc
3339
^^
34-
source.ts comment.block.documentation.ts other.meta.jsdoc
40+
source.ts comment.block.documentation.ts
3541
> * @param {string[]} arrayValue
3642
^^^
3743
source.ts comment.block.documentation.ts
38-
^^^^^^
39-
source.ts comment.block.documentation.ts storage.type.class.jsdoc
44+
^
45+
source.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
46+
^^^^^
47+
source.ts comment.block.documentation.ts storage.type.class.jsdoc
4048
^
41-
source.ts comment.block.documentation.ts other.meta.jsdoc
42-
^^^^^^^^^^
43-
source.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc
49+
source.ts comment.block.documentation.ts
50+
^
51+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.begin.jsdoc
52+
^^^^^^
53+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
54+
^
55+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
56+
^
57+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
58+
^
59+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.end.jsdoc
4460
^
45-
source.ts comment.block.documentation.ts other.meta.jsdoc
61+
source.ts comment.block.documentation.ts
4662
^^^^^^^^^^
47-
source.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc
63+
source.ts comment.block.documentation.ts variable.other.jsdoc
4864
^^
49-
source.ts comment.block.documentation.ts other.meta.jsdoc
65+
source.ts comment.block.documentation.ts
5066
> * @param {string} [optionalValue]
5167
^^^
5268
source.ts comment.block.documentation.ts
53-
^^^^^^
54-
source.ts comment.block.documentation.ts storage.type.class.jsdoc
69+
^
70+
source.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
71+
^^^^^
72+
source.ts comment.block.documentation.ts storage.type.class.jsdoc
5573
^
56-
source.ts comment.block.documentation.ts other.meta.jsdoc
57-
^^^^^^^^
58-
source.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc
74+
source.ts comment.block.documentation.ts
75+
^
76+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.begin.jsdoc
77+
^^^^^^
78+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
79+
^
80+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.end.jsdoc
5981
^
60-
source.ts comment.block.documentation.ts other.meta.jsdoc
61-
^^^^^^^^^^^^^^^
62-
source.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc
82+
source.ts comment.block.documentation.ts
83+
^
84+
source.ts comment.block.documentation.ts variable.other.jsdoc
85+
^^^^^^^^^^^^^
86+
source.ts comment.block.documentation.ts variable.other.jsdoc
87+
^
88+
source.ts comment.block.documentation.ts variable.other.jsdoc
6389
^^
64-
source.ts comment.block.documentation.ts other.meta.jsdoc
90+
source.ts comment.block.documentation.ts
6591
> */
6692
^
6793
source.ts comment.block.documentation.ts

‎tests/baselines/Issue435.baseline.txt‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
original file
2+
-----------------------------------
3+
/**
4+
* Manually add an item to the uploading queue.
5+
*
6+
* @param {PIXI.DisplayObject|PIXI.Container|PIXI.BaseTexture|PIXI.Texture|PIXI.Graphics|PIXI.Text|*} item - Object to
7+
* add to the queue
8+
* @return {PIXI.CanvasPrepare} Instance of plugin for chaining.
9+
*/
10+
-----------------------------------
11+
12+
Grammar: TypeScript.tmLanguage
13+
-----------------------------------
14+
>/**
15+
^^^
16+
source.ts comment.block.documentation.ts punctuation.definition.comment.ts
17+
^^
18+
source.ts comment.block.documentation.ts
19+
> * Manually add an item to the uploading queue.
20+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
21+
source.ts comment.block.documentation.ts
22+
> *
23+
^^^^^^^^
24+
source.ts comment.block.documentation.ts
25+
> * @param {PIXI.DisplayObject|PIXI.Container|PIXI.BaseTexture|PIXI.Texture|PIXI.Graphics|PIXI.Text|*} item - Object to
26+
^^^^^^^
27+
source.ts comment.block.documentation.ts
28+
^
29+
source.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
30+
^^^^^
31+
source.ts comment.block.documentation.ts storage.type.class.jsdoc
32+
^
33+
source.ts comment.block.documentation.ts
34+
^
35+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.begin.jsdoc
36+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
37+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
38+
^
39+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.end.jsdoc
40+
^
41+
source.ts comment.block.documentation.ts
42+
^^^^
43+
source.ts comment.block.documentation.ts variable.other.jsdoc
44+
^^^^^^^^^^^^^^
45+
source.ts comment.block.documentation.ts
46+
> * add to the queue
47+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
48+
source.ts comment.block.documentation.ts
49+
> * @return {PIXI.CanvasPrepare} Instance of plugin for chaining.
50+
^^^^^^^
51+
source.ts comment.block.documentation.ts
52+
^
53+
source.ts comment.block.documentation.ts storage.type.class.jsdoc punctuation.definition.block.tag.jsdoc
54+
^^^^^^
55+
source.ts comment.block.documentation.ts storage.type.class.jsdoc
56+
^
57+
source.ts comment.block.documentation.ts
58+
^
59+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.begin.jsdoc
60+
^^^^^^^^^^^^^^^^^^
61+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc
62+
^
63+
source.ts comment.block.documentation.ts entity.name.type.instance.jsdoc punctuation.definition.bracket.curly.end.jsdoc
64+
^
65+
source.ts comment.block.documentation.ts
66+
^^^^^^^^
67+
source.ts comment.block.documentation.ts
68+
^^^^^^^^^^^^^^^^^^^^^^^^^^
69+
source.ts comment.block.documentation.ts
70+
> */
71+
^^^^^
72+
source.ts comment.block.documentation.ts
73+
^^
74+
source.ts comment.block.documentation.ts punctuation.definition.comment.ts

0 commit comments

Comments
 (0)