Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix label statement not opening a meta block tag #441

Merged
merged 1 commit into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/tokenizer/renpy-token-patterns.g.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
// DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
// ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
// Last generated: 15/08/2024 16:36:00 (UTC+0)
// Last generated: 15/08/2024 20:21:42 (UTC+0)

import { MetaTokenType, CharacterTokenType, LiteralTokenType, EntityTokenType, KeywordTokenType, EscapedCharacterTokenType, OperatorTokenType } from "./renpy-tokens";
import { TokenPattern } from "./token-pattern-types";
Expand Down Expand Up @@ -1684,7 +1684,6 @@ export const label: TokenPattern = {
match: /\b(?<!\.)(hide)\b/g,
},
labelDefName,
fallbackPatternsWithError,
]
};

Expand Down Expand Up @@ -2019,6 +2018,7 @@ export const renpyStatements: TokenPattern = {
translate,
audio,
pause,
renpyBlockTester,
scene,
camera,
window,
Expand Down
18 changes: 9 additions & 9 deletions src/tokenizer/token-patterns.g.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
// THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
// DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
// ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
// Last generated: 15/08/2024 16:36:00 (UTC+0)
// Last generated: 15/08/2024 20:21:42 (UTC+0)

import * as AtlPatterns from "./atl-token-patterns.g";
import * as PythonPatterns from "./python-token-patterns.g";
import * as RenpyPatterns from "./renpy-token-patterns.g";
import * as StylePatterns from "./style-token-patterns.g";
import * as PythonPatterns from "./python-token-patterns.g";
import * as ScreenPatterns from "./screen-token-patterns.g";
import * as StylePatterns from "./style-token-patterns.g";

// Push all RenpyPatterns external includes
RenpyPatterns.literal.patterns!.push(PythonPatterns.literal);
Expand All @@ -35,7 +35,7 @@ RenpyPatterns.labelName.patterns!.splice(0, 0, PythonPatterns.builtinPossibleCal
RenpyPatterns.labelCall.patterns!.splice(0, 0, PythonPatterns.specialVariables);
RenpyPatterns.labelCall.patterns!.push(PythonPatterns.functionArguments);
RenpyPatterns.labelDefName.patterns!.splice(0, 0, PythonPatterns.builtinPossibleCallables);
RenpyPatterns.label.patterns!.splice(2, 0, PythonPatterns.parameters);
RenpyPatterns.label.patterns!.push(PythonPatterns.parameters);
RenpyPatterns.returnStatements.patterns!.push(PythonPatterns.expression);
RenpyPatterns.callJumpExpression.patterns!.push(PythonPatterns.expression);
RenpyPatterns.callPass.patterns!.splice(0, 0, PythonPatterns.functionArguments);
Expand All @@ -47,10 +47,10 @@ RenpyPatterns.audioParams.patterns!.push(PythonPatterns.number);
RenpyPatterns.play.patterns![0].patterns!.splice(2, 0, PythonPatterns.expression);
RenpyPatterns.queue.patterns![0].patterns!.splice(2, 0, PythonPatterns.expression);
RenpyPatterns.stop.patterns![0].patterns!.splice(1, 0, PythonPatterns.number);
RenpyPatterns.renpyStatements.patterns!.splice(7, 0, AtlPatterns.transform);
RenpyPatterns.renpyStatements.patterns!.splice(8, 0, AtlPatterns.atlBlockTester);
RenpyPatterns.renpyStatements.patterns!.splice(15, 0, ScreenPatterns.screen);
RenpyPatterns.renpyStatements.patterns!.splice(16, 0, StylePatterns.style);
RenpyPatterns.renpyStatements.patterns!.splice(8, 0, AtlPatterns.transform);
RenpyPatterns.renpyStatements.patterns!.splice(9, 0, AtlPatterns.atlBlockTester);
RenpyPatterns.renpyStatements.patterns!.splice(16, 0, ScreenPatterns.screen);
RenpyPatterns.renpyStatements.patterns!.splice(17, 0, StylePatterns.style);

// Push all AtlPatterns external includes
AtlPatterns.atl.patterns!.splice(0, 0, RenpyPatterns.conditionals);
Expand Down Expand Up @@ -145,4 +145,4 @@ PythonPatterns.doubleOneRegexpComments.patterns!.push(RenpyPatterns.codetags);
PythonPatterns.doubleThreeRegexpComments.patterns!.push(RenpyPatterns.codetags);


export { AtlPatterns, PythonPatterns, RenpyPatterns, StylePatterns, ScreenPatterns };
export { AtlPatterns, RenpyPatterns, PythonPatterns, ScreenPatterns, StylePatterns };
4 changes: 2 additions & 2 deletions syntaxes/renpy.tmLanguage.json
Original file line number Diff line number Diff line change
Expand Up @@ -1380,8 +1380,7 @@
"match": "\\b(?<!\\.)(hide)\\b"
},
{ "include": "#label-def-name" },
{ "include": "source.renpy.python#parameters" },
{ "include": "#fallback-patterns-with-error" }
{ "include": "source.renpy.python#parameters" }
]
},
"return-statements": {
Expand Down Expand Up @@ -1639,6 +1638,7 @@
{ "include": "#translate" },
{ "include": "#audio" },
{ "include": "#pause" },
{ "include": "#renpy-block-tester" },
{ "include": "source.renpy.atl#transform" },
{ "include": "source.renpy.atl#atl-block-tester" },
{ "include": "#scene" },
Expand Down
Loading