Merge branch 'main' into perf

Author: textGamex

.github/workflows/release.yml

@@ -47,7 +47,7 @@ jobs:
         user-email: ${{ github.event.inputs.email }}
       run: dotnet run --project build -- -t Release
     - name: Publish to Open VSX Registry
-      uses: HaaLeo/publish-vscode-extension@v1
+      uses: HaaLeo/publish-vscode-extension@v2
       id: publishToOpenVSX
       with:
         packagePath: "./release"

.vscode-test.js

@@ -1,16 +1,12 @@
 
-/** @type {import('@vscode/test-cli').TestConfig} */
+/** @type {import('@vscode/test-cli').IBaseTestConfiguration} */
 module.exports = {
   vscode: 'stable',
   extensionDevelopmentPath: "release",
-  // extensionTestsEnv: { NODE_ENV: 'test' },
-  // extensionTestsPath: './release/bin/client/test/suite',
   files: './release/bin/client/test/suite/**/*.test.js',
+  workspaceFolder: "./release/bin/client/test/sample",
   launchArgs: [
-    // Sample workspace the tests expect
-    './client/test/sample',
     // Bring the file under test into the workspace
     './client/test/sample/events/irm.txt'
   ]
-  // workplaceFolder: "D:\Synced\Git\Personal\cwtools-vscode\client\test\sample mod"
 }

.vscode/launch.json

@@ -23,14 +23,16 @@
     "name": "Extension Tests",
     "type": "extensionHost",
     "request": "launch",
