@@ -65,7 +65,6 @@
6565
6666 <template-scopes>
6767 <include syntax="self" collection="Quote" />
68− <include syntax="self" collection="comments" />
6968 </template-scopes>
7069
7170 <collections>
@@ -137,6 +136,7 @@
137136 <capture number="1" name="haskell.pattern.record.bracket" />
138137 </ends-with>
139138 <subscopes>
139+ <include syntax="self" collection="comments" />
140140 <include syntax="self" collection="expressions" />
141141 <scope name="record-sep">
142142 <expression>=</expression>
@@ -159,6 +159,7 @@
159159 <capture number="1" name="haskell.pattern.record.bracket" />
160160 </ends-with>
161161 <subscopes>
162+ <include syntax="self" collection="comments" />
162163 <scope name="haskell.pattern.record.wildcard">
163164 <expression>\.\.</expression>
164165 </scope>
@@ -185,6 +186,7 @@
185186 <capture number="1" name="haskell.list.bracket" />
186187 </ends-with>
187188 <subscopes>
189+ <include syntax="self" collection="comments" />
188190 <include syntax="self" collection="expressions" />
189191 </subscopes>
190192 </scope>
@@ -239,6 +241,7 @@
239241 <capture number="1" name="haskell.tuple.bracket" />
240242 </ends-with>
241243 <subscopes>
244+ <include syntax="self" collection="comments" />
242245 <include syntax="self" collection="expressions" />
243246 </subscopes>
244247 </scope>
@@ -263,6 +266,7 @@
263266 <expression>(?=(where|^\s*$))</expression>
264267 </ends-with>
265268 <subscopes>
269+ <include syntax="self" collection="comments" />
266270 <include syntax="self" collection="type" />
267271 </subscopes>
268272 </scope>
@@ -342,6 +346,7 @@
342346 <template>^(?!\s+\1\S)(?!\s*$)</template>
343347 </ends-with>
344348 <subscopes>
349+ <include syntax="self" collection="comments" />
345350 <include syntax="self" collection="type" optional="true" repeat="true" />
346351 <scope>
347352 <expression>=</expression>
@@ -365,6 +370,7 @@
365370 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
366371 </ends-with>
367372 <subscopes>
373+ <include syntax="self" collection="comments" />
368374 <include syntax="self" collection="type-annotation" />
369375 <include syntax="self" collection="implementation" />
370376 </subscopes>
@@ -382,6 +388,7 @@
382388 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
383389 </ends-with>
384390 <subscopes>
391+ <include syntax="self" collection="comments" />
385392 <include syntax="self" collection="pattern-match" optional="true" repeat="true" />
386393 <scope>
387394 <expression>=</expression>
@@ -403,6 +410,7 @@
403410 <template>^(?!\s+\1\S)(?!\s*$)</template>
404411 </ends-with>
405412 <subscopes>
413+ <include syntax="self" collection="comments" />
406414 <include syntax="self" collection="type" />
407415 </subscopes>
408416 </scope>
@@ -422,6 +430,7 @@
422430 <template>^(?!\s+\1\S)(?!\s*$)</template>
423431 </ends-with>
424432 <subscopes>
433+ <include syntax="self" collection="comments" />
425434 <include syntax="self" collection="type" />
426435 </subscopes>
427436 </scope>
@@ -441,6 +450,7 @@
441450 <template>^(?!\s+\1\S)(?!\s*$)</template>
442451 </ends-with>
443452 <subscopes>
453+ <include syntax="self" collection="comments" />
444454 <scope name="haskell.keyword.construct.where">
445455 <expression>where</expression>
446456 </scope>
@@ -474,6 +484,7 @@
474484 <expression>deriving(\h+(newtype|stock|anyclass))?</expression>
475485 </scope>
476486 <scope name="haskell.record.construct.deriving.keyword">
487+ <include syntax="self" collection="comments" />
477488 <expression>via</expression>
478489 </scope>
479490 </collection>
@@ -492,6 +503,7 @@
492503 <capture number="1" name="haskell.record.bracket" />
493504 </ends-with>
494505 <subscopes>
506+ <include syntax="self" collection="comments" />
495507 <include syntax="self" collection="record-definition-field-name" />
496508 <include syntax="self" collection="type" />
497509 </subscopes>
@@ -523,6 +535,7 @@
523535 <expression>\)</expression>
524536 </ends-with>
525537 <subscopes>
538+ <include syntax="self" collection="comments" />
526539 <scope name="haskell.construct.type.typle.comma">
527540 <expression>\,</expression>
528541 </scope>
@@ -537,6 +550,7 @@
537550 <expression>\]</expression>
538551 </ends-with>
539552 <subscopes>
553+ <include syntax="self" collection="comments" />
540554 <include syntax="self" collection="type" />
541555 </subscopes>
542556 </scope>
@@ -571,6 +585,7 @@
571585 <template>^(?!\s+\1\S)(?!\s*$)</template>
572586 </ends-with>
573587 <subscopes>
588+ <include syntax="self" collection="comments" />
574589 <scope name="haskell.keyword.construct.where">
575590 <expression>where</expression>
576591 </scope>
@@ -590,6 +605,7 @@
590605 <capture number="1" name="haskell.type-list.bracket" />
591606 </ends-with>
592607 <subscopes>
608+ <include syntax="self" collection="comments" />
593609 <include syntax="self" collection="type" />
594610 </subscopes>
595611 </scope>
@@ -606,6 +622,7 @@
606622 <capture number="1" name="haskell.keyword.construct.lambda" />
607623 </ends-with>
608624 <subscopes>
625+ <include syntax="self" collection="comments" />
609626 <include syntax="self" collection="pattern-match" />
610627 </subscopes>
611628 </scope>
@@ -627,6 +644,7 @@
627644 <template>^(?!\1\s*\S)(?!s*$)</template>
628645 </ends-with>
629646 <subscopes>
647+ <include syntax="self" collection="comments" />
630648 <include syntax="self" collection="definition" />
631649 </subscopes>
632650 </scope>
@@ -666,12 +684,12 @@
666684
667685
668686 <collection name="strings">
669− <scope name="haskell.string.double-quoted">
687+ <scope name="haskell.string.double-quoted" spell-check="true">
670688 <starts-with>
671− <expression>"</expression>
689+ <expression>"</expression>
672690 </starts-with>
673691 <ends-with>
674− <expression>"</expression>
692+ <expression>"</expression>
675693 </ends-with>
676694 <subscopes>
677695 <scope name="haskell.string.escape-sequences">
@@ -708,6 +726,7 @@
708726 </ends-with>
709727 <subscopes>
710728 <scope name="identifier.haskell.type">
729+ <symbol type="expression" />
711730 <symbol type="expression" />
712731 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
713732 <capture number="1" name="identifier.type" />
@@ -732,6 +751,7 @@
732751 </ends-with>
733752 <subscopes>
734753 <scope name="haskell.construct.qualified">
754+ <symbol type="expression" />
735755 <expression>qualified</expression>
736756 <capture number="0" name="haskell.construct.keyword.qualified" />
737757 </scope>
@@ -749,6 +769,7 @@
749769 </ends-with>
750770 <subscopes anchored="true">
751771 <include syntax="self" collection="import-list" />
772+ <symbol type="expression" />
752773 </subscopes>
753774 </scope>
754775
@@ -782,6 +803,7 @@
782803 </ends-with>
783804 <subscopes>
784805 <scope name="haskell.identifier.struct">
806+ <symbol type="expression" />
785807 <symbol type="reference" scope="local" />
786808 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
787809 <capture number="1" name="haskell.import-list.identifier.type.name" />
@@ -851,14 +873,11 @@
851873
852874 <collection name="comments">
853875 <scope name="haskell.comment.single" spell-check="true">
854− <starts-with>
855− <expression>--</expression>
856− </starts-with>
857− <ends-with>
858− <expression>$</expression>
859− </ends-with>
876+ <symbol type="comment" />
877+ <expression> --.*$</expression>
860878 </scope>
861879 <scope name="haskell.comment.block" spell-check="true">
880+ <symbol type="comment" />
862881 <starts-with>
863882 <expression>{-</expression>
864883 </starts-with>