|
202 | 202 | }, |
203 | 203 | "graphql-description-singleline": { |
204 | 204 | "comment": "In new graphql spec 0.12.0, the description have to be specified as doc-strings or single-line text in double quotes", |
205 | | - "name": "graphql.description", |
| 205 | + "name": "graphql.description.SINGLELINE", |
206 | 206 | "match": "^\\s*(\"(?:\"\")?)([^\"].*)(\"(?:\"\")?)$", |
207 | 207 | "captures": { |
208 | | - "1": { "name": "comment.quoted.double.graphql.begin" }, |
209 | | - "2": { "name": "comment.description.graphql" }, |
210 | | - "3": { "name": "comment.quoted.double.graphql.end" } |
| 208 | + "1": { "name": "punctuation.definition.string.graphql.begin" }, |
| 209 | + "2": { "name": "string.description.graphql" }, |
| 210 | + "3": { "name": "punctuation.definition.string.graphql.end" } |
211 | 211 | } |
212 | 212 | }, |
213 | 213 | "graphql-description-docstring": { |
214 | 214 | "comment": "In new graphql spec 0.12.0, the description have to be specified as doc-strings or single-line text in double quotes", |
215 | | - "name": "graphql.description", |
216 | | - "begin": "(\"\"\")(?:$|(.*))", |
| 215 | + "name": "string.block.description.graphql.DOCSTRING", |
| 216 | + "begin": "(\"\"\")(?:((?!\"\"\").)*|\\Z)", |
217 | 217 | "beginCaptures": { |
218 | | - "1": { "name": "comment.quoted.double.graphql.begin" }, |
219 | | - "2": { "name": "comment.block.description.graphql" } |
| 218 | + "1": { "name": "punctuation.definition.string.graphql.begin" } |
220 | 219 | }, |
221 | | - "end": "^\\s*(\"\"\")$", |
| 220 | + "end": "(\"\"\")$", |
222 | 221 | "endCaptures": { |
223 | | - "1": { "name": "comment.quoted.double.graphql.end" } |
| 222 | + "1": { "name": "punctuation.definition.string.graphql.end" } |
224 | 223 | }, |
225 | 224 | "patterns": [ |
226 | | - { |
227 | | - "name": "comment.block.description.graphql", |
228 | | - "match": "^\\s*.*$" |
229 | | - } |
| 225 | + { "include": "#graphql-string-content" } |
230 | 226 | ] |
231 | 227 | }, |
232 | 228 | "graphql-variable-definitions": { |
|
511 | 507 | "end": "\\s*+(?:((\"))|(\n))", |
512 | 508 | "beginCaptures": { |
513 | 509 | "1": { "name": "string.quoted.double.graphql" }, |
514 | | - "2": { "name": "punctuation.definition.string.begin.graphql" } |
| 510 | + "2": { "name": "punctuation.definition.string.graphql.begin" } |
515 | 511 | }, |
516 | 512 | "endCaptures": { |
517 | 513 | "1": { "name": "string.quoted.double.graphql" }, |
518 | | - "2": { "name": "punctuation.definition.string.end.graphql" }, |
| 514 | + "2": { "name": "punctuation.definition.string.graphql.end" }, |
519 | 515 | "3": { "name": "invalid.illegal.newline.graphql" } |
520 | 516 | }, |
521 | 517 | "patterns": [ |
|
571 | 567 | "graphql-value":{ |
572 | 568 | "patterns": [ |
573 | 569 | { "include": "#graphql-comment" }, |
574 | | - { "include": "#graphql-description-docstring" }, |
575 | 570 | { "include": "#graphql-variable-name" }, |
576 | 571 | { "include": "#graphql-float-value" }, |
577 | 572 | { "include": "#graphql-string-value" }, |
| 573 | + { "include": "#graphql-description-docstring" }, |
578 | 574 | { "include": "#graphql-boolean-value" }, |
579 | 575 | { "include": "#graphql-null-value" }, |
580 | 576 | { "include": "#graphql-enum-value" }, |
|
0 commit comments