-    "runtimeExecutable": "${execPath}",
-    "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}/release",
-        "--extensionTestsPath=${workspaceFolder}/release/bin/client/test/suite/index"
-    ],
-    "outFiles": [
-        "${workspaceFolder}/release/bin/client/test/**/*.js"
-    ]
+    "preLaunchTask": "UpdateBuild",
+    // "runtimeExecutable": "${execPath}",
+    "testConfiguration": "${workspaceFolder}/.vscode-test.js",
+    // "args": [
+        // "--extensionDevelopmentPath=${workspaceFolder}/release",
+        // "--extensionTestsPath=${workspaceFolder}/release/bin/client/test/suite/index"
+    // ],
+    // "outFiles": [
+        // "${workspaceFolder}/release/bin/client/test/**/*.js"
+    // ]
 },
         {
             "preLaunchTask": "UpdateBuildDebug",

CHANGELOG.md

@@ -1,6 +1,18 @@
-### 0.10.27-pre
+### 0.10.30
+* HOI4: Add country_metadata, music, portraits, and sound folders to cache
+
+### 0.10.29
+* Add "integrated_dlc" directory
+
+### 0.10.28
+* Add basic support for EU5
+* Fix DLC references
+* Fix completion replacement range
+
+### 0.10.27
 * Remove unused config settings
 * Added chinese localisation for extension setings and actions
+* Various performance improvements
 
 ### 0.10.26
 * Fix stellaris log parsing

CLAUDE.md

@@ -0,0 +1,77 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+CWTools is a Visual Studio Code extension that provides language services for Paradox Interactive game modding, supporting games like Stellaris, Hearts of Iron IV, Europa Universalis IV, Crusader Kings II/III, Victoria 2/3, and Imperator: Rome. The extension offers syntax validation, autocomplete, tooltips, localization checking, and visual graph analysis for game scripts.
+
+## Architecture
+
+This is a hybrid .NET/TypeScript VS Code extension with three main components:
+
+### Backend (.NET/F#)
+- **Main** (`src/Main/`): Core F# language server providing validation, completion, and analysis
+- **LSP** (`src/LSP/`): Language Server Protocol implementation in F#  
+- **CSharpExtensions** (`src/CSharpExtensions/`): C# helper utilities
+- Dependencies: Uses CWTools library via Paket (git submodule in `paket-files/`)
+
+### Frontend (TypeScript)
+- **Client Extension** (`client/extension/`): VS Code extension host and commands
+- **Webview** (`client/webview/`): Graph visualization using Cytoscape.js
+- **Test Suite** (`client/test/`): Extension tests with sample Stellaris mod files
+
+### Build System
+- **FAKE build script** (`build/Program.fs`): Cross-platform F# build automation
+- **TypeScript compilation**: Uses `tsc` and `rollup` for client bundling
+- **Release packaging**: Creates `.vsix` files for VS Code marketplace
+
+## Development Commands
+
+### Building
+```bash
+# Windows
+./build.cmd QuickBuild
+
+# Unix/Linux  
+./build.sh QuickBuild
+
+# Debug build
+./build.cmd QuickBuildDebug
+```
+
+### TypeScript Client
+```bash
+npm install
+npm run compile  # Compile TypeScript + bundle webview
+npm test        # Run VS Code extension tests
+```
+
+### Available Build Targets
+- `QuickBuild`: Build for local development (Release)
+- `QuickBuildDebug`: Build for local development (Debug)  
+- `DryRelease`: Full package build without publishing
+- `Release`: Full build + publish to marketplace
+
+### Testing
+VS Code extension tests are located in `client/test/suite/` and use the sample Stellaris mod in `client/test/sample/` for validation scenarios.
+
+## Key Files
+
+- `package.json`: Node.js dependencies and scripts for TypeScript client
+- `release/package.json`: VS Code extension manifest and configuration
+- `fsharp-language-server.sln`: .NET solution with F# projects
+- `paket.dependencies`: .NET package management
+- Build scripts: `build.cmd` (Windows) / `build.sh` (Unix)
+
+## Development Workflow
+
+1. Use `./build.cmd QuickBuild` for initial setup and F# server compilation
+2. Use `npm run compile` for TypeScript changes during development  
+3. Debug by launching "Launch Extension" configuration in VS Code
+4. Test with sample Paradox game mod files in `client/test/sample/`
+5. Run tests with `npm test` before committing changes
+
+## CWTools Integration
+
+The extension integrates with the CWTools library (F# game script parser/validator) via git submodule. The build system automatically pulls the latest CWTools when building the language server.

README.md

@@ -36,6 +36,27 @@ This extension is still in preview, it may not work, it may stop working at any
   * and a number of other specific validators
 * "Code actions" to generate .yml for missing localisation
 
+## Usage
+
+1. Install this extension
+2. Open your mod folder directly, which should be within a folder containing the game name:
+
+* `C:\Users\name\Documents\Paradox Interactive\Stellaris\mod\your_mod`
+
+3. Follow the prompts to select your vanilla folder
+4. Edit files and watch syntax errors show up when you make mistakes
+5. Wait up to a minute for the extension to scan your mod and find errors
+
+### Multiple mods - workspace
+
+If you have multiple mods that need to be loaded at once, use VS Code's [multi-root workspace](https://code.visualstudio.com/docs/editing/workspaces/workspaces#_untitled-multiroot-workspaces) feature.
+
+1. Open your first mod
+2. Use "File", "Add folder to workspace" to add your next mod
+3. cwtools should reload including both mods and vanilla in context using correct mod load order
+
+If you want to browse vanilla files, you can use the "CWTOOLS LOADED FILES" section in the Explorer tab.
+
 ### Completion
 
 ![Completion](https://raw.githubusercontent.com/cwtools/cwtools-vscode/refs/heads/main/release/docs/completion.gif)
@@ -64,22 +85,6 @@ This extension is still in preview, it may not work, it may stop working at any
 
 ![Find all references](https://raw.githubusercontent.com/cwtools/cwtools-vscode/refs/heads/main/release/docs/findallrefs.png)
 
-## Usage
-
-1. Install this extension
-2. If on linux, possibly follow [these instructions](https://code.visualstudio.com/docs/setup/linux#_error-enospc)
-3. Either open your mod folder directly
-4. or open the Game folder containing your mods. E.g. for Stellaris this can be one of:
-    * "C:\Users\name\Paradox Interactive\Stellaris"
-    * "C:\Program Files(x86)\Steam\steamapps\common\Stellaris"
-
-    or on linux
-    * "/home/name/.local/share/Paradox Interactive/Stellars"
-    * "/home/name/.steam/steam/steamapps/common/Stellaris"
-5. Follow the prompts to select your vanilla folder
-6. Edit files and watch syntax errors show up when you make mistakes
-7. Wait up to a minute for the extension to scan all your mods and find all errors
-
 ## Links
 
 * [vic2-config](https://github.com/cwtools/cwtools-vic2-config)

build/Program.fs

@@ -241,6 +241,9 @@ let initTargets () =
 
     Target.create "CopyHtml" (fun _ -> !!("client/webview/*.css") |> Shell.copyFiles "release/bin/client/webview")
 
+    Target.create "CopyTestSamples" (fun _ ->
+        Shell.copyDir "release/bin/client/test/sample" "client/test/sample" (fun _ -> true))
+
 
     Target.create "BuildPackage" (fun _ -> buildPackage "release")
 
@@ -293,6 +296,7 @@ let buildTargetTree () =
     ==> "BuildClient"
     ==> "CopyDocs"
     ==> "CopyHtml"
+    ==> "CopyTestSamples"
     ==> "PrepareClient"
     ==> "PrePackage"
     ==>! "BuildPackage"

client/extension/extension.ts

@@ -8,7 +8,7 @@ import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
 import * as vs from 'vscode';
-import { workspace, ExtensionContext, window, Disposable, Position, Uri, WorkspaceEdit, TextEdit, Range, commands, env } from 'vscode';
+import { workspace, ExtensionContext, window, Disposable, Uri, WorkspaceEdit, TextEdit, Range, commands, env } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, NotificationType, ExecuteCommandRequest, ExecuteCommandParams, RevealOutputChannelOn } from 'vscode-languageclient/node';
 
 import { FileExplorer, FileListItem } from './fileExplorer';
@@ -24,6 +24,7 @@ const irRemote = `https://github.com/cwtools/cwtools-ir-config`;
 const vic2Remote = `https://github.com/cwtools/cwtools-vic2-config`;
 const vic3Remote = `https://github.com/cwtools/cwtools-vic3-config`;
 const ck3Remote = `https://github.com/cwtools/cwtools-ck3-config`;
+const eu5Remote = `https://github.com/kaiser-chris/cwtools-eu5-config`;
 
 export let defaultClient: LanguageClient;
 let fileList : FileListItem[];
@@ -75,6 +76,7 @@ export async function activate(context: ExtensionContext) {
 			case "vic2": repoPath = vic2Remote; break;
 			case "vic3": repoPath = vic3Remote; break;
 			case "ck3": repoPath = ck3Remote; break;
+			case "eu5": repoPath = eu5Remote; break;
 			default: repoPath = stellarisRemote; break;
 		}
 		console.log(language + " " + repoPath);
@@ -100,7 +102,7 @@ export async function activate(context: ExtensionContext) {
 			// Register the server for F# documents
 			documentSelector: [{ scheme: 'file', language: 'paradox' }, { scheme: 'file', language: 'yaml' }, { scheme: 'file', language: 'stellaris' },
 				{ scheme: 'file', language: 'hoi4' }, { scheme: 'file', language: 'eu4' }, { scheme: 'file', language: 'ck2' }, { scheme: 'file', language: 'imperator' }
-				, { scheme: 'file', language: 'vic2' }, { scheme: 'file', language: 'vic3' }, { scheme: 'file', language: 'ck3' }, { scheme: 'file', language: 'paradox'}],
+				, { scheme: 'file', language: 'vic2' }, { scheme: 'file', language: 'vic3' }, { scheme: 'file', language: 'ck3' }, { scheme: 'file', language: 'eu5' }, { scheme: 'file', language: 'paradox'}],
 			synchronize: {
 				// Synchronize the setting section 'languageServerExample' to the server
 				configurationSection: 'cwtools',
@@ -109,7 +111,7 @@ export async function activate(context: ExtensionContext) {
 				fileEvents: fileEvents
 			},
 			initializationOptions: {
-				language: language,
+				language: language === 'eu5' ? 'paradox' : language,
 				isVanillaFolder: isVanillaFolder,
 				rulesCache: cacheDir,
 				rules_version: workspace.getConfiguration('cwtools').get('rules_version'),
@@ -133,7 +135,6 @@ export async function activate(context: ExtensionContext) {
 		const promptVanillaPath = new NotificationType<string>('promptVanillaPath')
 		interface DidFocusFile { uri : string }
 		const didFocusFile = new NotificationType<DidFocusFile>('didFocusFile')
-		interface GetWordRangeAtPositionParams { position : Position, uri: string }
 		let status: Disposable;
 		interface UpdateFileList { fileList: FileListItem[] }
 		const updateFileList = new NotificationType<UpdateFileList>('updateFileList');
@@ -227,6 +228,7 @@ export async function activate(context: ExtensionContext) {
 				case "vic2": gameDisplay = "Victoria II"; break;
 				case "vic3": gameDisplay = "Victoria 3"; break;
 				case "ck3": gameDisplay = "Crusader Kings III"; break;
+				case "eu5": gameDisplay = "Europa Universalis V"; break;
 			}
 			const result = await window.showInformationMessage("Please select the vanilla installation folder for " + gameDisplay, "Select folder");
 			if(!result) {
@@ -268,6 +270,10 @@ export async function activate(context: ExtensionContext) {
 					game = "imperator";
 					dir = path.join(dir, "game");
 					break;
+                case "Europa Universalis V":
+                    game = "eu5";
+                    dir = path.join(dir, "game");
+                    break;
 			}
 			console.log(path.join(dir, "common"));
 			if (game === "" || !(fs.existsSync(path.join(dir, "common")))) {
@@ -366,7 +372,7 @@ export async function activate(context: ExtensionContext) {
 	}
 
 	let languageId : string;
-	const knownLanguageIds = ["stellaris", "eu4", "hoi4", "ck2", "imperator", "vic2", "vic3", "ck3"];
+	const knownLanguageIds = ["stellaris", "eu4", "hoi4", "ck2", "imperator", "vic2", "vic3", "ck3", "eu5"];
 	const getLanguageIdFallback = async function() {
 		const markerFiles = await workspace.findFiles("**/*.txt", null, 1);
 		if (markerFiles.length == 1) {
@@ -389,6 +395,7 @@ export async function activate(context: ExtensionContext) {
 		case "vic2": languageId = "vic2"; break;
 		case "vic3": languageId = "vic3"; break;
 		case "ck3": languageId = "ck3"; break;
+        case "eu5": languageId = "eu5"; break;
 		default: languageId = "paradox"; break;
 	}
 	async function findExeInFiles(gameExeName: string, binariesPrefix = false) {
@@ -422,6 +429,7 @@ export async function activate(context: ExtensionContext) {
 		{ id: "vic2", exeName: "v2game", binariesPrefix: false },
 		{ id: "ck3", exeName: "ck3", binariesPrefix: true },
 		{ id: "vic3", exeName: "victoria3", binariesPrefix: true },
+        { id: "eu5", exeName: "eu5", binariesPrefix: true },
 	];
 
 	const promises = games.map(({ exeName, binariesPrefix }) =>