Remove grammar fields from extension manifests

Syntax highlighting (parser.wasm + highlights.scm) is now bundled in
Athas core and served from the CDN by convention. Extensions no longer
need to declare capabilities.grammar — the editor falls back to
CDN paths automatically. This simplifies extensions to only declare
tooling capabilities (LSP, formatter, linter). Updated docs, build
script, and regenerated catalog files.

Author: mehmetozguldev

CONTRIBUTING.md

@@ -1,19 +1,17 @@
 # Contributing Extensions
 
-This repository contains extensions for the [Athas](https://athas.dev) editor. Extensions can provide language support (syntax highlighting, LSP, formatting, linting), themes, icon themes, snippets, keymaps, and more.
+This repository contains extensions for the [Athas](https://athas.dev) editor. Extensions can provide language tooling support (LSP, formatting, linting, snippets), themes, icon themes, keymaps, and more.
+
+Syntax highlighting is bundled in Athas core and is not managed by these extensions.
 
 ## Repository Structure
 
 ```
 extensions/
   bash/
     extension.json      # Extension manifest
-    parser.wasm         # Tree-sitter WASM grammar
-    highlights.scm      # Tree-sitter highlight queries
   lua/
     extension.json      # Extension manifest
-    parser.wasm
-    highlights.scm
     tooling.json        # Platform-specific tooling (pre-built LSP, formatter, linter binaries)
     build.sh            # Build script for tooling archives
   ...
@@ -26,7 +24,6 @@ scripts/                # Validation and generation scripts
 - `extension.json` defines the extension manifest (category, capabilities, tool references)
 - `tooling.json` (optional) defines pre-built platform-specific binaries distributed as tarballs
 - Not every extension has a `tooling.json`. Extensions without one rely on runtime-installed tools
-- `query-sources.json` pins upstream Tree-sitter highlight query sources for opt-in languages
 
 ## Adding a New Extension
 
@@ -41,7 +38,7 @@ scripts/                # Validation and generation scripts
   "name": "MyLang",
   "displayName": "MyLang",
   "version": "1.0.0",
-  "description": "MyLang language support with syntax highlighting",
+  "description": "MyLang language support with LSP",
   "publisher": "Athas",
   "categories": ["Language"],
   "languages": [
@@ -50,54 +47,23 @@ scripts/                # Validation and generation scripts
       "extensions": [".ml"],
       "aliases": ["MyLang"]
     }
-  ],
-  "capabilities": {
-    "grammar": {
-      "wasmPath": "parser.wasm",
-      "highlightQuery": "highlights.scm"
-    }
-  }
+  ]
 }
 ```
 
-3. Add the required files for your extension type (e.g., `parser.wasm` and `highlights.scm` for language extensions).
+3. Add capability entries in `capabilities` only for tooling provided by the extension (`lsp`, `formatter`, `linter`, snippets/commands as needed).
 
-4. Update `registry.json` and `index.json` to include your extension.
-
-5. Regenerate `manifests.json`:
+4. Regenerate generated files:
    ```bash
    bun run scripts/generate-manifests.ts
+   bun run scripts/build-extensions-index.ts
    ```
 
-6. Validate your extension:
+5. Validate your extension:
    ```bash
    bun run scripts/validate.ts
    ```
 
-## Upstream Tree-sitter Queries
-
-For language extensions, prefer pinned upstream queries instead of hand-editing
-`highlights.scm` directly.
-
-1. Add an entry in `query-sources.json` with:
-   - `repository` (e.g. `tree-sitter/tree-sitter-rust`)
-   - `revision` (tag or commit SHA)
-   - `queryPath` (usually `queries/highlights.scm`)
-   - `targetPath` (extension `highlights.scm`)
-   - optional `overridePath` (e.g. `highlights.override.scm`)
-   - optional `replacements` for tiny deterministic patches
-2. Add/modify `<extension>/highlights.override.scm` for local Athas-specific rules.
-3. Run:
-   ```bash
-   bun run scripts/sync-upstream-queries.ts
-   ```
-4. Verify:
-   ```bash
-   bun run scripts/sync-upstream-queries.ts --check
-   ```
-
-`highlights.scm` is treated as generated output for entries in `query-sources.json`.
-
 ## Extension Manifest Format
 
 ### Required Fields
@@ -111,7 +77,7 @@ For language extensions, prefer pinned upstream queries instead of hand-editing
 
 ### Categories
 
-- `Language` - Language support (grammar, LSP, formatter, linter)
+- `Language` - Language tooling support (LSP, formatter, linter, snippets, commands)
 - `Theme` - Editor themes
 - `Snippets` - Code snippets
 - `Keymaps` - Keyboard shortcut presets
@@ -121,15 +87,6 @@ For language extensions, prefer pinned upstream queries instead of hand-editing
 
 ### Language Capabilities
 
-#### Grammar
-
-```json
-"grammar": {
-  "wasmPath": "parser.wasm",
-  "highlightQuery": "highlights.scm"
-}
-```
-
 #### LSP
 
 ```json

README.md

@@ -2,6 +2,9 @@
 
 Extensions for the [Athas](https://athas.dev) editor.
 
+Syntax highlighting is now bundled in Athas core by default. This repository focuses on
+language tooling extensions (LSP, formatter, linter, snippets), plus themes and icon themes.
+
 ## Structure
 
 Each extension lives under `extensions/{name}/`:
@@ -10,8 +13,6 @@ Each extension lives under `extensions/{name}/`:
 extensions/
   lua/
     extension.json    # Extension manifest
-    parser.wasm       # Tree-sitter WASM grammar
-    highlights.scm    # Tree-sitter highlight queries
     tooling.json      # Platform-specific tooling (LSP, formatter, linter binaries)
     build.sh          # Build script for tooling archives
 ```
@@ -26,21 +27,8 @@ Root-level files:
 ```bash
 bun run scripts/validate.ts
 bun run scripts/generate-manifests.ts
-bun run scripts/sync-upstream-queries.ts
 ```
 
-## Upstream Query Sync
-
-Tree-sitter highlight queries can be pinned to upstream grammar repositories via
-`query-sources.json`.
-
-- `highlights.scm` is generated from pinned upstream sources.
-- Use `highlights.override.scm` for local Athas-specific fixes.
-- To verify everything is in sync:
-  ```bash
-  bun run scripts/sync-upstream-queries.ts --check
-  ```
-
 ## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md).

extensions/bash/extension.json

@@ -4,27 +4,40 @@
   "name": "Bash",
   "displayName": "Bash",
   "version": "1.0.0",
-  "description": "Bash/Shell script support with syntax highlighting and LSP",
+  "description": "Bash/Shell script support with LSP",
   "publisher": "Athas",
-  "categories": ["Language"],
+  "categories": [
+    "Language"
+  ],
   "languages": [
     {
       "id": "bash",
-      "extensions": [".sh", ".bash", ".zsh"],
-      "aliases": ["Bash", "Shell", "sh"],
-      "filenames": [".bashrc", ".zshrc", ".bash_profile", ".profile"]
+      "extensions": [
+        ".sh",
+        ".bash",
+        ".zsh"
+      ],
+      "aliases": [
+        "Bash",
+        "Shell",
+        "sh"
+      ],
+      "filenames": [
+        ".bashrc",
+        ".zshrc",
+        ".bash_profile",
+        ".profile"
+      ]
     }
   ],
   "capabilities": {
-    "grammar": {
-      "wasmPath": "parser.wasm",
-      "highlightQuery": "highlights.scm"
-    },
     "lsp": {
       "name": "bash-language-server",
       "runtime": "bun",
       "package": "bash-language-server",
-      "args": ["start"]
+      "args": [
+        "start"
+      ]
     }
   }
 }

extensions/c/extension.json

@@ -4,7 +4,7 @@
   "name": "C",
   "displayName": "C",
   "version": "1.0.0",
-  "description": "C language support with syntax highlighting and LSP",
+  "description": "C language support with LSP",
   "publisher": "Athas",
   "categories": [
     "Language"
@@ -22,10 +22,6 @@
     }
   ],
   "capabilities": {
-    "grammar": {
-      "wasmPath": "parser.wasm",
-      "highlightQuery": "highlights.scm"
-    },
     "lsp": {
       "name": "clangd",
       "runtime": "binary",

extensions/c_sharp/extension.json

@@ -4,7 +4,7 @@
   "name": "CSharp",
   "displayName": "C#",
   "version": "1.0.0",
-  "description": "C# language support with syntax highlighting and LSP",
+  "description": "C# language support with LSP",
   "publisher": "Athas",
   "categories": [
     "Language"
@@ -23,10 +23,6 @@
     }
   ],
   "capabilities": {
-    "grammar": {
-      "wasmPath": "parser.wasm",
-      "highlightQuery": "highlights.scm"
-    },
     "lsp": {
       "name": "omnisharp",
       "runtime": "binary",

extensions/cpp/extension.json

@@ -4,7 +4,7 @@
   "name": "C++",
   "displayName": "C++",
   "version": "1.0.0",
-  "description": "C++ language support with syntax highlighting and LSP",
+  "description": "C++ language support with LSP",
   "publisher": "Athas",
   "categories": [
     "Language"
@@ -27,10 +27,6 @@
     }
   ],
   "capabilities": {
-    "grammar": {
-      "wasmPath": "parser.wasm",
-      "highlightQuery": "highlights.scm"
-    },
     "lsp": {
       "name": "clangd",
       "runtime": "binary",

extensions/css/extension.json

@@ -4,32 +4,42 @@
   "name": "CSS",
   "displayName": "CSS",
   "version": "1.0.0",
-  "description": "CSS language support with syntax highlighting, LSP, and formatting",
+  "description": "CSS language support with LSP and formatting",
   "publisher": "Athas",
-  "categories": ["Language"],
+  "categories": [
+    "Language"
+  ],
   "languages": [
     {
       "id": "css",
-      "extensions": [".css", ".scss", ".sass", ".less"],
-      "aliases": ["CSS"]
+      "extensions": [
+        ".css",
+        ".scss",
+        ".sass",
+        ".less"
+      ],
+      "aliases": [
+        "CSS"
+      ]
     }
   ],
   "capabilities": {
-    "grammar": {
-      "wasmPath": "parser.wasm",
-      "highlightQuery": "highlights.scm"
-    },
     "lsp": {
       "name": "vscode-css-language-server",
       "runtime": "bun",
       "package": "vscode-langservers-extracted",
-      "args": ["--stdio"]
+      "args": [
+        "--stdio"
+      ]
     },
     "formatter": {
       "name": "prettier",
       "runtime": "bun",
       "package": "prettier",
-      "args": ["--stdin-filepath", "${file}"]
+      "args": [
+        "--stdin-filepath",
+        "${file}"
+      ]
     }
   }
 }

extensions/css/tooling.json

@@ -11,13 +11,13 @@
   "capabilities": {
     "type": "language",
     "languageId": "css",
-    "fileExtensions": ["css"],
-    "aliases": ["CSS", "css"],
-    "grammar": {
-      "wasmPath": "parsers/tree-sitter-css.wasm",
-      "highlightQuery": "queries/css/highlights.scm",
-      "scopeName": "source.css"
-    },
+    "fileExtensions": [
+      "css"
+    ],
+    "aliases": [
+      "CSS",
+      "css"
+    ],
     "lsp": {
       "server": {
         "darwin-arm64": "lsp/node_modules/vscode-css-languageserver-bin/cssServerMain.js",
@@ -26,9 +26,15 @@
         "linux-arm64": "lsp/node_modules/vscode-css-languageserver-bin/cssServerMain.js",
         "win32-x64": "lsp/node_modules/vscode-css-languageserver-bin/cssServerMain.js"
       },
-      "args": ["--stdio"],
-      "fileExtensions": [".css"],
-      "languageIds": ["css"]
+      "args": [
+        "--stdio"
+      ],
+      "fileExtensions": [
+        ".css"
+      ],
+      "languageIds": [
+        "css"
+      ]
     }
   },
   "installation": {

extensions/dart/extension.json

@@ -4,7 +4,7 @@
   "name": "Dart",
   "displayName": "Dart",
   "version": "1.0.0",
-  "description": "Dart language support with syntax highlighting and LSP",
+  "description": "Dart language support with LSP",
   "publisher": "Athas",
   "categories": [
     "Language"
@@ -21,10 +21,6 @@
     }
   ],
   "capabilities": {
-    "grammar": {
-      "wasmPath": "parser.wasm",
-      "highlightQuery": "highlights.scm"
-    },
     "lsp": {
       "name": "dart",
       "runtime": "binary",