Skip to content

Commit e6decd8

Browse files
committed
Emit omarchy-format vscode.json pointing at bundled extension
1 parent 8cd7512 commit e6decd8

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

cli/inspect.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func runListApps(args []string, templatesFS embed.FS) int {
5353
apps := make([]string, 0, len(names))
5454
seen := make(map[string]bool)
5555
for _, name := range names {
56-
if name == "copy.json" || name == "vscode.empty.json" {
56+
if name == "copy.json" {
5757
continue
5858
}
5959
app := theme.GetAppNameFromFileName(name)

frontend/src/lib/components/layout/TargetAppsStrip.svelte

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
1919
onMount(async () => {
2020
// Specials always appear: GetTemplateColors filters out apps whose
21-
// templates have no color variables (vscode.empty.json) or whose
22-
// filename mangles to a hidden internal name (aether.zed.json →
23-
// "aether" → dropped). Inject them unconditionally.
21+
// templates have no color variables (vscode.json — just a pointer
22+
// to the bundled extension) or whose filename mangles to a hidden
23+
// internal name (aether.zed.json → "aether" → dropped). Inject
24+
// them unconditionally.
2425
try {
2526
const {GetTemplateColors} = await import(
2627
'../../../../wailsjs/go/main/App'

internal/theme/writer.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,17 +253,13 @@ func (w *Writer) processTemplates(
253253
continue
254254
}
255255

256-
outputPath := filepath.Join(outputDir, fileName)
257-
258-
// Handle vscode.empty.json: write as vscode.json when VSCode is disabled
259-
if fileName == "vscode.empty.json" {
260-
if !settings.IncludeVscode {
261-
vscodeOutputPath := filepath.Join(outputDir, "vscode.json")
262-
w.processTemplate(fileName, vscodeOutputPath, variables, appOverrides)
263-
}
256+
// Skip vscode.json if includeVscode is false
257+
if fileName == "vscode.json" && !settings.IncludeVscode {
264258
continue
265259
}
266260

261+
outputPath := filepath.Join(outputDir, fileName)
262+
267263
// Handle neovim.lua with custom config selection
268264
if fileName == "neovim.lua" && settings.SelectedNeovimConfig != "" {
269265
if err := platform.WriteText(outputPath, settings.SelectedNeovimConfig); err != nil {

templates/vscode.empty.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

templates/vscode.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "Aether",
3+
"extension": "local.theme-aether"
4+
}

0 commit comments

Comments
 (0)