Skip to content

优化字符串解析和自动补全默认设置，添加语法着色颜色定义 #33

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.

Sign up for GitHub

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

Open
EnigmaAlstrong wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

优化字符串解析和自动补全默认设置，添加语法着色颜色定义 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
504095b
优化字符串解析和自动补全默认设置，添加语法着色颜色定义
EnigmaAlstrong Mar 18, 2026
86af92c
Merge branch 'dev' into eni_fix
EnigmaAlstrong Mar 18, 2026
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
2 changes: 1 addition & 1 deletion src/EasyCon.Script/Syntax/Lexer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ internal sealed partial class Lexer(SyntaxTree syntaxTree)
[GeneratedRegex(@"(\s*#.*)$")]
private static partial Regex lineRegex();

[GeneratedRegex(@"^\b(print|alert)\b\s+(.*)$", RegexOptions.IgnoreCase, "zh-CN")]
[GeneratedRegex(@"^\b(print|alert)\b\s*(.*)$", RegexOptions.IgnoreCase, "zh-CN")]
private static partial Regex printRex();

[GeneratedRegex(@"^(_|\$)[\d\p{L}_]+$", RegexOptions.IgnoreCase, "zh-CN")]
Expand Down
2 changes: 1 addition & 1 deletion src/EasyCon2/Config/ControllerConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public record ConfigState
public string ChannelToken { get; set; } = string.Empty;
public bool EnableAlertToken { get; set; } = false;
public bool EnableChannelToken { get; set; } = false;
public bool EnableAutoCompletion { get; set; } = true;
public bool EnableAutoCompletion { get; set; } = false;

public bool ChannelControl { get; set; } = false;

Expand Down
11 changes: 10 additions & 1 deletion src/EasyCon2/Resources/ecp.xshd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008">
<Color name="Comment" foreground="Green" />
<Color name="String" foreground="#fff99157" />
<Color name="NumberLiteral" foreground="#ff99cc99"/>
<Color name="NumberLiteral" foreground="#ff9966ff"/>
<Color name="Keywords" fontWeight="bold" foreground="Blue" />
<Color name="Funcs" fontWeight="bold" foreground="LightBlue" />
<Color name="GamePadKey" fontWeight="bold" foreground="Red" />
<Color name="Variable" foreground="#ffcc6600" />
<Color name="Constant" foreground="#ff996633" />

<RuleSet name="CommentMarkerSet">
<Keywords fontWeight="bold" foreground="#fff2777a">
Expand All @@ -27,6 +29,13 @@
<End>"</End>
</Span>

<!-- 变量和常量必须在关键字之前匹配 -->
<Rule color="Variable">\$[\w]+</Rule>
<Rule color="Constant">_[\w]+</Rule>

<!-- 数字 -->
<Rule color="NumberLiteral">\b\d+(\.\d+)?([eE][+-]?\d+)?</Rule>

<Keywords color="Keywords">
<Word>IMPORT</Word>
<Word>FOR</Word>
Expand Down