Skip to content

fix: remove hardcoded theme colors and rely on semanticTokenScopes #9

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

Merged
setu4993 merged 6 commits into from
Apr 23, 2026
+6 −218
Merged

fix: remove hardcoded theme colors and rely on semanticTokenScopes #9

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
17a9f5f
Add TextMate grammar and remove hardcoded theme colors
marcelinollano Apr 21, 2026
22b92a7
Remove sync-theme script and update theme.ts comment
marcelinollano Apr 21, 2026
5524538
Remove dead buildVscodeRules export and fix template lone-brace token…
marcelinollano Apr 21, 2026
c39fa7e
fix: remove TextMate grammar and fix decorator semantic token scope
marcelinollano Apr 22, 2026
5e7ce96
fix: restore buildVscodeRules export to avoid breaking external consu…
marcelinollano Apr 23, 2026
096e4d1
Merge branch 'main' into semantic-token-scopes
marcelinollano Apr 23, 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
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"typecheck": "turbo run typecheck",
"clean": "turbo run clean",
"extract-diagnostics": "tsx scripts/extract-diagnostics.ts",
"sync-theme": "tsx scripts/sync-vscode-theme.ts",
"dev": "turbo run dev --parallel",
"docs:dev": "pnpm --filter @agentscript/docs dev",
"docs:build": "pnpm --filter @agentscript/docs build",
Expand Down
1 change: 0 additions & 1 deletion packages/monaco/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export {
darkThemeColors,
lightThemeColors,
buildMonacoRules,
buildVscodeRules,

@awli awli Apr 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope this isn't used in Monaco

} from './theme';
export type { ThemeColors, TokenStyle } from './theme';

Expand Down
43 changes: 2 additions & 41 deletions packages/monaco/src/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@
/**
* AgentScript theme color definitions — SINGLE SOURCE OF TRUTH.
*
* All syntax highlighting colors for both Monaco and VS Code are defined here.
* Monaco imports these directly. VS Code's package.json is synced via:
*
* pnpm sync-theme
*
* Run that command after changing any colors here.
* All syntax highlighting colors for Monaco are defined here.
* Monaco imports these directly.
*/

