fix: v0.4.0 Add .kasm to activate language server

Author: cybersorcerer

README.md

@@ -16,7 +16,7 @@ All syntax highlighting and code analysis comes from the **kickass_ls** language
 
 ### Kick Assembler Integration
 
-- Assemble `.asm` and `.s` files with Kick Assembler
+- Assemble `.asm` and `.kasm` files with Kick Assembler
 - Errors and warnings appear in the Problems panel
 - Detailed output in the "Kick Assembler" output channel
 - 60-second timeout protection for long-running builds
@@ -175,11 +175,20 @@ All shortcuts are active when editing Kick Assembler files.
 | `Ctrl+Shift+U` | `Cmd+Shift+U` | Assemble, Upload and Run on C64 Ultimate |
 | `Ctrl+Shift+B` | `Cmd+Shift+B` | C64U File Browser |
 
+## Supported File Extensions
+
+| Extension | Description |
+| --------- | ----------- |
+| `.asm` | Standard assembler file — the language server activates for all `.asm` files regardless of the detected language |
+| `.kasm` | Kick Assembler file — always recognized as Kick Assembler, use this to avoid conflicts with other assembler extensions (e.g. HLASM) |
+
+If another extension claims the `.asm` file association, the language server still activates via file pattern matching. For guaranteed Kick Assembler detection, rename your files to `.kasm`.
+
 ## Usage
 
 ### Basic Workflow
 
-1. Open a `.asm` or `.s` file — syntax highlighting and diagnostics activate automatically
+1. Open a `.asm` or `.kasm` file — syntax highlighting and diagnostics activate automatically
 2. Assemble with `Ctrl+Shift+A` — errors appear in the Problems panel
 3. Run with `Ctrl+Shift+R` — launches VICE with your program
 4. Or combine with `Ctrl+Shift+X` — assembles and runs in one step
@@ -246,8 +255,10 @@ Releases are built automatically via GitHub Actions when a version tag is pushed
 
 ### Language Server Not Starting
 
-1. Check that `kickass_ls` is installed and in PATH, or use the bundled binary
-2. Or configure an explicit path:
+1. Make sure your file has a `.asm` or `.kasm` extension
+2. If another extension claims `.asm` files, rename to `.kasm` or change the language mode to "Kick Assembler" in the VS Code status bar
+3. Check that `kickass_ls` is installed and in PATH, or use the bundled binary
+4. Or configure an explicit path:
 
    ```json
    { "c64.kickassLsBinary": "/usr/local/bin/kickass_ls" }

package.json

@@ -2,7 +2,7 @@
   "name": "c64-vscode",
   "displayName": "C64 Assembler Development",
   "description": "Complete C64 development environment with Kick Assembler, LSP support, VICE emulator, and C64 Ultimate integration",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "publisher": "cybersorcerer",
   "license": "Apache-2.0",
   "repository": {
@@ -58,7 +58,7 @@
         ],
         "extensions": [
           ".asm",
-          ".s"
+          ".kasm"
         ],
         "configuration": "./language-configuration.json"
       }

src/extension.ts

@@ -162,7 +162,7 @@ export function activate(context: vscode.ExtensionContext) {
                 vscode.window.showErrorMessage('No active editor');
                 return;
             }
-            const prgPath = editor.document.uri.fsPath.replace(/\.(asm|s)$/, '.prg');
+            const prgPath = editor.document.uri.fsPath.replace(/\.(asm|kasm)$/, '.prg');
             await viceService.run(prgPath);
         })
     );
@@ -176,7 +176,7 @@ export function activate(context: vscode.ExtensionContext) {
             }
             const success = await kickassService.assemble(editor.document.uri.fsPath);
             if (success) {
-                const prgPath = editor.document.uri.fsPath.replace(/\.(asm|s)$/, '.prg');
+                const prgPath = editor.document.uri.fsPath.replace(/\.(asm|kasm)$/, '.prg');
                 await viceService.run(prgPath);
             }
         })
@@ -192,7 +192,7 @@ export function activate(context: vscode.ExtensionContext) {
             }
             const success = await kickassService.assemble(editor.document.uri.fsPath);
             if (success) {
-                const prgPath = editor.document.uri.fsPath.replace(/\.(asm|s)$/, '.prg');
+                const prgPath = editor.document.uri.fsPath.replace(/\.(asm|kasm)$/, '.prg');
                 await c64uService!.uploadAndRun(prgPath);
             }
         })
@@ -278,7 +278,7 @@ export function activate(context: vscode.ExtensionContext) {
     // Clear diagnostics when a document is closed
     context.subscriptions.push(
         vscode.workspace.onDidCloseTextDocument(document => {
-            if (document.fileName.endsWith('.asm') || document.fileName.endsWith('.s')) {
+            if (document.fileName.endsWith('.asm') || document.fileName.endsWith('.kasm')) {
                 kickassService.clearDiagnostics(document.uri);
             }
         })
@@ -303,9 +303,13 @@ function startLanguageServer(context: vscode.ExtensionContext) {
 
     // LSP client options with semantic tokens support
     const clientOptions: LanguageClientOptions = {
-        documentSelector: [{ scheme: 'file', language: 'kickass' }],
+        documentSelector: [
+            { scheme: 'file', language: 'kickass' },
+            { scheme: 'file', pattern: '**/*.asm' },
+            { scheme: 'file', pattern: '**/*.kasm' }
+        ],
         synchronize: {
-            fileEvents: vscode.workspace.createFileSystemWatcher('**/*.{asm,s}')
+            fileEvents: vscode.workspace.createFileSystemWatcher('**/*.{asm,kasm}')
         },
         initializationOptions: {
             settings: { kickass_ls: getKickassLsSettings() }
@@ -373,7 +377,7 @@ function autoDetectKickassFiles(context: vscode.ExtensionContext) {
 
     // Helper function to set language if needed
     const checkAndSetLanguage = (document: vscode.TextDocument) => {
-        if ((document.fileName.endsWith('.asm') || document.fileName.endsWith('.s')) &&
+        if ((document.fileName.endsWith('.asm') || document.fileName.endsWith('.kasm')) &&
             document.languageId !== 'kickass') {
 
             // For .asm files, be more aggressive - check patterns
@@ -394,7 +398,7 @@ function autoDetectKickassFiles(context: vscode.ExtensionContext) {
     // Watch for newly opened documents
     context.subscriptions.push(
         vscode.workspace.onDidOpenTextDocument(document => {
-            if (document.fileName.endsWith('.asm') || document.fileName.endsWith('.s')) {
+            if (document.fileName.endsWith('.asm') || document.fileName.endsWith('.kasm')) {
                 console.log(`Opened file: ${document.fileName}, current language: ${document.languageId}`);
 
                 // Check immediately first

src/kickassembler.ts

@@ -28,7 +28,7 @@ export class KickassemblerService {
         }
 
         const outputDir = path.dirname(filePath);
-        const outputFile = filePath.replace(/\.(asm|s)$/, '.prg');
+        const outputFile = filePath.replace(/\.(asm|kasm)$/, '.prg');
 
         // Clear previous diagnostics
         this.diagnosticCollection.clear();