Skip to content

Commit 3745d66

Browse files
duckdoom4duckdoom4
authored
Syntax fixes and update typescript patterns (#339)
Move token string converters
1 parent e33f321 commit 3745d66

14 files changed

+1445
-746
lines changed

‎src/tokenizer/atl-token-patterns.g.ts

+78-26
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
66
// DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
77
// ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
8-
// Last generated: 01/06/2023 14:57:48 (UTC+0)
8+
// Last generated: 10/06/2023 21:08:08 (UTC+0)
99

1010
import { KeywordTokenType, EntityTokenType, MetaTokenType, CharacterTokenType } from "./renpy-tokens";
1111
import { TokenPattern } from "./token-pattern-types";
@@ -35,91 +35,91 @@ export const atlBuildInProperties: TokenPattern = {
3535
debugName: "atlBuildInProperties.patterns![1]",
3636

3737
// position props (int, absolute, or a float)
38-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
38+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
3939
match: /\b(?<!\.)(?:xpos|ypos|xanchor|yanchor|xcenter|ycenter|radius)\b/g,
4040
},
4141
{
4242
debugName: "atlBuildInProperties.patterns![2]",
4343

4444
// position pair props
45-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
45+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
4646
match: /\b(?<!\.)(?:pos|anchor|xycenter|around|alignaround|matrixanchor)\b/g,
4747
},
4848
{
4949
debugName: "atlBuildInProperties.patterns![3]",
5050

5151
// float props
52-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
52+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
5353
match: /\b(?<!\.)(?:xalign|yalign|zoom|xzoom|yzoom|alpha|additive|angle|delay|events|zpos)\b/g,
5454
},
5555
{
5656
debugName: "atlBuildInProperties.patterns![4]",
5757

5858
// float pair props
59-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
59+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
6060
match: /\b(?<!\.)(?:align|knot)\b/g,
6161
},
6262
{
6363
debugName: "atlBuildInProperties.patterns![5]",
6464

6565
// int props
66-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
66+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
6767
match: /\b(?<!\.)(?:xoffset|yoffset|xtile|ytile)\b/g,
6868
},
6969
{
7070
debugName: "atlBuildInProperties.patterns![6]",
7171

7272
// int pair props
73-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
73+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
7474
match: /\b(?<!\.)(?:offset)\b/g,
7575
},
7676
{
7777
debugName: "atlBuildInProperties.patterns![7]",
7878

7979
// boolean props
80-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
80+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
8181
match: /\b(?<!\.)(?:rotate_pad|transform_anchor|nearest|crop_relative|subpixel|zzoom)\b/g,
8282
},
8383
{
8484
debugName: "atlBuildInProperties.patterns![8]",
8585

8686
// ('#float' | None)
87-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
87+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
8888
match: /\b(?<!\.)(?:rotate|xpan|ypan|blur)\b/g,
8989
},
9090
{
9191
debugName: "atlBuildInProperties.patterns![9]",
9292

9393
// ('#position' | None)
94-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
94+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
9595
match: /\b(?<!\.)(?:xsize|ysize)\b/g,
9696
},
9797
{
9898
debugName: "atlBuildInProperties.patterns![10]",
9999

100100
// ('\(int, int, int, int\)' | '\(float, float, float, float\)' | None)
101-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
101+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
102102
match: /\b(?<!\.)(?:crop)\b/g,
103103
},
104104
{
105105
debugName: "atlBuildInProperties.patterns![11]",
106106

107107
// ('\(int, int\)' | None)
108-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
108+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
109109
match: /\b(?<!\.)(?:corner1|corner2)\b/g,
110110
},
111111
{
112112
debugName: "atlBuildInProperties.patterns![12]",
113113

114114
// ('\(position, position\)' | None)
115-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
115+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
116116
match: /\b(?<!\.)(?:xysize)\b/g,
117117
},
118118
{
119119
debugName: "atlBuildInProperties.patterns![13]",
120120

121121
// ('#string' | None)
122-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
122+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
123123
match: /\b(?<!\.)(?:fit)\b/g,
124124
},
125125
{
@@ -133,28 +133,37 @@ export const atlBuildInProperties: TokenPattern = {
133133
debugName: "atlBuildInProperties.patterns![15]",
134134

135135
// ('#Matrix' | '#MatrixColor' | None)
136-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
136+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
137137
match: /\b(?<!\.)(?:matrixcolor)\b/g,
138138
},
139139
{
140140
debugName: "atlBuildInProperties.patterns![16]",
141141

142142
// ('#Matrix' | '#TransformMatrix' | None)
143-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
143+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
144144
match: /\b(?<!\.)(?:matrixtransform)\b/g,
145145
},
146146
{
147147
debugName: "atlBuildInProperties.patterns![17]",
148148

149149
// ('#bool' | '#float' | '\(float, float, float\)')
150-
token: EntityTokenType.PropertyName, /*support.type.property-name.transform.renpy*/
150+
token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
151151
match: /\b(?<!\.)(?:perspective)\b/g,
152152
},
153153
]
154154
};
155155

156156
export const atlSimpleExpression: TokenPattern = {
157-
patterns: [atlBuildInProperties]
157+
patterns: [
158+
atlBuildInProperties,
159+
{
160+
debugName: "atlSimpleExpression.patterns![21]",
161+
162+
// Tokenize identifiers
163+
token: EntityTokenType.VariableName, /*variable.name.python*/
164+
match: /\b([a-zA-Z_]\w*)\b/g,
165+
},
166+
]
158167
};
159168