export interface TokenStyle {
Expand Down Expand Up @@ -103,38 +99,3 @@ export function buildMonacoRules(
return rules;
}

/**
* Build VS Code semanticTokenColorCustomizations rules from color definitions.
* Returns an object suitable for package.json configurationDefaults.
*/
type VscodeRule =
| string
| { foreground?: string; bold?: boolean; italic?: boolean };

export function buildVscodeRules(
colors: ThemeColors
): Record<string, VscodeRule> {
const rules: Record<string, VscodeRule> = {};

for (const [token, style] of Object.entries(colors)) {
if (token === 'default') continue;

const key = `${token}:agentscript`;
const hasExplicitFontStyle =
style.bold !== undefined || style.italic !== undefined;

if (hasExplicitFontStyle) {
rules[key] = {
...(style.foreground
? { foreground: `#${style.foreground.toUpperCase()}` }
: {}),
...(style.bold !== undefined ? { bold: style.bold } : {}),
...(style.italic !== undefined ? { italic: style.italic } : {}),
};
} else if (style.foreground) {
rules[key] = `#${style.foreground.toUpperCase()}`;
}
}

return rules;
}
1 change: 0 additions & 1 deletion packages/vscode/esbuild.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ function stageForPackaging() {
cpSync(join(__dirname, 'icons'), join(stagingDir, 'icons'), {
recursive: true,
});

for (const file of [
'LICENSE.txt',
'CHANGELOG.md',
Expand Down
170 changes: 4 additions & 166 deletions packages/vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
},
"activationEvents": [],
"scripts": {
"prebuild": "tsx ../../scripts/sync-vscode-theme.ts",
"build": "node esbuild.mjs",
"dev": "node esbuild.mjs --watch",
"typecheck": "tsc --noEmit",
Expand Down Expand Up @@ -81,16 +80,16 @@
"constant.language.agentscript"
],
"string": [
"string.quoted.agentscript"
"string.quoted.double.agentscript"
],
"number": [
"constant.numeric.agentscript"
],
"comment": [
"comment.line.agentscript"
"comment.line.number-sign.agentscript"
],
"namespace": [
"entity.name.type.module.agentscript"
"entity.name.namespace.agentscript"
],
"property": [
"variable.other.property.agentscript"
Expand All @@ -99,7 +98,7 @@
"keyword.operator.agentscript"
],
"decorator": [
"string.regexp.decorator.agentscript"
"support.function.agentscript"
],
"keyword.block": [
"keyword.other.block.agentscript"
Expand All @@ -115,167 +114,6 @@
"[agentscript]": {
"editor.semanticHighlighting.enabled": true,
"editor.bracketPairColorization.enabled": false
},
"editor.semanticTokenColorCustomizations": {
"rules": {
"keyword:agentscript": {
"foreground": "#C586C0",
"bold": true
},
"keyword.modification:agentscript": {
"foreground": "#D7BA7D",
"bold": true,
"italic": true
},
"keyword.block:agentscript": {
"foreground": "#569CD6",
"bold": true
},
"keyword.blockName:agentscript": {
"foreground": "#D7BA7D",
"bold": false
},
"type:agentscript": "#4EC9B0",
"function:agentscript": {
"foreground": "#DCDCAA",
"bold": true
},
"variable:agentscript": "#9CDCFE",
"variable.readonly.defaultLibrary:agentscript": "#569CD6",
"string:agentscript": "#CE9178",
"number:agentscript": "#B5CEA8",
"operator:agentscript": "#D4D4D4",
"comment:agentscript": {
"foreground": "#6A9955",
"italic": true
},
"namespace:agentscript": "#4EC9B0",
"property:agentscript": "#D4D4D4",
"decorator:agentscript": "#E06C75"
},
"[Default Light+]": {
"rules": {
"keyword:agentscript": {
"foreground": "#A626A4",
"bold": true
},
"keyword.modification:agentscript": {
"foreground": "#A626A4",
"bold": true,
"italic": true
},
"keyword.block:agentscript": {
"foreground": "#0550AE",
"bold": true
},
"keyword.blockName:agentscript": {
"foreground": "#A626A4",
"bold": false
},
"type:agentscript": "#0A6577",
"function:agentscript": {
"foreground": "#B45309",
"bold": true
},
"variable:agentscript": "#24292F",
"variable.readonly.defaultLibrary:agentscript": {
"foreground": "#A626A4",
"bold": true
},
"string:agentscript": "#A31415",
"number:agentscript": "#7A3E00",
"operator:agentscript": "#586069",
"comment:agentscript": {
"foreground": "#6B7783",
"italic": true
},
"namespace:agentscript": "#A31415",
"property:agentscript": "#111DFF",
"decorator:agentscript": "#A31415"
}
},
"[Default Light Modern]": {
"rules": {
"keyword:agentscript": {
"foreground": "#A626A4",
"bold": true
},
"keyword.modification:agentscript": {
"foreground": "#A626A4",
"bold": true,
"italic": true
},
"keyword.block:agentscript": {
"foreground": "#0550AE",
"bold": true
},
"keyword.blockName:agentscript": {
"foreground": "#A626A4",
"bold": false
},
"type:agentscript": "#0A6577",
"function:agentscript": {
"foreground": "#B45309",
"bold": true
},
"variable:agentscript": "#24292F",
"variable.readonly.defaultLibrary:agentscript": {
"foreground": "#A626A4",
"bold": true
},
"string:agentscript": "#A31415",
"number:agentscript": "#7A3E00",
"operator:agentscript": "#586069",
"comment:agentscript": {
"foreground": "#6B7783",
"italic": true
},
"namespace:agentscript": "#A31415",
"property:agentscript": "#111DFF",
"decorator:agentscript": "#A31415"
}
},
"[Default High Contrast Light]": {
"rules": {
"keyword:agentscript": {
"foreground": "#A626A4",
"bold": true
},
"keyword.modification:agentscript": {
"foreground": "#A626A4",
"bold": true,
"italic": true
},
"keyword.block:agentscript": {
"foreground": "#0550AE",
"bold": true
},
"keyword.blockName:agentscript": {
"foreground": "#A626A4",
"bold": false
},
"type:agentscript": "#0A6577",
"function:agentscript": {
"foreground": "#B45309",
"bold": true
},
"variable:agentscript": "#24292F",
"variable.readonly.defaultLibrary:agentscript": {
"foreground": "#A626A4",
"bold": true
},
"string:agentscript": "#A31415",
"number:agentscript": "#7A3E00",
"operator:agentscript": "#586069",
"comment:agentscript": {
"foreground": "#6B7783",
"italic": true
},
"namespace:agentscript": "#A31415",
"property:agentscript": "#111DFF",
"decorator:agentscript": "#A31415"
}
}
}
},
"configuration": {
Expand Down
44 changes: 0 additions & 44 deletions scripts/sync-vscode-theme.ts
View file
Open in desktop

This file was deleted.