Skip to content

Commit 870bf50

Browse files
daiyamdaiyam
committed
fix import's typing
1 parent b9104b1 commit 870bf50

File tree

1 file changed

+55
-42
lines changed

1 file changed

+55
-42
lines changed

‎kaoscript.xml

+55-42
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
</RULES><!-- }}} -->
7575

7676
<RULES SET="EXPRESSION" IGNORE_CASE="FALSE"><!-- {{{ -->
77+
<IMPORT DELEGATE="TYPE_STATEMENT"/>
78+
7779
<SPAN TYPE="COMMENT1" DELEGATE="COMMENT_BLOCK">
7880
<BEGIN>/*</BEGIN>
7981
<END>*/</END>
@@ -113,19 +115,17 @@
113115
<EOL_SPAN_REGEXP TYPE="KEYWORD1" HASH_CHARS="ir" DELEGATE="IMPORT" AT_WHITESPACE_END="TRUE">(?:require\|)?import\s+</EOL_SPAN_REGEXP>
114116

115117
<EOL_SPAN_REGEXP TYPE="KEYWORD1" HASH_CHAR="i" DELEGATE="INCLUDE" AT_WHITESPACE_END="TRUE">
116-
<BEGIN>include(?: once)?\s+\{</BEGIN>
118+
<BEGIN>include(?: again)?\s+\{</BEGIN>
117119
<END>}</END>
118120
</EOL_SPAN_REGEXP>
119121

120-
<EOL_SPAN_REGEXP TYPE="KEYWORD1" HASH_CHAR="i" DELEGATE="INCLUDE" AT_WHITESPACE_END="TRUE">include(?: once)?\s+</EOL_SPAN_REGEXP>
122+
<EOL_SPAN_REGEXP TYPE="KEYWORD1" HASH_CHAR="i" DELEGATE="INCLUDE" AT_WHITESPACE_END="TRUE">include(?: again)?\s+</EOL_SPAN_REGEXP>
121123

122124
<SEQ_REGEXP TYPE="MARKUP" HASH_CHAR="/" AT_WORD_START="TRUE">/[^\p{Blank}]*?/</SEQ_REGEXP>
123125

124126
<SEQ_REGEXP TYPE="KEYWORD1" HASH_CHARS="i" AT_WORD_START="TRUE">\b(?:is not)\b</SEQ_REGEXP>
125127

126-
<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
127128
<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">!(</MARK_PREVIOUS>
128-
<SEQ TYPE="OPERATOR">)</SEQ>
129129
<SEQ TYPE="OPERATOR">=</SEQ>
130130
<SEQ TYPE="OPERATOR">!</SEQ>
131131
<SEQ TYPE="OPERATOR">&gt;=</SEQ>
@@ -142,8 +142,6 @@
142142
<SEQ TYPE="OPERATOR">^</SEQ>
143143
<SEQ TYPE="OPERATOR">~</SEQ>
144144
<SEQ TYPE="OPERATOR">.</SEQ>
145-
<SEQ TYPE="OPERATOR">}</SEQ>
146-
<SEQ TYPE="OPERATOR">{</SEQ>
147145
<SEQ TYPE="OPERATOR">,</SEQ>
148146
<SEQ TYPE="OPERATOR">]</SEQ>
149147
<SEQ TYPE="OPERATOR">[</SEQ>
@@ -159,14 +157,10 @@
159157
<KEYWORD3>this</KEYWORD3>
160158
<KEYWORD3>super</KEYWORD3>
161159

162-
<KEYWORD1>abstract</KEYWORD1>
163-
<KEYWORD1>as</KEYWORD1>
164-
<KEYWORD1>async</KEYWORD1>
165160
<KEYWORD1>await</KEYWORD1>
166161
<KEYWORD1>break</KEYWORD1>
167162
<KEYWORD1>by</KEYWORD1>
168163
<KEYWORD1>catch</KEYWORD1>
169-
<KEYWORD1>class</KEYWORD1>
170164
<KEYWORD1>const</KEYWORD1>
171165
<KEYWORD1>continue</KEYWORD1>
172166
<KEYWORD1>constructor</KEYWORD1>
@@ -175,59 +169,33 @@
175169
<KEYWORD1>destructor</KEYWORD1>
176170
<KEYWORD1>do</KEYWORD1>
177171
<KEYWORD1>else</KEYWORD1>
178-
<KEYWORD1>enum</KEYWORD1>
179172
<KEYWORD1>export</KEYWORD1>
180173
<KEYWORD1>extends</KEYWORD1>
181174
<KEYWORD1>extern</KEYWORD1>
182175
<KEYWORD1>finally</KEYWORD1>
183176
<KEYWORD1>for</KEYWORD1>
184177
<KEYWORD1>from</KEYWORD1>
185-
<KEYWORD1>func</KEYWORD1>
186178
<KEYWORD1>impl</KEYWORD1>
187179
<KEYWORD1>if</KEYWORD1>
188180
<KEYWORD1>in</KEYWORD1>
189181
<KEYWORD1>is</KEYWORD1>
190182
<KEYWORD1>let</KEYWORD1>
191-
<KEYWORD1>macro</KEYWORD1>
192-
<KEYWORD1>namespace</KEYWORD1>
193183
<KEYWORD1>new</KEYWORD1>
194184
<KEYWORD1>of</KEYWORD1>
195185
<KEYWORD1>on</KEYWORD1>
196-
<KEYWORD1>private</KEYWORD1>
197-
<KEYWORD1>protected</KEYWORD1>
198-
<KEYWORD1>public</KEYWORD1>
199186
<KEYWORD1>require</KEYWORD1>
200187
<KEYWORD1>return</KEYWORD1>
201-
<KEYWORD1>sealed</KEYWORD1>
202-
<KEYWORD1>static</KEYWORD1>
203188
<KEYWORD1>switch</KEYWORD1>
204189
<KEYWORD1>til</KEYWORD1>
205190
<KEYWORD1>to</KEYWORD1>
206191
<KEYWORD1>throw</KEYWORD1>
207192
<KEYWORD1>try</KEYWORD1>
208-
<KEYWORD1>type</KEYWORD1>
209193
<KEYWORD1>unless</KEYWORD1>
210194
<KEYWORD1>until</KEYWORD1>
211195
<KEYWORD1>when</KEYWORD1>
212196
<KEYWORD1>while</KEYWORD1>
213197
<KEYWORD1>with</KEYWORD1>
214198

215-
<KEYWORD3>array</KEYWORD3>
216-
<KEYWORD3>Array</KEYWORD3>
217-
<KEYWORD3>bool</KEYWORD3>
218-
<KEYWORD3>Boolean</KEYWORD3>
219-
<KEYWORD3>Class</KEYWORD3>
220-
<KEYWORD3>Enum</KEYWORD3>
221-
<KEYWORD3>Function</KEYWORD3>
222-
<KEYWORD3>number</KEYWORD3>
223-
<KEYWORD3>Number</KEYWORD3>
224-
<KEYWORD3>object</KEYWORD3>
225-
<KEYWORD3>Object</KEYWORD3>
226-
<KEYWORD3>RegExp</KEYWORD3>
227-
<KEYWORD3>string</KEYWORD3>
228-
<KEYWORD3>String</KEYWORD3>
229-
<KEYWORD3>void</KEYWORD3>
230-
231199
<LITERAL2>false</LITERAL2>
232200
<LITERAL2>null</LITERAL2>
233201
<LITERAL2>true</LITERAL2>
@@ -236,7 +204,9 @@
236204
</KEYWORDS>
237205
</RULES><!-- }}} -->
238206

