Skip to content

Add syntax.control token type #238

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

Closed
pertsevpv wants to merge 3 commits into from
Closed

Add syntax.control token type #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff4e450
Remove unnecessary
pertsevpv Dec 4, 2025
cba7e56
Add keyword.control token type
pertsevpv Dec 4, 2025
9c73d0e
Add keyword.control token type
pertsevpv Dec 4, 2025
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
1 change: 1 addition & 0 deletions demo-edit-es-module/module/editor.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ export const enum ThemeColor {
LineNumberActiveForeground = 21,

SyntaxKeyword = 30,
SyntaxControl,
SyntaxNull,
SyntaxBoolean,
SyntaxSemi,
Expand Down
33 changes: 18 additions & 15 deletions demo-edit/src/main/java/org/sudu/experiments/editor/ui/colors/EditorColorScheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,22 @@ public class EditorColorScheme {
public static final int LineNumberActiveForeground = 21;

public static final int SyntaxKeyword = 30;
public static final int SyntaxNull = 31;
public static final int SyntaxBoolean = 32;
public static final int SyntaxSemi = 33;
public static final int SyntaxField = 34;
public static final int SyntaxString = 35;
public static final int SyntaxError = 36;
public static final int SyntaxNumeric = 37;
public static final int SyntaxMethod = 38;
public static final int SyntaxComment = 39;
public static final int SyntaxAnnotation = 40;
public static final int SyntaxType = 41;
public static final int SyntaxOperator = 42;
public static final int SyntaxEscapeChar = 43;
public static final int SyntaxCppDirective = 44;
public static final int SyntaxDocumentation = 45;
public static final int SyntaxControl = 31;
public static final int SyntaxNull = 32;
public static final int SyntaxBoolean = 33;
public static final int SyntaxSemi = 34;
public static final int SyntaxField = 35;
public static final int SyntaxString = 36;
public static final int SyntaxError = 37;
public static final int SyntaxNumeric = 38;
public static final int SyntaxMethod = 39;
public static final int SyntaxComment = 40;
public static final int SyntaxAnnotation = 41;
public static final int SyntaxType = 42;
public static final int SyntaxOperator = 43;
public static final int SyntaxEscapeChar = 44;
public static final int SyntaxCppDirective = 45;
public static final int SyntaxDocumentation = 46;

public static final int LastIndex = SyntaxDocumentation + 1;

Expand Down Expand Up @@ -276,6 +277,7 @@ public boolean modify(int m, Color c) {

// syntax
case SyntaxKeyword -> setCodeForeground(ParserConstants.TokenTypes.KEYWORD, c);
case SyntaxControl -> setCodeForeground(ParserConstants.TokenTypes.CONTROL, c);
case SyntaxNull -> setCodeForeground(ParserConstants.TokenTypes.NULL, c);
case SyntaxBoolean -> setCodeForeground(ParserConstants.TokenTypes.BOOLEAN, c);
case SyntaxSemi -> setCodeForeground(ParserConstants.TokenTypes.SEMI, c);
Expand Down Expand Up @@ -361,6 +363,7 @@ public static String name(int n) {
case ActiveLineNumberForeground -> "ActiveLineNumberForeground";
case LineNumberActiveForeground -> "LineNumberActiveForeground";
case SyntaxKeyword -> " SyntaxKeyword";
case SyntaxControl -> " SyntaxControl";
case SyntaxNull -> " SyntaxNull";
case SyntaxBoolean -> " SyntaxBoolean";
case SyntaxSemi -> " SyntaxSemi";
Expand Down
3 changes: 3 additions & 0 deletions demo-edit/src/main/java/org/sudu/experiments/editor/ui/colors/IdeaCodeColors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ static CodeElementColor[] codeElementColorsLight() {
enum ElementsDarcula {
defaultText(Darcula.defaultText),
keyword(Darcula.keyword),
control(Darcula.keyword),
nullLiteral(Darcula.keyword),
booleanLiteral(Darcula.keyword),
semi(Darcula.keyword),
Expand Down Expand Up @@ -68,6 +69,7 @@ enum ElementsDarcula {
enum ElementsLight {
defaultText(Light.defaultText),
keyword(Light.keyword),
control(Light.keyword),
nullLiteral(Light.keyword),
booleanLiteral(Light.keyword),
semi(Light.defaultText),
Expand Down Expand Up @@ -106,6 +108,7 @@ enum ElementsLight {
enum ElementsDark {
defaultText(Dark.defaultText),
keyword(Dark.keyword),
control(Dark.keyword),
nullLiteral(Dark.keyword),
booleanLiteral(Dark.keyword),
semi(Dark.defaultText),
Expand Down
2 changes: 1 addition & 1 deletion demo-edit/src/main/java/org/sudu/experiments/editor/worker/proxy/TypeScriptProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.sudu.experiments.parser.common.base.IntParser;
import org.sudu.experiments.parser.typescript.parser.TypeScriptFirstLinesLexer;
import org.sudu.experiments.parser.typescript.parser.TypeScriptLightParser;
import org.sudu.experiments.parser.typescript.parser.highlighting.TypeScriptIntervalParser;
import org.sudu.experiments.parser.typescript.parser.TypeScriptIntervalParser;

public class TypeScriptProxy extends BaseProxy {

Expand Down
39 changes: 20 additions & 19 deletions parser-common/src/main/java/org/sudu/experiments/parser/ParserConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,26 @@ public interface ParserConstants {
interface TokenTypes {
int DEFAULT = 0;
int KEYWORD = 1;
int NULL = 2;
int BOOLEAN = 3;
int SEMI = 4;
int FIELD = 5;
int STRING = 6;
int ERROR = 7;
int NUMERIC = 8;
int METHOD = 9;
int COMMENT = 10;
int ANNOTATION = 11;
int TYPE = 12;
int OPERATOR = 13;
int ESCAPE_CHAR = 14;
int CPP_DIRECTIVE = 15;
int DOCUMENTATION = 16;

int BR_1 = 17;
int BR_2 = 18;
int BR_3 = 19;
int CONTROL = 2; // keywords such as if-else, break, continue, return etc...
int NULL = 3;
int BOOLEAN = 4;
int SEMI = 5;
int FIELD = 6;
int STRING = 7;
int ERROR = 8;
int NUMERIC = 9;
int METHOD = 10;
int COMMENT = 11;
int ANNOTATION = 12;
int TYPE = 13;
int OPERATOR = 14;
int ESCAPE_CHAR = 15;
int CPP_DIRECTIVE = 16;
int DOCUMENTATION = 17;

int BR_1 = 18;
int BR_2 = 19;
int BR_3 = 20;

int TYPES_LENGTH = BR_3 + 1;

Expand Down
Loading
Loading