@@ -41,7 +41,7 @@
41 <indentation>
41 <indentation>
42 <increase>
42 <increase>
43 <expression>
43 <expression>
44− (case|class|do|let|where).*
44+ (case|class|do|let|where|=).*
45 </expression>
45 </expression>
46 </increase>
46 </increase>
47 <decrease>
47 <decrease>
@@ -57,8 +57,6 @@
57 <include syntax="self" collection="type-family-definition" />
57 <include syntax="self" collection="type-family-definition" />
58 <include syntax="self" collection="pattern-definition" />
58 <include syntax="self" collection="pattern-definition" />
59 <include syntax="self" collection="type-definition" />
59 <include syntax="self" collection="type-definition" />
60− <!-- <include syntax="self" collection="type-annotation" /> -->
61− <include syntax="self" collection="data-definition" />
62 <include syntax="self" collection="GADT-definition" />
60 <include syntax="self" collection="GADT-definition" />
63 <include syntax="self" collection="instance" />
61 <include syntax="self" collection="instance" />
64 <include syntax="self" collection="typeclass" />
62 <include syntax="self" collection="typeclass" />
@@ -67,7 +65,6 @@
68 <template-scopes>
66 <template-scopes>
69 <include syntax="self" collection="Quote" />
67 <include syntax="self" collection="Quote" />
70− <include syntax="self" collection="comments" />
71 </template-scopes>
68 </template-scopes>
73 <collections>
70 <collections>
@@ -80,53 +77,27 @@
80 </collection>
77 </collection>
82 <collection name="expressions">
79 <collection name="expressions">
80+ <scope name="haskell.construct.keyword.at">
81+ <expression>@</expression>
83+ <scope name="haskell.construct.keyword.case-arrow">
84+ <expression>-></expression>
86+ <scope name="haskell.construct.keyword.bind-arrow">
87+ <expression><-</expression>
83− <include syntax="self" collection="do-bind" />
89+ <include syntax="self" collection="keywords" />
84 <include syntax="self" collection="literal" />
90 <include syntax="self" collection="literal" />
85 <include syntax="self" collection="operators" />
91 <include syntax="self" collection="operators" />
92+ <include syntax="self" collection="record-match" />
86 <include syntax="self" collection="list" />
93 <include syntax="self" collection="list" />
94+ <include syntax="self" collection="view-pattern" />
87 <include syntax="self" collection="lambda-case" />
95 <include syntax="self" collection="lambda-case" />
88 <include syntax="self" collection="lambda-head" />
96 <include syntax="self" collection="lambda-head" />
89− <include syntax="self" collection="type-applications" />
90 <include syntax="self" collection="case-expression" />
97 <include syntax="self" collection="case-expression" />
98+ <include syntax="self" collection="qconid" />
91 <include syntax="self" collection="qvarid" />
99 <include syntax="self" collection="qvarid" />
92− <include syntax="self" collection="bind-arrow" />
93 <include syntax="self" collection="tuple" />
100 <include syntax="self" collection="tuple" />
97− <!-- Needed for do binds -->
98− <!-- <include syntax="self" collection="pattern-match" /> -->
101− <collection name="pattern-match">
102− <include syntax="self" collection="literal" />
103− <include syntax="self" collection="view-pattern" />
104− <include syntax="self" collection="tuple-match" />
105−<!-- <include syntax="self" collection="at-pattern" /> -->
106− <include syntax="self" collection="varid" />
107− <include syntax="self" collection="qconid" />
108− <include syntax="self" collection="record-match" />
109− <include syntax="self" collection="list-pattern" />
112− <collection name="type-applications">
113− <scope name="type-applications">
115− <expression>(\s@)\(</expression>
116− <capture number="1" name="haskell.keyword.operator.typeapplication" />
119− <expression>)</expression>
122− <include syntax="self" collection="type" />
125− <scope name="type-applications-single">
126− <expression>(@)(\w+)</expression>
127− <capture number="1" name="haskell.keyword.operator.typeapplication" />
128− <capture number="2" name="haskell.identifier.type" />
130 </collection>
101 </collection>
132 <collection name="Quote">
103 <collection name="Quote">
@@ -165,8 +136,8 @@
165 <capture number="1" name="haskell.pattern.record.bracket" />
136 <capture number="1" name="haskell.pattern.record.bracket" />
166 </ends-with>
137 </ends-with>
167 <subscopes>
138 <subscopes>
168− <include syntax="self" collection="pattern-match" />
139+ <include syntax="self" collection="comments" />
169− <include syntax="self" collection="varid" />
140+ <include syntax="self" collection="expressions" />
170 <scope name="record-sep">
141 <scope name="record-sep">
171 <expression>=</expression>
142 <expression>=</expression>
@@ -188,6 +159,7 @@
188 <capture number="1" name="haskell.pattern.record.bracket" />
159 <capture number="1" name="haskell.pattern.record.bracket" />
189 </ends-with>
160 </ends-with>
190 <subscopes>
161 <subscopes>
162+ <include syntax="self" collection="comments" />
191 <scope name="haskell.pattern.record.wildcard">
163 <scope name="haskell.pattern.record.wildcard">
192 <expression>\.\.</expression>
164 <expression>\.\.</expression>
@@ -214,29 +186,12 @@
214 <capture number="1" name="haskell.list.bracket" />
186 <capture number="1" name="haskell.list.bracket" />
215 </ends-with>
187 </ends-with>
216 <subscopes>
188 <subscopes>
189+ <include syntax="self" collection="comments" />
217 <include syntax="self" collection="expressions" />
190 <include syntax="self" collection="expressions" />
218 </subscopes>
191 </subscopes>
220 </collection>
193 </collection>
222− <collection name="list-pattern">
223− <symbol type="expression" />
224− <scope name="haskell.pattern.list">
226− <expression>(\[)</expression>
227− <capture number="1" name="haskell.pattern.list.bracket" />
230− <expression>(\])</expression>
231− <capture number="1" name="haskell.pattern.list.bracket" />
234− <include syntax="self" collection="pattern-match" />
240 <collection name="view-pattern">
195 <collection name="view-pattern">
241 <scope name="haskell.pattern.view">
196 <scope name="haskell.pattern.view">
242 <symbol type="expression" />
197 <symbol type="expression" />
@@ -253,24 +208,7 @@
253 <scope name="haskell.pattern.view.operator.arrow">
208 <scope name="haskell.pattern.view.operator.arrow">
254 <expression>-></expression>
209 <expression>-></expression>
256− <include syntax="self" collection="pattern-match" />
211+ <include syntax="self" collection="expressions" />
261− <collection name="tuple-match">
262− <symbol type="expression" />
263− <scope name="haskell.pattern.tuple">
265− <expression>(\()</expression>
266− <capture number="1" name="haskell.pattern.tuple.bracket" />
269− <expression>(\))</expression>
270− <capture number="1" name="haskell.pattern.tuple.bracket" />
273− <include syntax="self" collection="pattern-match" />
274 </subscopes>
212 </subscopes>
276 </collection>
214 </collection>
@@ -285,7 +223,7 @@
285 <expression>(of)</expression>
223 <expression>(of)</expression>
286 <capture number="1" name="haskell.case.keyword.condition" />
224 <capture number="1" name="haskell.case.keyword.condition" />
287 </ends-with>
225 </ends-with>
288− <subscopes>
226+ <subscopes anchored="true">
289 <include syntax="self" collection="expressions" />
227 <include syntax="self" collection="expressions" />
290 </subscopes>
228 </subscopes>
@@ -303,70 +241,117 @@
303 <capture number="1" name="haskell.tuple.bracket" />
241 <capture number="1" name="haskell.tuple.bracket" />
304 </ends-with>
242 </ends-with>
305 <subscopes>
243 <subscopes>
244+ <include syntax="self" collection="comments" />
306 <include syntax="self" collection="expressions" />
245 <include syntax="self" collection="expressions" />
307 </subscopes>
246 </subscopes>
309 </collection>
248 </collection>
311 <collection name="typeclass">
250 <collection name="typeclass">
312− <symbol type="interface" />
251+ <scope name="haskell.definition.class.head">
313− <scope name="haskell.definition.class">
252+ <symbol type="class" scope="global" name-selector="haskell.keyword.construct.class.name">
253+ <context behavior="whitespace" foldable="true" />
314 <starts-with>
255 <starts-with>
315 <expression>^(\h*)(class)($|\h)</expression>
256 <expression>^(\h*)(class)($|\h)</expression>
316 <capture number="2" name="haskell.keyword.construct.class" />
257 <capture number="2" name="haskell.keyword.construct.class" />
317 </starts-with>
258 </starts-with>
318− <ends-with>
259+ <ends-with />
319− <template>^(?!\s+\1\S)(?!\s*$)</template>
260+ <subscopes anchored="true">
261+ <scope name="haskell.keyword.construct.class.name">
263+ <expression></expression>
266+ <expression>(?=(where|^\s*$))</expression>
320− </ends-with>
267+ </ends-with>
321− <subscopes>
268+ <subscopes>
269+ <include syntax="self" collection="comments" />
270+ <include syntax="self" collection="type" />
322− <scope name="haskell.keyword.construct.where">
273+ <scope name="haskell.keyword.construct.where" optional="true">
323 <expression>where</expression>
274 <expression>where</expression>
325− <include syntax="self" collection="type" />
326− <include syntax="self" collection="type-definition" />
327− <!-- <include syntax="self" collection="type-annotation" /> -->
328− <include syntax="self" collection="definition" />
329 </subscopes>
276 </subscopes>
331 </collection>
278 </collection>
333 <collection name="instance">
280 <collection name="instance">
334 <scope name="haskell.instance">
281 <scope name="haskell.instance">
335− <symbol type="category" />
282+ <symbol type="category" name-selector="haskell.keyword.construct.instance.name">
283+ <context behavior="whitespace" foldable="true" />
336 <starts-with>
285 <starts-with>
337 <expression>^(\h*)(instance)($|\h)</expression>
286 <expression>^(\h*)(instance)($|\h)</expression>
338 <capture number="2" name="haskell.keyword.construct.instance" />
287 <capture number="2" name="haskell.keyword.construct.instance" />
339 </starts-with>
288 </starts-with>
340− <ends-with>
289+ <ends-with />
341− <template>^(?!\s+\1\S)(?!\s*$)</template>
290+ <subscopes anchored="true">
291+ <scope name="haskell.keyword.construct.instance.name">
293+ <expression></expression>
296+ <expression>(?=(where|^\s*$))</expression>
342− </ends-with>
297+ </ends-with>
343− <subscopes>
298+ <subscopes>
299+ <include syntax="self" collection="type" />
344− <scope name="haskell.keyword.construct.where">
302+ <scope name="haskell.keyword.construct.where" optional="true">
345 <expression>where</expression>
303 <expression>where</expression>
347− <include syntax="self" collection="type" />
348− <include syntax="self" collection="type-definition" />
349− <include syntax="self" collection="type-annotation" />
350− <include syntax="self" collection="definition" />
351 </subscopes>
305 </subscopes>
353 </collection>
307 </collection>
355 <collection name="type-family-definition">
309 <collection name="type-family-definition">
356− <scope name="haskell.definition.type.type-family">
310+ <scope name="haskell.definition.type-family.type">
357− <symbol type="type" />
358 <starts-with>
311 <starts-with>
359− <expression>^(\h*)(type\h+family)\h+`?(\w(\w|')*)`?($|\h)</expression>
312+ <expression>^(\h*)(type\h+family)</expression>
360 <capture number="2" name="haskell.keyword.construct.type-family" />
313 <capture number="2" name="haskell.keyword.construct.type-family" />
361 </starts-with>
314 </starts-with>
362 <ends-with>
315 <ends-with>
363 <template>^(?!\s+\1\S)(?!\s*$)</template>
316 <template>^(?!\s+\1\S)(?!\s*$)</template>
364 </ends-with>
317 </ends-with>
318+ <subscopes anchored="true" skip-whitespace="false">
319+ <scope name="haskell.type-family.head">
321+ <expression></expression>
324+ <expression>where</expression>
325+ <capture number="0" name="haskell.keyword.construct.where" />
327+ <subscopes anchored="true">
328+ <scope name="haskell.identifier.type-family.type.name">
329+ <expression>\S+</expression>
331+ <include syntax="self" collection="type" repeat="true" optional="true" />
335+ <include syntax="self" collection="type-family-case-definition" optional="true" repeat="true" />
340+ <collection name="type-family-case-definition">
341+ <scope name="haskell.definition.type-family.type.case">
343+ <expression>^(\h*)(?=\S)</expression>
346+ <template>^(?!\s+\1\S)(?!\s*$)</template>
365 <subscopes>
348 <subscopes>
366− <scope name="haskell.keyword.construct.where">
349+ <include syntax="self" collection="comments" />
350+ <include syntax="self" collection="type" optional="true" repeat="true" />
367− <expression>where</expression>
352+ <expression>=</expression>
369− <include syntax="self" collection="type" />
354+ <include syntax="self" collection="type" optional="true" repeat="true" />
370 </subscopes>
355 </subscopes>
372 </collection>
357 </collection>
@@ -374,47 +359,26 @@
374 <collection name="definition">
359 <collection name="definition">
375 <scope name="haskell.definition.type.function">
360 <scope name="haskell.definition.type.function">
376 <symbol type="function">
361 <symbol type="function">
377− <display-name>
362+ <context behavior="whitespace" foldable="true" />
378− <component selector="haskell.definition.type.function" />
381 </symbol>
363 </symbol>
382 <starts-with>
364 <starts-with>
383 <expression>^(?=(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h))</expression>
365 <expression>^(?=(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h))</expression>
384 <capture number="2" name="haskell.keyword.construct.default" />
366 <capture number="2" name="haskell.keyword.construct.default" />
385− <capture number="3" name="haskell.identifier.function" />
367+ <capture number="3" name="haskell.identifier.function.name" />
386 </starts-with>
368 </starts-with>
387 <ends-with>
369 <ends-with>
388 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
370 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
389 </ends-with>
371 </ends-with>
390 <subscopes>
372 <subscopes>
373+ <include syntax="self" collection="comments" />
391 <include syntax="self" collection="type-annotation" />
374 <include syntax="self" collection="type-annotation" />
392 <include syntax="self" collection="implementation" />
375 <include syntax="self" collection="implementation" />
393 </subscopes>
376 </subscopes>
395 </collection>
378 </collection>
397− <collection name="do-bind">
398− <scope name="do-bind">
400− <expression>^(?=(\h*).+<-($|\h))</expression>
403− <template>^(?!\0)(?!\s+\1\S)(?!\s*$)</template>
405− <subscopes anchored="true">
406− <include syntax="self" collection="pattern-match" />
407− <scope name="bind-arrow">
408− <expression><-</expression>
410− <include syntax="self" collection="expressions" repeat="true" />
415 <collection name="implementation">
380 <collection name="implementation">
416− <scope name="haskell.definition.type.function">
381+ <scope name="haskell.definition.type.function.implementation">
417− <local scope="within-construct" />
418 <starts-with>
382 <starts-with>
419 <expression>^(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h)</expression>
383 <expression>^(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h)</expression>
420 <capture number="2" name="haskell.keyword.construct.default" />
384 <capture number="2" name="haskell.keyword.construct.default" />
@@ -424,14 +388,20 @@
424 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
388 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
425 </ends-with>
389 </ends-with>
426 <subscopes>
390 <subscopes>
427− <include syntax="self" collection="where-clause" />
391+ <include syntax="self" collection="comments" />
428− <include syntax="self" collection="expressions" />
392+ <include syntax="self" collection="pattern-match" optional="true" repeat="true" />
394+ <expression>=</expression>
395+ <capture number="0" name="haskell.construct.function.keyword.eq" />
397+ <include syntax="self" collection="expressions" optional="true" repeat="true" />
398+ <include syntax="self" collection="where-clause" optional="true" />
429 </subscopes>
399 </subscopes>
431 </collection>
401 </collection>
433 <collection name="type-annotation">
403 <collection name="type-annotation">
434− <scope name="haskell.definition.type.function">
404+ <scope name="haskell.definition.type.function.type-signature">
435 <starts-with>
405 <starts-with>
436 <expression>^(\h*)`?(\w(\w|')*)`?\h*::($|\h)</expression>
406 <expression>^(\h*)`?(\w(\w|')*)`?\h*::($|\h)</expression>
437 <capture number="2" name="haskell.identifier.function" />
407 <capture number="2" name="haskell.identifier.function" />
@@ -440,6 +410,7 @@
440 <template>^(?!\s+\1\S)(?!\s*$)</template>
410 <template>^(?!\s+\1\S)(?!\s*$)</template>
441 </ends-with>
411 </ends-with>
442 <subscopes>
412 <subscopes>
413+ <include syntax="self" collection="comments" />
443 <include syntax="self" collection="type" />
414 <include syntax="self" collection="type" />
444 </subscopes>
415 </subscopes>
@@ -447,15 +418,19 @@
448 <collection name="type-definition">
419 <collection name="type-definition">
449 <scope name="haskell.definition.type">
420 <scope name="haskell.definition.type">
421+ <symbol type="type" scope="global">
422+ <context behavior="whitespace" foldable="true" />
450 <starts-with>
424 <starts-with>
451 <expression>^(\h*)(type)\h+(\w(\w|')*)</expression>
425 <expression>^(\h*)(type)\h+(\w(\w|')*)</expression>
452 <capture number="2" name="haskell.keyword.construct.type" />
426 <capture number="2" name="haskell.keyword.construct.type" />
453− <capture number="3" name="haskell.identifier.type" />
427+ <capture number="3" name="haskell.identifier.type.name" />
454 </starts-with>
428 </starts-with>
455 <ends-with>
429 <ends-with>
456 <template>^(?!\s+\1\S)(?!\s*$)</template>
430 <template>^(?!\s+\1\S)(?!\s*$)</template>
457 </ends-with>
431 </ends-with>
458 <subscopes>
432 <subscopes>
433+ <include syntax="self" collection="comments" />
459 <include syntax="self" collection="type" />
434 <include syntax="self" collection="type" />
460 </subscopes>
435 </subscopes>
@@ -463,66 +438,72 @@
464 <collection name="GADT-definition">
439 <collection name="GADT-definition">
465 <scope name="haskell.definition.struct.GADT">
440 <scope name="haskell.definition.struct.GADT">
441+ <symbol type="struct" scope="global">
442+ <context behavior="subtree" foldable="false" />
466 <starts-with>
444 <starts-with>
467− <expression>^(\h*)(data)\h+(\w(\w|')*)</expression>
445+ <expression>^(\h*)(data|newtype)\h+(\w(\w|')*)</expression>
468 <capture number="2" name="haskell.keyword.construct.data.GADT" />
446 <capture number="2" name="haskell.keyword.construct.data.GADT" />
447+ <capture number="3" name="haskell.identifier.data.type.name" />
469 </starts-with>
448 </starts-with>
470 <ends-with>
449 <ends-with>
471 <template>^(?!\s+\1\S)(?!\s*$)</template>
450 <template>^(?!\s+\1\S)(?!\s*$)</template>
472 </ends-with>
451 </ends-with>
473 <subscopes>
452 <subscopes>
453+ <include syntax="self" collection="comments" />
454+ <scope name="haskell.keyword.construct.where">
455+ <expression>where</expression>
458+ <include syntax="self" collection="deriving-clause" />
459+ <include syntax="self" collection="record-definition" />
474 <include syntax="self" collection="gadt-constructor" />
460 <include syntax="self" collection="gadt-constructor" />
475 <include syntax="self" collection="type" />
461 <include syntax="self" collection="type" />
476− <include syntax="self" collection="record-definition" />
477− <include syntax="self" collection="record-definition-field-name" />
478 </subscopes>
462 </subscopes>
480 </collection>
464 </collection>
482 <collection name="gadt-constructor">
466 <collection name="gadt-constructor">
483− <scope name="identifier.type.struct.GADT.constructor">
467+ <scope name="haskell.identifier.type.struct.data.constructor">
484− <expression>^\h+[A-Z](\w|')*</expression>
468+ <symbol type="constructor">
485− </scope>
469+ <context behavior="subtree" foldable="true" />
486− </collection>
470+ </symbol>
488− <collection name="data-definition">
489− <scope name="haskell.definition.struct.data">
490 <starts-with>
471 <starts-with>
491− <expression>^(\h*)(data|newtype)\h+(\w(\w|')*)</expression>
472+ <expression>(^|=|\||^)\h+([A-Z](\w|')*)</expression>
492− <capture number="2" name="haskell.keyword.construct.data.newtype" />
473+ <capture number="2" name="haskell.identifier.data.name" />
493− <capture number="3" name="haskell.identifier.type" />
494 </starts-with>
474 </starts-with>
495− <ends-with>
475+ <ends-with />
496− <template>^(?!\s+\1\S)(?!\s*$)</template>
498− <subscopes>
476+ <subscopes anchored="true">
499 <include syntax="self" collection="record-definition" />
477 <include syntax="self" collection="record-definition" />
500− <include syntax="self" collection="data-constructor" />
501− <include syntax="self" collection="type" />
502 </subscopes>
478 </subscopes>
504 </collection>
480 </collection>
506− <collection name="data-constructor">
482+ <collection name="deriving-clause">
507− <scope name="haskell.identifier.type.struct.data.constructor">
483+ <scope name="haskell.record.construct.deriving.keyword">
508− <expression>=\h+[A-Z](\w|')*</expression>
484+ <expression>deriving(\h+(newtype|stock|anyclass))?</expression>
510− <scope name="haskell.identifier.type.struct.data.constructor">
486+ <scope name="haskell.record.construct.deriving.keyword">
487+ <include syntax="self" collection="comments" />
511− <expression>\|\h+[A-Z](\w|')*</expression>
488+ <expression>via</expression>
513 </collection>
490 </collection>
515 <collection name="record-definition">
492 <collection name="record-definition">
516 <scope name="haskell.record">
493 <scope name="haskell.record">
495+ <context behavior="subtree" foldable="true" />
517 <starts-with>
497 <starts-with>
518− <expression>(\{)</expression>
498+ <expression>(?=\{)</expression>
519− <capture number="1" name="haskell.record.bracket" />
499+ <capture number="0" name="haskell.record.bracket" />
520 </starts-with>
500 </starts-with>
521 <ends-with>
501 <ends-with>
522 <expression>(\})</expression>
502 <expression>(\})</expression>
523 <capture number="1" name="haskell.record.bracket" />
503 <capture number="1" name="haskell.record.bracket" />
524 </ends-with>
504 </ends-with>
525 <subscopes>
505 <subscopes>
506+ <include syntax="self" collection="comments" />
526 <include syntax="self" collection="record-definition-field-name" />
507 <include syntax="self" collection="record-definition-field-name" />
527 <include syntax="self" collection="type" />
508 <include syntax="self" collection="type" />
528 </subscopes>
509 </subscopes>
@@ -531,26 +512,65 @@
532 <collection name="record-definition-field-name">
513 <collection name="record-definition-field-name">
533 <scope name="haskell.record.definition.property">
514 <scope name="haskell.record.definition.property">
515+ <symbol type="property" />
534− <expression>\w(\w|')*\h*::</expression>
516+ <expression>(((?![A-Z])\w(\w|')*)\h*::|(^|\{|,)\h*((?![A-Z])\w(\w|')*))</expression>
517+ <capture number="5" name="haskell.record.definition.property.field.property.name" />
518+ <capture number="2" name="haskell.record.definition.property.field.property.name" />
536 </collection>
520 </collection>
538 <collection name="type">
522 <collection name="type">
523+ <scope name="haskell.keyword.construct.function-arrow">
524+ <expression>-></expression>
526+ <scope name="haskell.keyword.construct.fat-arrow">
527+ <expression>=></expression>
529+ <include syntax="self" collection="strings" />
530+ <scope name="haskell.type.construct.tuple">
532+ <expression>\(</expression>
535+ <expression>\)</expression>
538+ <include syntax="self" collection="comments" />
539+ <scope name="haskell.construct.type.typle.comma">
540+ <expression>\,</expression>
542+ <include syntax="self" collection="type" />
545+ <scope name="haskell.type.list">
547+ <expression>'?\[</expression>
550+ <expression>\]</expression>
553+ <include syntax="self" collection="comments" />
554+ <include syntax="self" collection="type" />
557+ <scope name="haskell.type.star">
558+ <expression>\*</expression>
560+ <scope name="haskell.keyword.construct.type-annotation-operator">
561+ <expression>::</expression>
539 <include syntax="self" collection="type-list" />
563 <include syntax="self" collection="type-list" />
565+ <expression>(([A-Z](\w|')*\.)*)'*\!?([A-Z](\w|')*)</expression>
566+ <capture number="1" name="haskell.identifier.package.module" />
540− <scope name="haskell.identifier.type">
567+ <capture number="4" name="haskell.identifier.type" />
541− <expression>([A-Z](\w|')*\.)*[A-Z](\w|')*</expression>
543 <scope name="haskell.keyword.construct.forall">
569 <scope name="haskell.keyword.construct.forall">
544 <expression>forall</expression>
570 <expression>forall</expression>
546 <scope name="haskell.identifier.type.variable">
572 <scope name="haskell.identifier.type.variable">
547− <expression>\w(\w|')*</expression>
573+ <expression>(?!where)(?!=)((?!(\(|\)|\,|\!))\S)((?!(\(|\)|\,))\w)*</expression>
549− <scope name="haskell.keyword.construct.function-arrow">
550− <expression>-></expression>
552− <scope name="haskell.keyword.construct.fat-arrow">
553− <expression>=></expression>
555 </collection>
575 </collection>
@@ -565,6 +585,7 @@
565 <template>^(?!\s+\1\S)(?!\s*$)</template>
585 <template>^(?!\s+\1\S)(?!\s*$)</template>
566 </ends-with>
586 </ends-with>
567 <subscopes>
587 <subscopes>
588+ <include syntax="self" collection="comments" />
568 <scope name="haskell.keyword.construct.where">
589 <scope name="haskell.keyword.construct.where">
569 <expression>where</expression>
590 <expression>where</expression>
@@ -584,6 +605,7 @@
584 <capture number="1" name="haskell.type-list.bracket" />
605 <capture number="1" name="haskell.type-list.bracket" />
585 </ends-with>
606 </ends-with>
586 <subscopes>
607 <subscopes>
608+ <include syntax="self" collection="comments" />
587 <include syntax="self" collection="type" />
609 <include syntax="self" collection="type" />
588 </subscopes>
610 </subscopes>
@@ -600,6 +622,7 @@
600 <capture number="1" name="haskell.keyword.construct.lambda" />
622 <capture number="1" name="haskell.keyword.construct.lambda" />
601 </ends-with>
623 </ends-with>
602 <subscopes>
624 <subscopes>
625+ <include syntax="self" collection="comments" />
603 <include syntax="self" collection="pattern-match" />
626 <include syntax="self" collection="pattern-match" />
604 </subscopes>
627 </subscopes>
@@ -613,7 +636,6 @@
614 <collection name="where-clause">
637 <collection name="where-clause">
615 <scope name="haskell.construct.where">
638 <scope name="haskell.construct.where">
616− <local scope="within-parent" />
617 <starts-with>
639 <starts-with>
618 <expression>^(\h*)(where)</expression>
640 <expression>^(\h*)(where)</expression>
619 <capture number="2" name="haskell.construct.keyword.where" />
641 <capture number="2" name="haskell.construct.keyword.where" />
@@ -622,6 +644,7 @@
622 <template>^(?!\1\s*\S)(?!s*$)</template>
644 <template>^(?!\1\s*\S)(?!s*$)</template>
623 </ends-with>
645 </ends-with>
624 <subscopes>
646 <subscopes>
647+ <include syntax="self" collection="comments" />
625 <include syntax="self" collection="definition" />
648 <include syntax="self" collection="definition" />
626 </subscopes>
649 </subscopes>
@@ -630,7 +653,9 @@
631 <collection name="qvarid">
654 <collection name="qvarid">
632 <scope name="haskell.identifier.function">
655 <scope name="haskell.identifier.function">
633− <expression>([A-Z](\w|')*\.)*\w(\w|')*</expression>
656+ <expression>(([A-Z](\w|')*\.)*)(\w(\w|')*)</expression>
657+ <capture number="1" name="haskell.identifier.package.module" />
658+ <capture number="4" name="haskell.identifier.type" />
635 </collection>
660 </collection>
@@ -659,12 +684,12 @@
661 <collection name="strings">
686 <collection name="strings">
662− <scope name="haskell.string.double-quoted">
687+ <scope name="haskell.string.double-quoted" spell-check="true">
663 <starts-with>
688 <starts-with>
664− <expression>"</expression>
689+ <expression>"</expression>
665 </starts-with>
690 </starts-with>
666 <ends-with>
691 <ends-with>
667− <expression>"</expression>
692+ <expression>"</expression>
668 </ends-with>
693 </ends-with>
669 <subscopes>
694 <subscopes>
670 <scope name="haskell.string.escape-sequences">
695 <scope name="haskell.string.escape-sequences">
@@ -687,8 +712,11 @@
688 <collection name="module">
713 <collection name="module">
689 <scope name="haskell.definition.module.package">
714 <scope name="haskell.definition.module.package">
715+ <symbol type="package">
716+ <context behavior="subtree" foldable="true" export-local="true" />
690 <starts-with>
718 <starts-with>
691− <expression>^(module)\s+(\w|\.)+</expression>
719+ <expression>^(module)\s+((\w|\.)+)</expression>
692 <capture number="1" name="haskell.construct.keyword.module" />
720 <capture number="1" name="haskell.construct.keyword.module" />
693 <capture number="2" name="haskell.definition.module.package" />
721 <capture number="2" name="haskell.definition.module.package" />
694 </starts-with>
722 </starts-with>
@@ -696,32 +724,75 @@
696 <expression>(where)</expression>
724 <expression>(where)</expression>
697 <capture number="1" name="haskell.construct.keyword.module" />
725 <capture number="1" name="haskell.construct.keyword.module" />
698 </ends-with>
726 </ends-with>
699− <subscopes export-symbols="true">
727+ <subscopes>
728+ <scope name="identifier.haskell.type">
729+ <symbol type="expression" />
730+ <symbol type="expression" />
731+ <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
732+ <capture number="1" name="identifier.type" />
700− <scope name="identifier.constant">
734+ <scope name="identifier.variable">
735+ <symbol type="expression" />
701 <expression>(\w|')+</expression>
736 <expression>(\w|')+</expression>
737+ <capture number="0" name="identifier.haskell.function" />
703 </subscopes>
739 </subscopes>
705 </collection>
741 </collection>
707 <collection name="import">
743 <collection name="import">
708− <scope name="haskell.construct.keyword.import">
744+ <scope name="haskell.construct.import">
709− <expression>^import\s</expression>
746+ <expression>^(import)\s</expression>
710− </scope>
747+ <capture number="1" name="haskell.construct.keyword.import" />
750+ <expression>(?=^\S)</expression>
753+ <scope name="haskell.construct.qualified">
754+ <symbol type="expression" />
755+ <expression>qualified</expression>
711− <scope name="haskell.construct.keyword.qualified">
756+ <capture number="0" name="haskell.construct.keyword.qualified" />
759+ <scope name="haskell.construct.hiding">
760+ <symbol type="keyword">
761+ <context behavior="subtree" />
712− <expression>qualified</expression>
764+ <expression>(hiding)\h*(?=\()</expression>
765+ <capture number="1" name="haskell.construct.keyword.hiding" />
768+ <expression>(?=\))</expression>
770+ <subscopes anchored="true">
771+ <include syntax="self" collection="import-list" />
772+ <symbol type="expression" />
713− </scope>
774+ </scope>
714− <scope name="haskell.construct.keyword.as">
776+ <scope name="haskell.construct.keyword.as">
777+ <symbol type="package" />
715− <expression>as</expression>
778+ <expression>as(\h+([A-Z]\w*))?</expression>
779+ <capture number="2" name="haskell.package.qualified.name" />
716− </scope>
780+ </scope>
717− <scope name="haskell.identifier.module.package">
781+ <scope name="haskell.identifier.module.package">
782+ <symbol type="package" />
718− <expression>([A-Z](\w|')*\.)*[A-Z](\w|')*</expression>
783+ <expression>([A-Z](\w|')*\.)*[A-Z](\w|')*</expression>
784+ <capture number="0" name="haskell.package.name" />
786+ <include syntax="self" collection="import-list" />
720− <include syntax="self" collection="import-list" />
721 </collection>
789 </collection>
723 <collection name="import-list">
791 <collection name="import-list">
724 <scope name="import-list">
792 <scope name="import-list">
794+ <context behavior="subtree" export-local="true" />
725 <starts-with>
796 <starts-with>
726 <expression>(\()</expression>
797 <expression>(\()</expression>
727 <capture number="1" name="haskell.import-list.bracket" />
798 <capture number="1" name="haskell.import-list.bracket" />
@@ -731,20 +802,21 @@
731 <capture number="1" name="haskell.import-list.bracket" />
802 <capture number="1" name="haskell.import-list.bracket" />
732 </ends-with>
803 </ends-with>
733 <subscopes>
804 <subscopes>
734− <scope name="identifier.decorator">
805+ <scope name="haskell.identifier.struct">
806+ <symbol type="expression" />
807+ <symbol type="reference" scope="local" />
735− <expression>([A-Z](\w|')*\.)*\w(\w|')*</expression>
808+ <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
809+ <capture number="1" name="haskell.import-list.identifier.type.name" />
811+ <scope name="haskell.identifier.function">
812+ <symbol type="reference" scope="local" />
813+ <expression>(\w|')+</expression>
814+ <capture number="0" name="haskell.import-list.function.name" />
737 </subscopes>
816 </subscopes>
739 </collection>
818 </collection>
741− <!-- <collection name="special">
743− <expression>(;|,)</expression>
748 <collection name="reservedop">
820 <collection name="reservedop">
749 <scope name="keyword.operator">
821 <scope name="keyword.operator">
750 <expression>(\.\.|:|::|=|\\|\||<-|->|@|~|=>)</expression>
822 <expression>(\.\.|:|::|=|\\|\||<-|->|@|~|=>)</expression>
@@ -752,10 +824,11 @@
752 </collection>
824 </collection>
754 <collection name="keywords">
826 <collection name="keywords">
755− <scope name="haskell.keyword.modifier">
827+ <scope name="haskell.keyword.self">
756 <symbol type="keyword" />
828 <symbol type="keyword" />
757 <strings>
829 <strings>
758 <string>do</string>
830 <string>do</string>
831+ <string>mdo</string>
759 <string>in</string>
832 <string>in</string>
760 <string>infix</string>
833 <string>infix</string>
761 <string>infixl</string>
834 <string>infixl</string>
@@ -793,20 +866,18 @@
793 <strings>
866 <strings>
794 <string>undefined</string>
867 <string>undefined</string>
795 <string>_</string>
868 <string>_</string>
796 </strings>
870 </strings>
798 </collection>
872 </collection>
800 <collection name="comments">
874 <collection name="comments">
801 <scope name="haskell.comment.single" spell-check="true">
875 <scope name="haskell.comment.single" spell-check="true">
802− <starts-with>
876+ <symbol type="comment" />
803− <expression>--</expression>
806− <expression>$</expression>
877+ <expression> --.*$</expression>
809 <scope name="haskell.comment.block" spell-check="true">
879 <scope name="haskell.comment.block" spell-check="true">
880+ <symbol type="comment" />
810 <starts-with>
881 <starts-with>
811 <expression>{-</expression>
882 <expression>{-</expression>
812 </starts-with>
883 </starts-with>