@@ -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" />
@@ -346,7 +435,6 @@
346435 <template>^(?!\s+\1\S)(?!\s*$)</template>
347436 </ends-with>
348437 <subscopes>
349− <include syntax="self" collection="comments" />
350438 <include syntax="self" collection="type" optional="true" repeat="true" />
351439 <scope>
352440 <expression>=</expression>
@@ -359,26 +447,65 @@
359447 <collection name="definition">
360448 <scope name="haskell.definition.type.function">
361449 <symbol type="function">
362− <context behavior="whitespace" foldable="true" />
450+ <display-name>
451+ <component selector="haskell.definition.type.function" />
452+ </display-name>
453+
363454 </symbol>
364455 <starts-with>
365456 <expression>^(?=(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h))</expression>
366457 <capture number="2" name="haskell.keyword.construct.default" />
367− <capture number="3" name="haskell.identifier.function.name" />
458+ <capture number="3" name="haskell.identifier.function" />
368459 </starts-with>
369460 <ends-with>
370461 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
371462 </ends-with>
372463 <subscopes>
373− <include syntax="self" collection="comments" />
374464 <include syntax="self" collection="type-annotation" />
375465 <include syntax="self" collection="implementation" />
376466 </subscopes>
377467 </scope>
378468 </collection>
379469
470+ <collection name="do-bind">
471+ <scope name="do-bind">
472+ <starts-with>
473+ <expression>^(?=((\h*)\S.+<-($|\h)))</expression>
474+ </starts-with>
475+ <ends-with>
476+ <template>^(?!\1)(?!\2\h)(?!\s*$)</template>
477+ </ends-with>
478+ <subscopes>
479+ <include syntax="self" collection="do-pattern" />
480+ <include syntax="self" collection="expressions" />
481+ <!-- <scope name="bind-arrow">
482+ <expression><-</expression>
483+ </scope> -->
484+ </subscopes>
485+ </scope>
486+ </collection>
487+
488+ <collection name="do-pattern">
489+ <scope name="do-pattern">
490+ <starts-with>
491+ <expression>^(?=((\h*)\S.+<-($|\h)))</expression>
492+ </starts-with>
493+ <ends-with>
494+ <expression><-</expression>
495+ </ends-with>
496+ <subscopes>
497+ <include syntax="self" collection="pattern-match" />
498+ <!-- <scope name="bind-arrow">
499+ <expression><-</expression>
500+ </scope>
501+ <include syntax="self" collection="expressions" repeat="true" /> -->
502+ </subscopes>
503+ </scope>
504+ </collection>
505+
380506 <collection name="implementation">
381− <scope name="haskell.definition.type.function.implementation">
507+ <scope name="haskell.definition.type.function">
508+ <local scope="within-construct" />
382509 <starts-with>
383510 <expression>^(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h)</expression>
384511 <capture number="2" name="haskell.keyword.construct.default" />
@@ -388,20 +515,14 @@
388515 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
389516 </ends-with>
390517 <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" />
518+ <include syntax="self" collection="where-clause" />
519+ <include syntax="self" collection="expressions" />
399520 </subscopes>
400521 </scope>
401522 </collection>
402523
403524 <collection name="type-annotation">
404− <scope name="haskell.definition.type.function.type-signature">
525+ <scope name="haskell.definition.type.function">
405526 <starts-with>
406527 <expression>^(\h*)`?(\w(\w|')*)`?\h*::($|\h)</expression>
407528 <capture number="2" name="haskell.identifier.function" />
@@ -410,7 +531,6 @@
410531 <template>^(?!\s+\1\S)(?!\s*$)</template>
411532 </ends-with>
412533 <subscopes>
413− <include syntax="self" collection="comments" />
414534 <include syntax="self" collection="type" />
415535 </subscopes>
416536 </scope>
@@ -418,19 +538,15 @@
418538
419539 <collection name="type-definition">
420540 <scope name="haskell.definition.type">
421− <symbol type="type" scope="global">
422− <context behavior="whitespace" foldable="true" />
423− </symbol>
424541 <starts-with>
425542 <expression>^(\h*)(type)\h+(\w(\w|')*)</expression>
426543 <capture number="2" name="haskell.keyword.construct.type" />
427− <capture number="3" name="haskell.identifier.type.name" />
544+ <capture number="3" name="haskell.identifier.type" />
428545 </starts-with>
429546 <ends-with>
430547 <template>^(?!\s+\1\S)(?!\s*$)</template>
431548 </ends-with>
432549 <subscopes>
433− <include syntax="self" collection="comments" />
434550 <include syntax="self" collection="type" />
435551 </subscopes>
436552 </scope>
@@ -438,72 +554,66 @@
438554
439555 <collection name="GADT-definition">
440556 <scope name="haskell.definition.struct.GADT">
441− <symbol type="struct" scope="global">
442− <context behavior="subtree" foldable="false" />
443− </symbol>
444557 <starts-with>
445− <expression>^(\h*)(data|newtype)\h+(\w(\w|')*)</expression>
558+ <expression>^(\h*)(data)\h+(\w(\w|')*)</expression>
446559 <capture number="2" name="haskell.keyword.construct.data.GADT" />
447− <capture number="3" name="haskell.identifier.data.type.name" />
448560 </starts-with>
449561 <ends-with>
450562 <template>^(?!\s+\1\S)(?!\s*$)</template>
451563 </ends-with>
452564 <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" />
460565 <include syntax="self" collection="gadt-constructor" />
461566 <include syntax="self" collection="type" />
567+ <include syntax="self" collection="record-definition" />
568+ <include syntax="self" collection="record-definition-field-name" />
462569 </subscopes>
463570 </scope>
464571 </collection>
465572
466573 <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>
574+ <scope name="identifier.type.struct.GADT.constructor">
575+ <expression>^\h+[A-Z](\w|')*</expression>
576+ </scope>
577+ </collection>
578+
579+ <collection name="data-definition">
580+ <scope name="haskell.definition.struct.data">
471581 <starts-with>
472− <expression>(^|=|\||^)\h+([A-Z](\w|')*)</expression>
473− <capture number="2" name="haskell.identifier.data.name" />
582+ <expression>^(\h*)(data|newtype)\h+(\w(\w|')*)</expression>
583+ <capture number="2" name="haskell.keyword.construct.data.newtype" />
584+ <capture number="3" name="haskell.identifier.type" />
474585 </starts-with>
475− <ends-with />
476− <subscopes anchored="true">
586+ <ends-with>
587+ <template>^(?!\s+\1\S)(?!\s*$)</template>
588+ </ends-with>
589+ <subscopes>
477590 <include syntax="self" collection="record-definition" />
591+ <include syntax="self" collection="data-constructor" />
592+ <include syntax="self" collection="type" />
478593 </subscopes>
479594 </scope>
480595 </collection>
481596
482− <collection name="deriving-clause">
483− <scope name="haskell.record.construct.deriving.keyword">
484− <expression>deriving(\h+(newtype|stock|anyclass))?</expression>
597+ <collection name="data-constructor">
598+ <scope name="haskell.identifier.type.struct.data.constructor">
599+ <expression>=\h+[A-Z](\w|')*</expression>
485600 </scope>
486− <scope name="haskell.record.construct.deriving.keyword">
487− <include syntax="self" collection="comments" />
488− <expression>via</expression>
601+ <scope name="haskell.identifier.type.struct.data.constructor">
602+ <expression>\|\h+[A-Z](\w|')*</expression>
489603 </scope>
490604 </collection>
491605
492606 <collection name="record-definition">
493607 <scope name="haskell.record">
494− <symbol>
495− <context behavior="subtree" foldable="true" />
496− </symbol>
497608 <starts-with>
498− <expression>(?=\{)</expression>
499− <capture number="0" name="haskell.record.bracket" />
609+ <expression>(\{)</expression>
610+ <capture number="1" name="haskell.record.bracket" />
500611 </starts-with>
501612 <ends-with>
502613 <expression>(\})</expression>
503614 <capture number="1" name="haskell.record.bracket" />
504615 </ends-with>
505616 <subscopes>
506− <include syntax="self" collection="comments" />
507617 <include syntax="self" collection="record-definition-field-name" />
508618 <include syntax="self" collection="type" />
509619 </subscopes>
@@ -512,21 +622,11 @@
512622
513623 <collection name="record-definition-field-name">
514624 <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" />
625+ <expression>\w(\w|')*\h*::</expression>
519626 </scope>
520627 </collection>
521628
522629 <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" />
530630 <scope name="haskell.type.construct.tuple">
531631 <starts-with>
532632 <expression>\(</expression>
@@ -535,7 +635,6 @@
535635 <expression>\)</expression>
536636 </ends-with>
537637 <subscopes>
538− <include syntax="self" collection="comments" />
539638 <scope name="haskell.construct.type.typle.comma">
540639 <expression>\,</expression>
541640 </scope>
@@ -550,7 +649,6 @@
550649 <expression>\]</expression>
551650 </ends-with>
552651 <subscopes>
553− <include syntax="self" collection="comments" />
554652 <include syntax="self" collection="type" />
555653 </subscopes>
556654 </scope>
@@ -562,7 +660,7 @@
562660 </scope>
563661 <include syntax="self" collection="type-list" />
564662 <scope>
565− <expression>(([A-Z](\w|')*\.)*)'*\!?([A-Z](\w|')*)</expression>
663+ <expression>(([A-Z](\w|')*\.)*)'*([A-Z](\w|')*)</expression>
566664 <capture number="1" name="haskell.identifier.package.module" />
567665 <capture number="4" name="haskell.identifier.type" />
568666 </scope>
@@ -570,7 +668,13 @@
570668 <expression>forall</expression>
571669 </scope>
572670 <scope name="haskell.identifier.type.variable">
573− <expression>(?!where)(?!=)((?!(\(|\)|\,|\!))\S)((?!(\(|\)|\,))\w)*</expression>
671+ <expression>(?!=)((?!(\(|\)|\,))\S)((?!(\(|\)|\,))\S)*</expression>
672+ </scope>
673+ <scope name="haskell.keyword.construct.function-arrow">
674+ <expression>-></expression>
675+ </scope>
676+ <scope name="haskell.keyword.construct.fat-arrow">
677+ <expression>=></expression>
574678 </scope>
575679 </collection>
576680
@@ -585,7 +689,6 @@
585689 <template>^(?!\s+\1\S)(?!\s*$)</template>
586690 </ends-with>
587691 <subscopes>
588− <include syntax="self" collection="comments" />
589692 <scope name="haskell.keyword.construct.where">
590693 <expression>where</expression>
591694 </scope>
@@ -605,7 +708,6 @@
605708 <capture number="1" name="haskell.type-list.bracket" />
606709 </ends-with>
607710 <subscopes>
608− <include syntax="self" collection="comments" />
609711 <include syntax="self" collection="type" />
610712 </subscopes>
611713 </scope>
@@ -622,7 +724,6 @@
622724 <capture number="1" name="haskell.keyword.construct.lambda" />
623725 </ends-with>
624726 <subscopes>
625− <include syntax="self" collection="comments" />
626727 <include syntax="self" collection="pattern-match" />
627728 </subscopes>
628729 </scope>
@@ -636,6 +737,7 @@
636737
637738 <collection name="where-clause">
638739 <scope name="haskell.construct.where">
740+ <local scope="within-parent" />
639741 <starts-with>
640742 <expression>^(\h*)(where)</expression>
641743 <capture number="2" name="haskell.construct.keyword.where" />
@@ -644,7 +746,6 @@
644746 <template>^(?!\1\s*\S)(?!s*$)</template>
645747 </ends-with>
646748 <subscopes>
647− <include syntax="self" collection="comments" />
648749 <include syntax="self" collection="definition" />
649750 </subscopes>
650751 </scope>
@@ -684,12 +785,12 @@
684785
685786
686787 <collection name="strings">
687− <scope name="haskell.string.double-quoted" spell-check="true">
788+ <scope name="haskell.string.double-quoted">
688789 <starts-with>
689− <expression>"</expression>
790+ <expression>"</expression>
690791 </starts-with>
691792 <ends-with>
692− <expression>"</expression>
793+ <expression>"</expression>
693794 </ends-with>
694795 <subscopes>
695796 <scope name="haskell.string.escape-sequences">
@@ -726,7 +827,6 @@
726827 </ends-with>
727828 <subscopes>
728829 <scope name="identifier.haskell.type">
729− <symbol type="expression" />
730830 <symbol type="expression" />
731831 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
732832 <capture number="1" name="identifier.type" />
@@ -751,7 +851,6 @@
751851 </ends-with>
752852 <subscopes>
753853 <scope name="haskell.construct.qualified">
754− <symbol type="expression" />
755854 <expression>qualified</expression>
756855 <capture number="0" name="haskell.construct.keyword.qualified" />
757856 </scope>
@@ -769,7 +868,6 @@
769868 </ends-with>
770869 <subscopes anchored="true">
771870 <include syntax="self" collection="import-list" />
772− <symbol type="expression" />
773871 </subscopes>
774872 </scope>
775873
@@ -803,7 +901,6 @@
803901 </ends-with>
804902 <subscopes>
805903 <scope name="haskell.identifier.struct">
806− <symbol type="expression" />
807904 <symbol type="reference" scope="local" />
808905 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
809906 <capture number="1" name="haskell.import-list.identifier.type.name" />
@@ -817,6 +914,13 @@
817914 </scope>
818915 </collection>
819916
917+ <!-- <collection name="special">
918+ <scope>
919+ <expression>(;|,)</expression>
920+ </scope>
921+ </collection> -->
922+
923+
820924 <collection name="reservedop">
821925 <scope name="keyword.operator">
822926 <expression>(\.\.|:|::|=|\\|\||<-|->|@|~|=>)</expression>
@@ -824,11 +928,10 @@
824928 </collection>
825929
826930 <collection name="keywords">
827− <scope name="haskell.keyword.self">
931+ <scope name="haskell.keyword.modifier">
828932 <symbol type="keyword" />
829933 <strings>
830934 <string>do</string>
831− <string>mdo</string>
832935 <string>in</string>
833936 <string>infix</string>
834937 <string>infixl</string>
@@ -866,18 +969,20 @@
866969 <strings>
867970 <string>undefined</string>
868971 <string>_</string>
869− <string>@</string>
870972 </strings>
871973 </scope>
872974 </collection>
873975
874976 <collection name="comments">
875977 <scope name="haskell.comment.single" spell-check="true">
876− <symbol type="comment" />
877− <expression> --.*$</expression>
978+ <starts-with>
979+ <expression>--</expression>
980+ </starts-with>
981+ <ends-with>
982+ <expression>$</expression>
983+ </ends-with>
878984 </scope>
879985 <scope name="haskell.comment.block" spell-check="true">
880− <symbol type="comment" />
881986 <starts-with>
882987 <expression>{-</expression>
883988 </starts-with>
@@ -889,4 +994,4 @@
889994
890995
891996 </collections>
892−</syntax>
997+</syntax>