160169
export const atlExpression: TokenPattern = {
@@ -284,7 +293,7 @@ export const atlEventName: TokenPattern = {
284293
{
285294
debugName: "atlEventName.patterns![2]",
286295

287-
token: MetaTokenType.FunctionCall, /*entity.name.function.renpy meta.function-call.generic.renpy*/
296+
token: MetaTokenType.FunctionCall, /*entity.name.function.event.renpy meta.function-call.generic.renpy*/
288297
match: /\b([a-zA-Z_]\w*)\b/g,
289298
},
290299
]
@@ -296,7 +305,7 @@ export const atlEventDefName: TokenPattern = {
296305
{
297306
debugName: "atlEventDefName.patterns![2]",
298307

299-
token: EntityTokenType.FunctionName, /*entity.name.function.renpy*/
308+
token: EntityTokenType.FunctionName, /*entity.name.function.event.def.renpy*/
300309
match: /\b([a-zA-Z_]\w*)\b/g,
301310
},
302311
]
@@ -353,7 +362,7 @@ export const atlFunction: TokenPattern = {
353362
{
354363
debugName: "atlFunction.captures![2].patterns![1]",
355364

356-
token: MetaTokenType.FunctionCall, /*entity.name.function.renpy meta.function-call.generic.renpy*/
365+
token: MetaTokenType.FunctionCall, /*entity.name.function.atl-function.renpy meta.function-call.generic.renpy*/
357366
match: /\b([a-zA-Z_]\w*)\b/g,
358367
},
359368
]
@@ -376,24 +385,67 @@ export const atlWarperName: TokenPattern = {
376385
{
377386
debugName: "atlWarperName.patterns![3]",
378387

379-
token: MetaTokenType.FunctionCall, /*entity.name.function.renpy meta.function-call.generic.renpy*/
388+
token: MetaTokenType.FunctionCall, /*entity.name.function.warper.renpy meta.function-call.generic.renpy*/
380389
match: /\b([a-zA-Z_]\w*)\b/g,
381390
},
382391
]
383392
};
384393

394+
export const atlWarperBroken: TokenPattern = {
395+
debugName: "atlWarperBroken",
396+
397+
// TODO: This doesn't work right now, we can't assume all identifiers are warpers
398+
token: MetaTokenType.ATLWarper, /*meta.atl.warper.renpy*/
399+
begin: /(?<=^[ \t]*)([a-zA-Z_]\w*)\b/dgm,
400+
beginCaptures: {
401+
1: { patterns: [atlWarperName] },
402+
},
403+
end: /(?=[ \t]*#)|$/gm,
404+
patterns: [atlSimpleExpression]
405+
};
406+
385407
export const atlWarper: TokenPattern = {
386408
debugName: "atlWarper",
387409

388-
// https://www.renpy.org/doc/html/atl.html#warpers
410+
// (TODO: For now we only support build-in warper highlighting) https://www.renpy.org/doc/html/atl.html#warpers
389411
token: MetaTokenType.ATLWarper, /*meta.atl.warper.renpy*/
390-
begin: /\b(?<!\.)([a-zA-Z_]\w*)\b[ \t]*/dg,
412+
begin: /(?<=^[ \t]*)(linear|ease|easein|easeout|ease_back|ease_bounce|ease_circ|ease_cubic|ease_elastic|ease_expo|ease_quad|ease_quart|ease_quint|easein_back|easein_bounce|easein_circ|easein_cubic|easein_elastic|easein_expo|easein_quad|easein_quart|easein_quint|easeout_back|easeout_bounce|easeout_circ|easeout_cubic|easeout_elastic|easeout_expo|easeout_quad|easeout_quart|easeout_quint)\b/dgm,
391413
beginCaptures: {
392414
1: { patterns: [atlWarperName] },
393415
},
394-
end: /(?!\G)/g,
416+
end: /(?=[ \t]*#)|$/gm,
395417
patterns: [atlSimpleExpression]
396418
};
397419

420+
export const atlFallback: TokenPattern = {
421+
// TODO: This is a temp fix for missing pattern references
422+
patterns: [
423+
]
424+
};
425+
426+
export const transform: TokenPattern = {
427+
debugName: "transform",
428+
429+
contentToken: MetaTokenType.TransformBlock, /*meta.transform.block.renpy*/
430+
begin: /^([ \t]+)?(transform)\b[ \t]*(.*)?(:)/dgm,
431+
beginCaptures: {
432+
1: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.leading.renpy*/ },
433+
2: { token: KeywordTokenType.Transform, /*keyword.transform.renpy*/ },
434+
3: {
435+
patterns: [
436+
{
437+
debugName: "transform.beginCaptures![3].patterns![0]",
438+
439+
token: EntityTokenType.VariableName, /*variable.name.transform.renpy*/
440+
match: /\b([a-zA-Z_]\w*)\b/g,
441+
},
442+
]
443+
},
444+
4: { token: CharacterTokenType.Colon, /*punctuation.section.atl.begin.renpy*/ },
445+
},
446+
end: /^(?=(?!\1)[ \t]*[^\s#]|\1[^\s#])/gm,
447+
patterns: [atl]
448+
};
449+
398450
// Push pattern references that were not defined on include
399-
atl.patterns!.push(atlKeywords, atlBlocks, atlSimpleExpression, atlWarper, atlEvent, atlOn, atlFunction);
451+
atl.patterns!.push(atlKeywords, atlWarper, atlBlocks, atlSimpleExpression, atlEvent, atlOn, atlFunction, atlFallback);

0 commit comments

Comments
 (0)