@@ -1,9 +1,9 @@
11<?xml version="1.0" encoding="UTF-8"?>
22<syntax name="haskell">
33 <meta>
4− <name>Haskell</name>
5− <type>compiled</type>
6− <preferred-file-extension>hs</preferred-file-extension>
4+ <name>Haskell</name>
5+ <type>compiled</type>
6+ <preferred-file-extension>hs</preferred-file-extension>
77 </meta>
88
99 <detectors>
@@ -57,6 +57,8 @@
5757 <include syntax="self" collection="type-family-definition" />
5858 <include syntax="self" collection="pattern-definition" />
5959 <include syntax="self" collection="type-definition" />
60+ <!-- <include syntax="self" collection="type-annotation" /> -->
61+ <include syntax="self" collection="data-definition" />
6062 <include syntax="self" collection="GADT-definition" />
6163 <include syntax="self" collection="instance" />
6264 <include syntax="self" collection="typeclass" />
@@ -65,6 +67,7 @@
6567
6668 <template-scopes>
6769 <include syntax="self" collection="Quote" />
70+ <include syntax="self" collection="comments" />
6871 </template-scopes>
6972
7073 <collections>
@@ -77,27 +80,51 @@
7780 </collection>
7881
7982 <collection name="expressions">
80− <scope name="haskell.construct.keyword.at">
81− <expression>@</expression>
82− </scope>
83− <scope name="haskell.construct.keyword.case-arrow">
84− <expression>-></expression>
85− </scope>
86− <scope name="haskell.construct.keyword.bind-arrow">
87− <expression><-</expression>
88− </scope>
89− <include syntax="self" collection="keywords" />
83+ <include syntax="self" collection="do-bind" />
9084 <include syntax="self" collection="literal" />
9185 <include syntax="self" collection="operators" />
92− <include syntax="self" collection="record-match" />
9386 <include syntax="self" collection="list" />
94− <include syntax="self" collection="view-pattern" />
9587 <include syntax="self" collection="lambda-case" />
9688 <include syntax="self" collection="lambda-head" />
97− <include syntax="self" collection="case-expression" />
98− <include syntax="self" collection="qconid" />
89+ <include syntax="self" collection="type-applications" />
90+ <include syntax="self" collection="outer-case-expression" />
9991 <include syntax="self" collection="qvarid" />
10092 <include syntax="self" collection="tuple" />
93+
94+
95+ <!-- Needed for do binds -->
96+ <!-- <include syntax="self" collection="pattern-match" /> -->
97+ </collection>
98+
99+ <collection name="pattern-match">
100+ <include syntax="self" collection="literal" />
101+ <include syntax="self" collection="tuple-match" />
102+ <!-- <include syntax="self" collection="at-pattern" /> -->
103+ <include syntax="self" collection="varid" />
104+ <include syntax="self" collection="qconid" />
105+ <include syntax="self" collection="record-match" />
106+ <include syntax="self" collection="list-pattern" />
107+ <include syntax="self" collection="view-pattern" />
108+ </collection>
109+
110+ <collection name="type-applications">
111+ <scope name="type-applications">
112+ <starts-with>
113+ <expression>(\s@)\(</expression>
114+ <capture number="1" name="haskell.keyword.operator.typeapplication" />
115+ </starts-with>
116+ <ends-with>
117+ <expression>)</expression>
118+ </ends-with>
119+ <subscopes>
120+ <include syntax="self" collection="type" />
121+ </subscopes>
122+ </scope>
123+ <scope name="type-applications-single">
124+ <expression>(@)(\w+)</expression>
125+ <capture number="1" name="haskell.keyword.operator.typeapplication" />
126+ <capture number="2" name="haskell.identifier.type" />
127+ </scope>
101128 </collection>
102129
103130 <collection name="Quote">
@@ -136,8 +163,8 @@
136163 <capture number="1" name="haskell.pattern.record.bracket" />
137164 </ends-with>
138165 <subscopes>
139− <include syntax="self" collection="comments" />
140− <include syntax="self" collection="expressions" />
166+ <include syntax="self" collection="pattern-match" />
167+ <include syntax="self" collection="varid" />
141168 <scope name="record-sep">
142169 <expression>=</expression>
143170 </scope>
@@ -159,7 +186,6 @@
159186 <capture number="1" name="haskell.pattern.record.bracket" />
160187 </ends-with>
161188 <subscopes>
162− <include syntax="self" collection="comments" />
163189 <scope name="haskell.pattern.record.wildcard">
164190 <expression>\.\.</expression>
165191 </scope>
@@ -186,12 +212,29 @@
186212 <capture number="1" name="haskell.list.bracket" />
187213 </ends-with>
188214 <subscopes>
189− <include syntax="self" collection="comments" />
190215 <include syntax="self" collection="expressions" />
191216 </subscopes>
192217 </scope>
193218 </collection>
194219
220+ <collection name="list-pattern">
221+ <symbol type="expression" />
222+ <scope name="haskell.pattern.list">
223+ <starts-with>
224+ <expression>(\[)</expression>
225+ <capture number="1" name="haskell.pattern.list.bracket" />
226+ </starts-with>
227+ <ends-with>
228+ <expression>(\])</expression>
229+ <capture number="1" name="haskell.pattern.list.bracket" />
230+ </ends-with>
231+ <subscopes>
232+ <include syntax="self" collection="pattern-match" />
233+ </subscopes>
234+ </scope>
235+ </collection>
236+
237+
195238 <collection name="view-pattern">
196239 <scope name="haskell.pattern.view">
197240 <symbol type="expression" />
@@ -208,7 +251,24 @@
208251 <scope name="haskell.pattern.view.operator.arrow">
209252 <expression>-></expression>
210253 </scope>
211− <include syntax="self" collection="expressions" />
254+ <include syntax="self" collection="pattern-match" />
255+ </subscopes>
256+ </scope>
257+ </collection>
258+
259+ <collection name="tuple-match">
260+ <symbol type="expression" />
261+ <scope name="haskell.pattern.tuple">
262+ <starts-with>
263+ <expression>(\()</expression>
264+ <capture number="1" name="haskell.pattern.tuple.bracket" />
265+ </starts-with>
266+ <ends-with>
267+ <expression>(\))</expression>
268+ <capture number="1" name="haskell.pattern.tuple.bracket" />
269+ </ends-with>
270+ <subscopes>
271+ <include syntax="self" collection="pattern-match" />
212272 </subscopes>
213273 </scope>
214274 </collection>
@@ -224,11 +284,53 @@
224284 <capture number="1" name="haskell.case.keyword.condition" />
225285 </ends-with>
226286 <subscopes anchored="true">
287+ <include syntax="self" collection="pattern-match" />
288+ </subscopes>
289+ </scope>
290+ </collection>
291+
292+ <collection name="case-match">
293+ <scope name="case-match">
294+ <starts-with>
295+ <expression>(?=((\h*)\S.*->($|\h)))</expression>
296+ </starts-with>
297+ <ends-with>
298+ <expression>-></expression>
299+ </ends-with>
300+ <subscopes anchored="true">
301+ <include syntax="self" collection="pattern-match" />
302+ </subscopes>
303+ </scope>
304+ </collection>
305+
306+ <collection name="inner-case-expressions">
307+ <scope name="inner-case-expressions">
308+ <starts-with>
309+ <expression>(?=((\h*)\S.*->($|\h)))</expression>
310+ </starts-with>
311+ <ends-with>
312+ <template>^(?!\1)(?!\2\h)(?!\s*$)</template>
313+ </ends-with>
314+ <subscopes>
315+ <include syntax="self" collection="case-match" />
227316 <include syntax="self" collection="expressions" />
228317 </subscopes>
229318 </scope>
230319 </collection>
231320
321+ <collection name="outer-case-expression">
322+ <scope name="outer-case-expression">
323+ <starts-with>
324+ <expression>(?=case)</expression>
325+ </starts-with>
326+ <ends-with />
327+ <subscopes anchored="true" skip-whitespace="false">
328+ <include syntax="self" collection="case-expression" />
329+ <include syntax="self" collection="inner-case-expressions" repeat="true" />
330+ </subscopes>
331+ </scope>
332+ </collection>
333+
232334 <collection name="tuple">
233335 <symbol type="expression" />
234336 <scope name="haskell.tuple">
@@ -241,73 +343,60 @@
241343 <capture number="1" name="haskell.tuple.bracket" />
242344 </ends-with>
243345 <subscopes>
244− <include syntax="self" collection="comments" />
245346 <include syntax="self" collection="expressions" />
246347 </subscopes>
247348 </scope>
248349 </collection>
249350
250351 <collection name="typeclass">
251− <scope name="haskell.definition.class.head">
252− <symbol type="class" scope="global" name-selector="haskell.keyword.construct.class.name">
253− <context behavior="whitespace" foldable="true" />
254− </symbol>
352+ <symbol type="interface" />
353+ <scope name="haskell.definition.class">
255354 <starts-with>
256355 <expression>^(\h*)(class)($|\h)</expression>
257356 <capture number="2" name="haskell.keyword.construct.class" />
258357 </starts-with>
259− <ends-with />
260− <subscopes anchored="true">
261− <scope name="haskell.keyword.construct.class.name">
262− <starts-with>
263− <expression></expression>
264− </starts-with>
265− <ends-with>
266− <expression>(?=(where|^\s*$))</expression>
267− </ends-with>
268− <subscopes>
269− <include syntax="self" collection="comments" />
270− <include syntax="self" collection="type" />
271− </subscopes>
272− </scope>
273− <scope name="haskell.keyword.construct.where" optional="true">
358+ <ends-with>
359+ <template>^(?!\s+\1\S)(?!\s*$)</template>
360+ </ends-with>
361+ <subscopes>
362+ <scope name="haskell.keyword.construct.where">
274363 <expression>where</expression>
275364 </scope>
365+ <include syntax="self" collection="type" />
366+ <include syntax="self" collection="type-definition" />
367+ <!-- <include syntax="self" collection="type-annotation" /> -->
368+ <include syntax="self" collection="definition" />
276369 </subscopes>
277370 </scope>
278371 </collection>
279372
280373 <collection name="instance">
281374 <scope name="haskell.instance">
282− <symbol type="category" name-selector="haskell.keyword.construct.instance.name">
283− <context behavior="whitespace" foldable="true" />
284− </symbol>
375+ <symbol type="category" />
285376 <starts-with>
286377 <expression>^(\h*)(instance)($|\h)</expression>
287378 <capture number="2" name="haskell.keyword.construct.instance" />
288379 </starts-with>
289− <ends-with />
290− <subscopes anchored="true">
291− <scope name="haskell.keyword.construct.instance.name">
292− <starts-with>
293− <expression></expression>
294− </starts-with>
295− <ends-with>
296− <expression>(?=(where|^\s*$))</expression>
297− </ends-with>
298− <subscopes>
299− <include syntax="self" collection="type" />
300− </subscopes>
301− </scope>
302− <scope name="haskell.keyword.construct.where" optional="true">
380+ <ends-with>
381+ <template>^(?!\s+\1\S)(?!\s*$)</template>
382+ </ends-with>
383+ <subscopes>
384+ <scope name="haskell.keyword.construct.where">
303385 <expression>where</expression>
304386 </scope>
387+ <include syntax="self" collection="type" />
388+ <include syntax="self" collection="type-definition" />
389+ <include syntax="self" collection="type-annotation" />
390+ <include syntax="self" collection="definition" />
305391 </subscopes>
306392 </scope>
307393 </collection>
308394
309395 <collection name="type-family-definition">
310396 <scope name="haskell.definition.type-family.type">
397+ <symbol type="type">
398+ <context behavior="subtree" foldable="false" />
399+ </symbol>
311400 <starts-with>
312401 <expression>^(\h*)(type\h+family)</expression>
313402 <capture number="2" name="haskell.keyword.construct.type-family" />
@@ -345,8 +434,10 @@
345434 <ends-with>
346435 <template>^(?!\s+\1\S)(?!\s*$)</template>
347436 </ends-with>
348− <subscopes>
349− <include syntax="self" collection="comments" />
437+ <subscopes anchored="true">
438+ <scope name="haskell.identifier.type-family.type.name">
439+ <expression>\S+</expression>
440+ </scope>
350441 <include syntax="self" collection="type" optional="true" repeat="true" />
351442 <scope>
352443 <expression>=</expression>
@@ -359,26 +450,65 @@
359450 <collection name="definition">
360451 <scope name="haskell.definition.type.function">
361452 <symbol type="function">
362− <context behavior="whitespace" foldable="true" />
453+ <display-name>
454+ <component selector="haskell.definition.type.function" />
455+ </display-name>
456+
363457 </symbol>
364458 <starts-with>
365459 <expression>^(?=(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h))</expression>
366460 <capture number="2" name="haskell.keyword.construct.default" />
367− <capture number="3" name="haskell.identifier.function.name" />
461+ <capture number="3" name="haskell.identifier.function" />
368462 </starts-with>
369463 <ends-with>
370464 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
371465 </ends-with>
372466 <subscopes>
373− <include syntax="self" collection="comments" />
374467 <include syntax="self" collection="type-annotation" />
375468 <include syntax="self" collection="implementation" />
376469 </subscopes>
377470 </scope>
378471 </collection>
379472
473+ <collection name="do-bind">
474+ <scope name="do-bind">
475+ <starts-with>
476+ <expression>^(?=((\h*)\S.+<-($|\h)))</expression>
477+ </starts-with>
478+ <ends-with>
479+ <template>^(?!\1)(?!\2\h)(?!\s*$)</template>
480+ </ends-with>
481+ <subscopes>
482+ <include syntax="self" collection="do-pattern" />
483+ <include syntax="self" collection="expressions" />
484+ <!-- <scope name="bind-arrow">
485+ <expression><-</expression>
486+ </scope> -->
487+ </subscopes>
488+ </scope>
489+ </collection>
490+
491+ <collection name="do-pattern">
492+ <scope name="do-pattern">
493+ <starts-with>
494+ <expression>^(?=((\h*)\S.+<-($|\h)))</expression>
495+ </starts-with>
496+ <ends-with>
497+ <expression><-</expression>
498+ </ends-with>
499+ <subscopes>
500+ <include syntax="self" collection="pattern-match" />
501+ <!-- <scope name="bind-arrow">
502+ <expression><-</expression>
503+ </scope>
504+ <include syntax="self" collection="expressions" repeat="true" /> -->
505+ </subscopes>
506+ </scope>
507+ </collection>
508+
380509 <collection name="implementation">
381− <scope name="haskell.definition.type.function.implementation">
510+ <scope name="haskell.definition.type.function">
511+ <local scope="within-construct" />
382512 <starts-with>
383513 <expression>^(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h)</expression>
384514 <capture number="2" name="haskell.keyword.construct.default" />
@@ -388,20 +518,14 @@
388518 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
389519 </ends-with>
390520 <subscopes>
391− <include syntax="self" collection="comments" />
392− <include syntax="self" collection="pattern-match" optional="true" repeat="true" />
393− <scope>
394− <expression>=</expression>
395− <capture number="0" name="haskell.construct.function.keyword.eq" />
396− </scope>
397− <include syntax="self" collection="expressions" optional="true" repeat="true" />
398− <include syntax="self" collection="where-clause" optional="true" />
521+ <include syntax="self" collection="where-clause" />
522+ <include syntax="self" collection="expressions" />
399523 </subscopes>
400524 </scope>
401525 </collection>
402526
403527 <collection name="type-annotation">
404− <scope name="haskell.definition.type.function.type-signature">
528+ <scope name="haskell.definition.type.function">
405529 <starts-with>
406530 <expression>^(\h*)`?(\w(\w|')*)`?\h*::($|\h)</expression>
407531 <capture number="2" name="haskell.identifier.function" />
@@ -410,7 +534,6 @@
410534 <template>^(?!\s+\1\S)(?!\s*$)</template>
411535 </ends-with>
412536 <subscopes>
413− <include syntax="self" collection="comments" />
414537 <include syntax="self" collection="type" />
415538 </subscopes>
416539 </scope>
@@ -418,19 +541,15 @@
418541
419542 <collection name="type-definition">
420543 <scope name="haskell.definition.type">
421− <symbol type="type" scope="global">
422− <context behavior="whitespace" foldable="true" />
423− </symbol>
424544 <starts-with>
425545 <expression>^(\h*)(type)\h+(\w(\w|')*)</expression>
426546 <capture number="2" name="haskell.keyword.construct.type" />
427− <capture number="3" name="haskell.identifier.type.name" />
547+ <capture number="3" name="haskell.identifier.type" />
428548 </starts-with>
429549 <ends-with>
430550 <template>^(?!\s+\1\S)(?!\s*$)</template>
431551 </ends-with>
432552 <subscopes>
433− <include syntax="self" collection="comments" />
434553 <include syntax="self" collection="type" />
435554 </subscopes>
436555 </scope>
@@ -438,72 +557,66 @@
438557
439558 <collection name="GADT-definition">
440559 <scope name="haskell.definition.struct.GADT">
441− <symbol type="struct" scope="global">
442− <context behavior="subtree" foldable="false" />
443− </symbol>
444560 <starts-with>
445− <expression>^(\h*)(data|newtype)\h+(\w(\w|')*)</expression>
561+ <expression>^(\h*)(data)\h+(\w(\w|')*)</expression>
446562 <capture number="2" name="haskell.keyword.construct.data.GADT" />
447− <capture number="3" name="haskell.identifier.data.type.name" />
448563 </starts-with>
449564 <ends-with>
450565 <template>^(?!\s+\1\S)(?!\s*$)</template>
451566 </ends-with>
452567 <subscopes>
453− <include syntax="self" collection="comments" />
454− <scope name="haskell.keyword.construct.where">
455− <expression>where</expression>
456− </scope>
457−
458− <include syntax="self" collection="deriving-clause" />
459− <include syntax="self" collection="record-definition" />
460568 <include syntax="self" collection="gadt-constructor" />
461569 <include syntax="self" collection="type" />
570+ <include syntax="self" collection="record-definition" />
571+ <include syntax="self" collection="record-definition-field-name" />
462572 </subscopes>
463573 </scope>
464574 </collection>
465575
466576 <collection name="gadt-constructor">
467− <scope name="haskell.identifier.type.struct.data.constructor">
468− <symbol type="constructor">
469− <context behavior="subtree" foldable="true" />
470− </symbol>
577+ <scope name="identifier.type.struct.GADT.constructor">
578+ <expression>^\h+[A-Z](\w|')*</expression>
579+ </scope>
580+ </collection>
581+
582+ <collection name="data-definition">
583+ <scope name="haskell.definition.struct.data">
471584 <starts-with>
472− <expression>(^|=|\||^)\h+([A-Z](\w|')*)</expression>
473− <capture number="2" name="haskell.identifier.data.name" />
585+ <expression>^(\h*)(data|newtype)\h+(\w(\w|')*)</expression>
586+ <capture number="2" name="haskell.keyword.construct.data.newtype" />
587+ <capture number="3" name="haskell.identifier.type" />
474588 </starts-with>
475− <ends-with />
476− <subscopes anchored="true">
589+ <ends-with>
590+ <template>^(?!\s+\1\S)(?!\s*$)</template>
591+ </ends-with>
592+ <subscopes>
477593 <include syntax="self" collection="record-definition" />
594+ <include syntax="self" collection="data-constructor" />
595+ <include syntax="self" collection="type" />
478596 </subscopes>
479597 </scope>
480598 </collection>
481599
482− <collection name="deriving-clause">
483− <scope name="haskell.record.construct.deriving.keyword">
484− <expression>deriving(\h+(newtype|stock|anyclass))?</expression>
600+ <collection name="data-constructor">
601+ <scope name="haskell.identifier.type.struct.data.constructor">
602+ <expression>=\h+[A-Z](\w|')*</expression>
485603 </scope>
486− <scope name="haskell.record.construct.deriving.keyword">
487− <include syntax="self" collection="comments" />
488− <expression>via</expression>
604+ <scope name="haskell.identifier.type.struct.data.constructor">
605+ <expression>\|\h+[A-Z](\w|')*</expression>
489606 </scope>
490607 </collection>
491608
492609 <collection name="record-definition">
493610 <scope name="haskell.record">
494− <symbol>
495− <context behavior="subtree" foldable="true" />
496− </symbol>
497611 <starts-with>
498− <expression>(?=\{)</expression>
499− <capture number="0" name="haskell.record.bracket" />
612+ <expression>(\{)</expression>
613+ <capture number="1" name="haskell.record.bracket" />
500614 </starts-with>
501615 <ends-with>
502616 <expression>(\})</expression>
503617 <capture number="1" name="haskell.record.bracket" />
504618 </ends-with>
505619 <subscopes>
506− <include syntax="self" collection="comments" />
507620 <include syntax="self" collection="record-definition-field-name" />
508621 <include syntax="self" collection="type" />
509622 </subscopes>
@@ -512,21 +625,11 @@
512625
513626 <collection name="record-definition-field-name">
514627 <scope name="haskell.record.definition.property">
515− <symbol type="property" />
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" />
628+ <expression>\w(\w|')*\h*::</expression>
519629 </scope>
520630 </collection>
521631
522632 <collection name="type">
523− <scope name="haskell.keyword.construct.function-arrow">
524− <expression>-></expression>
525− </scope>
526− <scope name="haskell.keyword.construct.fat-arrow">
527− <expression>=></expression>
528− </scope>
529− <include syntax="self" collection="strings" />
530633 <scope name="haskell.type.construct.tuple">
531634 <starts-with>
532635 <expression>\(</expression>
@@ -535,7 +638,6 @@
535638 <expression>\)</expression>
536639 </ends-with>
537640 <subscopes>
538− <include syntax="self" collection="comments" />
539641 <scope name="haskell.construct.type.typle.comma">
540642 <expression>\,</expression>
541643 </scope>
@@ -550,7 +652,6 @@
550652 <expression>\]</expression>
551653 </ends-with>
552654 <subscopes>
553− <include syntax="self" collection="comments" />
554655 <include syntax="self" collection="type" />
555656 </subscopes>
556657 </scope>
@@ -562,7 +663,7 @@
562663 </scope>
563664 <include syntax="self" collection="type-list" />
564665 <scope>
565− <expression>(([A-Z](\w|')*\.)*)'*\!?([A-Z](\w|')*)</expression>
666+ <expression>(([A-Z](\w|')*\.)*)'*([A-Z](\w|')*)</expression>
566667 <capture number="1" name="haskell.identifier.package.module" />
567668 <capture number="4" name="haskell.identifier.type" />
568669 </scope>
@@ -570,7 +671,13 @@
570671 <expression>forall</expression>
571672 </scope>
572673 <scope name="haskell.identifier.type.variable">
573− <expression>(?!where)(?!=)((?!(\(|\)|\,|\!))\S)((?!(\(|\)|\,))\w)*</expression>
674+ <expression>(?!=)((?!(\(|\)|\,))\S)((?!(\(|\)|\,))\S)*</expression>
675+ </scope>
676+ <scope name="haskell.keyword.construct.function-arrow">
677+ <expression>-></expression>
678+ </scope>
679+ <scope name="haskell.keyword.construct.fat-arrow">
680+ <expression>=></expression>
574681 </scope>
575682 </collection>
576683
@@ -585,7 +692,6 @@
585692 <template>^(?!\s+\1\S)(?!\s*$)</template>
586693 </ends-with>
587694 <subscopes>
588− <include syntax="self" collection="comments" />
589695 <scope name="haskell.keyword.construct.where">
590696 <expression>where</expression>
591697 </scope>
@@ -605,7 +711,6 @@
605711 <capture number="1" name="haskell.type-list.bracket" />
606712 </ends-with>
607713 <subscopes>
608− <include syntax="self" collection="comments" />
609714 <include syntax="self" collection="type" />
610715 </subscopes>
611716 </scope>
@@ -622,7 +727,6 @@
622727 <capture number="1" name="haskell.keyword.construct.lambda" />
623728 </ends-with>
624729 <subscopes>
625− <include syntax="self" collection="comments" />
626730 <include syntax="self" collection="pattern-match" />
627731 </subscopes>
628732 </scope>
@@ -636,6 +740,7 @@
636740
637741 <collection name="where-clause">
638742 <scope name="haskell.construct.where">
743+ <local scope="within-parent" />
639744 <starts-with>
640745 <expression>^(\h*)(where)</expression>
641746 <capture number="2" name="haskell.construct.keyword.where" />
@@ -644,7 +749,6 @@
644749 <template>^(?!\1\s*\S)(?!s*$)</template>
645750 </ends-with>
646751 <subscopes>
647− <include syntax="self" collection="comments" />
648752 <include syntax="self" collection="definition" />
649753 </subscopes>
650754 </scope>
@@ -684,12 +788,12 @@
684788
685789
686790 <collection name="strings">
687− <scope name="haskell.string.double-quoted" spell-check="true">
791+ <scope name="haskell.string.double-quoted">
688792 <starts-with>
689− <expression>"</expression>
793+ <expression>"</expression>
690794 </starts-with>
691795 <ends-with>
692− <expression>"</expression>
796+ <expression>"</expression>
693797 </ends-with>
694798 <subscopes>
695799 <scope name="haskell.string.escape-sequences">
@@ -726,7 +830,6 @@
726830 </ends-with>
727831 <subscopes>
728832 <scope name="identifier.haskell.type">
729− <symbol type="expression" />
730833 <symbol type="expression" />
731834 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
732835 <capture number="1" name="identifier.type" />
@@ -751,7 +854,6 @@
751854 </ends-with>
752855 <subscopes>
753856 <scope name="haskell.construct.qualified">
754− <symbol type="expression" />
755857 <expression>qualified</expression>
756858 <capture number="0" name="haskell.construct.keyword.qualified" />
757859 </scope>
@@ -769,7 +871,6 @@
769871 </ends-with>
770872 <subscopes anchored="true">
771873 <include syntax="self" collection="import-list" />
772− <symbol type="expression" />
773874 </subscopes>
774875 </scope>
775876
@@ -803,7 +904,6 @@
803904 </ends-with>
804905 <subscopes>
805906 <scope name="haskell.identifier.struct">
806− <symbol type="expression" />
807907 <symbol type="reference" scope="local" />
808908 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
809909 <capture number="1" name="haskell.import-list.identifier.type.name" />
@@ -817,6 +917,13 @@
817917 </scope>
818918 </collection>
819919
920+ <!-- <collection name="special">
921+ <scope>
922+ <expression>(;|,)</expression>
923+ </scope>
924+ </collection> -->
925+
926+
820927 <collection name="reservedop">
821928 <scope name="keyword.operator">
822929 <expression>(\.\.|:|::|=|\\|\||<-|->|@|~|=>)</expression>
@@ -824,11 +931,10 @@
824931 </collection>
825932
826933 <collection name="keywords">
827− <scope name="haskell.keyword.self">
934+ <scope name="haskell.keyword.modifier">
828935 <symbol type="keyword" />
829936 <strings>
830937 <string>do</string>
831− <string>mdo</string>
832938 <string>in</string>
833939 <string>infix</string>
834940 <string>infixl</string>
@@ -866,18 +972,20 @@
866972 <strings>
867973 <string>undefined</string>
868974 <string>_</string>
869− <string>@</string>
870975 </strings>
871976 </scope>
872977 </collection>
873978
874979 <collection name="comments">
875980 <scope name="haskell.comment.single" spell-check="true">
876− <symbol type="comment" />
877− <expression> --.*$</expression>
981+ <starts-with>
982+ <expression>--</expression>
983+ </starts-with>
984+ <ends-with>
985+ <expression>$</expression>
986+ </ends-with>
878987 </scope>
879988 <scope name="haskell.comment.block" spell-check="true">
880− <symbol type="comment" />
881989 <starts-with>
882990 <expression>{-</expression>
883991 </starts-with>
@@ -889,4 +997,4 @@
889997
890998
891999 </collections>
892−</syntax>
1000+</syntax>