239-
<RULES SET="IMPORT"><!-- {{{ -->
207+
<RULES SET="IMPORT" IGNORE_CASE="FALSE"><!-- {{{ -->
208+
<IMPORT DELEGATE="TYPE_STATEMENT"/>
209+
240210
<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
241211

242212
<SPAN TYPE="COMMENT1" DELEGATE="COMMENT_BLOCK">
@@ -254,7 +224,7 @@
254224
<END>"</END>
255225
</SPAN>
256226

257-
<SPAN MATCH_TYPE="OPERATOR" DELEGATE="EXPRESSION">
227+
<SPAN MATCH_TYPE="OPERATOR" DELEGATE="IMPORT">
258228
<BEGIN>{</BEGIN>
259229
<END>}</END>
260230
</SPAN>
@@ -263,20 +233,19 @@
263233
<SEQ TYPE="OPERATOR">)</SEQ>
264234
<SEQ TYPE="OPERATOR">:</SEQ>
265235
<SEQ TYPE="OPERATOR">,</SEQ>
266-
<SEQ TYPE="OPERATOR">=&gt;</SEQ>
267236
<SEQ TYPE="OPERATOR">*</SEQ>
268-
<SEQ TYPE="OPERATOR">-&gt;</SEQ>
237+
238+
<SEQ TYPE="FUNCTION">=&gt;</SEQ>
269239

270240
<KEYWORDS>
271-
<KEYWORD1>as</KEYWORD1>
272241
<KEYWORD1>for</KEYWORD1>
273242
</KEYWORDS>
274243
</RULES><!-- }}} -->
275244

276245
<RULES SET="INCLUDE"><!-- {{{ -->
277246
<EOL_SPAN TYPE="COMMENT2">//</EOL_SPAN>
278247

279-
<SPAN TYPE="MARKUP" DELEGATE="COMMENT_BLOCK">
248+
<SPAN TYPE="COMMENT1" DELEGATE="COMMENT_BLOCK">
280249
<BEGIN>/*</BEGIN>
281250
<END>*/</END>
282251
</SPAN>
@@ -290,6 +259,11 @@
290259
<BEGIN>"</BEGIN>
291260
<END>"</END>
292261
</SPAN>
262+
263+
<SPAN MATCH_TYPE="OPERATOR" DELEGATE="INCLUDE">
264+
<BEGIN>{</BEGIN>
265+
<END>}</END>
266+
</SPAN>
293267
</RULES><!-- }}} -->
294268

295269
<RULES SET="MACRO"><!-- {{{ -->
@@ -326,4 +300,43 @@
326300
<END>)</END>
327301
</SPAN>
328302
</RULES><!-- }}} -->
303+
304+
<RULES SET="TYPE_STATEMENT" IGNORE_CASE="FALSE"><!-- {{{ -->
305+
<MARK_PREVIOUS TYPE="FUNCTION" MATCH_TYPE="OPERATOR">(</MARK_PREVIOUS>
306+
<SEQ TYPE="OPERATOR">)</SEQ>
307+
<SEQ TYPE="OPERATOR">}</SEQ>
308+
<SEQ TYPE="OPERATOR">{</SEQ>
309+
310+
<KEYWORDS>
311+
<KEYWORD1>abstract</KEYWORD1>
312+
<KEYWORD1>async</KEYWORD1>
313+
<KEYWORD1>class</KEYWORD1>
314+
<KEYWORD1>enum</KEYWORD1>
315+
<KEYWORD1>func</KEYWORD1>
316+
<KEYWORD1>macro</KEYWORD1>
317+
<KEYWORD1>namespace</KEYWORD1>
318+
<KEYWORD1>private</KEYWORD1>
319+
<KEYWORD1>protected</KEYWORD1>
320+
<KEYWORD1>public</KEYWORD1>
321+
<KEYWORD1>sealed</KEYWORD1>
322+
<KEYWORD1>static</KEYWORD1>
323+
<KEYWORD1>type</KEYWORD1>
324+
325+
<KEYWORD3>array</KEYWORD3>
326+
<KEYWORD3>Array</KEYWORD3>
327+
<KEYWORD3>bool</KEYWORD3>
328+
<KEYWORD3>Boolean</KEYWORD3>
329+
<KEYWORD3>Class</KEYWORD3>
330+
<KEYWORD3>Enum</KEYWORD3>
331+
<KEYWORD3>Function</KEYWORD3>
332+
<KEYWORD3>number</KEYWORD3>
333+
<KEYWORD3>Number</KEYWORD3>
334+
<KEYWORD3>object</KEYWORD3>
335+
<KEYWORD3>Object</KEYWORD3>
336+
<KEYWORD3>RegExp</KEYWORD3>
337+
<KEYWORD3>string</KEYWORD3>
338+
<KEYWORD3>String</KEYWORD3>
339+
<KEYWORD3>void</KEYWORD3>
340+
</KEYWORDS>
341+
</RULES><!-- }}} -->
329342
</MODE>

0 commit comments

Comments
 (0)