mirror of
https://github.com/ilyakooo0/haskell-nova.git
synced 2024-09-11 15:26:09 +03:00
Fixed comments
This commit is contained in:
parent
2eda210e16
commit
58955ee68a
@ -65,7 +65,6 @@
|
|||||||
|
|
||||||
<template-scopes>
|
<template-scopes>
|
||||||
<include syntax="self" collection="Quote" />
|
<include syntax="self" collection="Quote" />
|
||||||
<include syntax="self" collection="comments" />
|
|
||||||
</template-scopes>
|
</template-scopes>
|
||||||
|
|
||||||
<collections>
|
<collections>
|
||||||
@ -137,6 +136,7 @@
|
|||||||
<capture number="1" name="haskell.pattern.record.bracket" />
|
<capture number="1" name="haskell.pattern.record.bracket" />
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="expressions" />
|
<include syntax="self" collection="expressions" />
|
||||||
<scope name="record-sep">
|
<scope name="record-sep">
|
||||||
<expression>=</expression>
|
<expression>=</expression>
|
||||||
@ -159,6 +159,7 @@
|
|||||||
<capture number="1" name="haskell.pattern.record.bracket" />
|
<capture number="1" name="haskell.pattern.record.bracket" />
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<scope name="haskell.pattern.record.wildcard">
|
<scope name="haskell.pattern.record.wildcard">
|
||||||
<expression>\.\.</expression>
|
<expression>\.\.</expression>
|
||||||
</scope>
|
</scope>
|
||||||
@ -185,6 +186,7 @@
|
|||||||
<capture number="1" name="haskell.list.bracket" />
|
<capture number="1" name="haskell.list.bracket" />
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="expressions" />
|
<include syntax="self" collection="expressions" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
@ -239,6 +241,7 @@
|
|||||||
<capture number="1" name="haskell.tuple.bracket" />
|
<capture number="1" name="haskell.tuple.bracket" />
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="expressions" />
|
<include syntax="self" collection="expressions" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
@ -263,6 +266,7 @@
|
|||||||
<expression>(?=(where|^\s*$))</expression>
|
<expression>(?=(where|^\s*$))</expression>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="type" />
|
<include syntax="self" collection="type" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
@ -342,6 +346,7 @@
|
|||||||
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="type" optional="true" repeat="true" />
|
<include syntax="self" collection="type" optional="true" repeat="true" />
|
||||||
<scope>
|
<scope>
|
||||||
<expression>=</expression>
|
<expression>=</expression>
|
||||||
@ -365,6 +370,7 @@
|
|||||||
<template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
|
<template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="type-annotation" />
|
<include syntax="self" collection="type-annotation" />
|
||||||
<include syntax="self" collection="implementation" />
|
<include syntax="self" collection="implementation" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
@ -382,6 +388,7 @@
|
|||||||
<template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
|
<template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="pattern-match" optional="true" repeat="true" />
|
<include syntax="self" collection="pattern-match" optional="true" repeat="true" />
|
||||||
<scope>
|
<scope>
|
||||||
<expression>=</expression>
|
<expression>=</expression>
|
||||||
@ -403,6 +410,7 @@
|
|||||||
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="type" />
|
<include syntax="self" collection="type" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
@ -422,6 +430,7 @@
|
|||||||
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="type" />
|
<include syntax="self" collection="type" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
@ -441,6 +450,7 @@
|
|||||||
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<scope name="haskell.keyword.construct.where">
|
<scope name="haskell.keyword.construct.where">
|
||||||
<expression>where</expression>
|
<expression>where</expression>
|
||||||
</scope>
|
</scope>
|
||||||
@ -474,6 +484,7 @@
|
|||||||
<expression>deriving(\h+(newtype|stock|anyclass))?</expression>
|
<expression>deriving(\h+(newtype|stock|anyclass))?</expression>
|
||||||
</scope>
|
</scope>
|
||||||
<scope name="haskell.record.construct.deriving.keyword">
|
<scope name="haskell.record.construct.deriving.keyword">
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<expression>via</expression>
|
<expression>via</expression>
|
||||||
</scope>
|
</scope>
|
||||||
</collection>
|
</collection>
|
||||||
@ -492,6 +503,7 @@
|
|||||||
<capture number="1" name="haskell.record.bracket" />
|
<capture number="1" name="haskell.record.bracket" />
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="record-definition-field-name" />
|
<include syntax="self" collection="record-definition-field-name" />
|
||||||
<include syntax="self" collection="type" />
|
<include syntax="self" collection="type" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
@ -523,6 +535,7 @@
|
|||||||
<expression>\)</expression>
|
<expression>\)</expression>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<scope name="haskell.construct.type.typle.comma">
|
<scope name="haskell.construct.type.typle.comma">
|
||||||
<expression>\,</expression>
|
<expression>\,</expression>
|
||||||
</scope>
|
</scope>
|
||||||
@ -537,6 +550,7 @@
|
|||||||
<expression>\]</expression>
|
<expression>\]</expression>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="type" />
|
<include syntax="self" collection="type" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
@ -571,6 +585,7 @@
|
|||||||
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
<template>^(?!\s+\1\S)(?!\s*$)</template>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<scope name="haskell.keyword.construct.where">
|
<scope name="haskell.keyword.construct.where">
|
||||||
<expression>where</expression>
|
<expression>where</expression>
|
||||||
</scope>
|
</scope>
|
||||||
@ -590,6 +605,7 @@
|
|||||||
<capture number="1" name="haskell.type-list.bracket" />
|
<capture number="1" name="haskell.type-list.bracket" />
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="type" />
|
<include syntax="self" collection="type" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
@ -606,6 +622,7 @@
|
|||||||
<capture number="1" name="haskell.keyword.construct.lambda" />
|
<capture number="1" name="haskell.keyword.construct.lambda" />
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="pattern-match" />
|
<include syntax="self" collection="pattern-match" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
@ -627,6 +644,7 @@
|
|||||||
<template>^(?!\1\s*\S)(?!s*$)</template>
|
<template>^(?!\1\s*\S)(?!s*$)</template>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
|
<include syntax="self" collection="comments" />
|
||||||
<include syntax="self" collection="definition" />
|
<include syntax="self" collection="definition" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
@ -666,12 +684,12 @@
|
|||||||
|
|
||||||
|
|
||||||
<collection name="strings">
|
<collection name="strings">
|
||||||
<scope name="haskell.string.double-quoted">
|
<scope name="haskell.string.double-quoted" spell-check="true">
|
||||||
<starts-with>
|
<starts-with>
|
||||||
<expression>"</expression>
|
<expression>"</expression>
|
||||||
</starts-with>
|
</starts-with>
|
||||||
<ends-with>
|
<ends-with>
|
||||||
<expression>"</expression>
|
<expression>"</expression>
|
||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
<scope name="haskell.string.escape-sequences">
|
<scope name="haskell.string.escape-sequences">
|
||||||
@ -708,6 +726,7 @@
|
|||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
<scope name="identifier.haskell.type">
|
<scope name="identifier.haskell.type">
|
||||||
|
<symbol type="expression" />
|
||||||
<symbol type="expression" />
|
<symbol type="expression" />
|
||||||
<expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
|
<expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
|
||||||
<capture number="1" name="identifier.type" />
|
<capture number="1" name="identifier.type" />
|
||||||
@ -732,6 +751,7 @@
|
|||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
<scope name="haskell.construct.qualified">
|
<scope name="haskell.construct.qualified">
|
||||||
|
<symbol type="expression" />
|
||||||
<expression>qualified</expression>
|
<expression>qualified</expression>
|
||||||
<capture number="0" name="haskell.construct.keyword.qualified" />
|
<capture number="0" name="haskell.construct.keyword.qualified" />
|
||||||
</scope>
|
</scope>
|
||||||
@ -749,6 +769,7 @@
|
|||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes anchored="true">
|
<subscopes anchored="true">
|
||||||
<include syntax="self" collection="import-list" />
|
<include syntax="self" collection="import-list" />
|
||||||
|
<symbol type="expression" />
|
||||||
</subscopes>
|
</subscopes>
|
||||||
</scope>
|
</scope>
|
||||||
|
|
||||||
@ -782,6 +803,7 @@
|
|||||||
</ends-with>
|
</ends-with>
|
||||||
<subscopes>
|
<subscopes>
|
||||||
<scope name="haskell.identifier.struct">
|
<scope name="haskell.identifier.struct">
|
||||||
|
<symbol type="expression" />
|
||||||
<symbol type="reference" scope="local" />
|
<symbol type="reference" scope="local" />
|
||||||
<expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
|
<expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
|
||||||
<capture number="1" name="haskell.import-list.identifier.type.name" />
|
<capture number="1" name="haskell.import-list.identifier.type.name" />
|
||||||
@ -851,14 +873,11 @@
|
|||||||
|
|
||||||
<collection name="comments">
|
<collection name="comments">
|
||||||
<scope name="haskell.comment.single" spell-check="true">
|
<scope name="haskell.comment.single" spell-check="true">
|
||||||
<starts-with>
|
<symbol type="comment" />
|
||||||
<expression>--</expression>
|
<expression> --.*$</expression>
|
||||||
</starts-with>
|
|
||||||
<ends-with>
|
|
||||||
<expression>$</expression>
|
|
||||||
</ends-with>
|
|
||||||
</scope>
|
</scope>
|
||||||
<scope name="haskell.comment.block" spell-check="true">
|
<scope name="haskell.comment.block" spell-check="true">
|
||||||
|
<symbol type="comment" />
|
||||||
<starts-with>
|
<starts-with>
|
||||||
<expression>{-</expression>
|
<expression>{-</expression>
|
||||||
</starts-with>
|
</starts-with>
|
||||||
|
Loading…
Reference in New Issue
Block a user