Fix Kode/Kha#1312

CHANGELOG.md

@@ -1,5 +1,10 @@
 ### 21.3.7
 
+* Make things work with vshaxe 2.23.0
+* Update Kha
+
+### 21.3.7
+
 * Pimp macOS support
 * Update Kha
 

extension.js

@@ -91,6 +91,18 @@ function compile(target, silent) {
 	});
 }
 
+let KhaHaxeInstallationProvider = {
+	activate: (provideInstallation) => {
+		provideInstallation({
+			haxeExecutable: path.join(findKha(), 'Tools', 'haxe', 'haxe' + sys()),
+			haxelibExecutable: null,
+			standardLibraryPath: path.join(findKha(), 'Tools', 'haxe', 'std')
+		});
+	},
+
+	deactivate: () => {}
+}
+
 let KhaDisplayArgumentsProvider = {
 	init: (api, activationChangedCallback) => {
 		this.api = api;
@@ -139,33 +151,22 @@ function sys() {
 	}
 }
 
-function updateHaxe(vshaxe) {
-	vshaxe.haxeExecutable.configuration.executable = path.join(findKha(), 'Tools', 'haxe', 'haxe' + sys());
-	vshaxe.haxeExecutable.configuration.isCommand = false;
-	vshaxe.haxeExecutable.configuration.env = {
-		'HAXE_STD_PATH': path.join(findKha(), 'Tools', 'haxe', 'std')
-	};
-	vshaxe.haxeExecutable._onDidChangeConfiguration.fire(vshaxe.haxeExecutable.configuration);
-}
-
 function configureVsHaxe(rootPath) {
 	let vshaxe = vscode.extensions.getExtension('nadako.vshaxe').exports;
 	KhaDisplayArgumentsProvider.init(vshaxe, (active) => {
 		if (!active) return;
 
 		const hxmlPath = path.join(rootPath, 'build', 'project-debug-html5.hxml');
 		if (fs.existsSync(hxmlPath)) {
-			updateHaxe(vshaxe);
 			updateHaxeArguments(rootPath, hxmlPath);
 		}
 		else {
 			compile('debug-html5', true).then(() => {
-				updateHaxe(vshaxe);
 				updateHaxeArguments(rootPath, hxmlPath);
 			});
 		}
 	});
-	updateHaxe(vshaxe);
+	vshaxe.registerHaxeInstallationProvider('Kha', KhaHaxeInstallationProvider);
 	vshaxe.registerDisplayArgumentsProvider('Kha', KhaDisplayArgumentsProvider);
 }
 

package.json

@@ -2,7 +2,7 @@
 	"name": "kha",
 	"displayName": "Kha",
 	"description": "Kha support",
-	"version": "21.3.7",
+	"version": "21.3.8",
 	"publisher": "kodetech",
 	"engines": {
 		"vscode": "^1.31.0"