Fix null safety errors (#150)

* Fix null safety errors

* idk where is vanilla installation instructions

* update haxe-version

Author: RblSb

.github/workflows/main-vanilla.yml

@@ -10,7 +10,7 @@ jobs:
         # TODO: fix tests on windows and enable again
         # os: [ubuntu-latest, macos-13, windows-latest]
         os: [ubuntu-latest, macos-13]
-        haxe: [latest, "2025-08-04_development_8d19bc5"]
+        haxe: [latest, "2026-03-04_development_033a9fd"]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

.haxerc

@@ -1,4 +1,4 @@
 {
-  "version": "8d19bc5",
+  "version": "033a9fd",
   "resolveLibs": "scoped"
 }

haxe_libraries/safety.hxml

@@ -1,3 +1,3 @@
-# @install: lix --silent download "haxelib:/safety#1.1.2" into safety/1.1.2/haxelib
--cp ${HAXE_LIBCACHE}/safety/1.1.2/haxelib/src
+# @install: lix --silent download "gh://github.com/RealyUniqueName/Safety#b3f1c34ef185d127196b04541950c32b7683863f" into safety/1.1.2/github/b3f1c34ef185d127196b04541950c32b7683863f
+-cp ${HAXE_LIBCACHE}/safety/1.1.2/github/b3f1c34ef185d127196b04541950c32b7683863f/src
 -D safety=1.1.2

haxe_libraries/utest.hxml

@@ -1,4 +1,4 @@
-# @install: lix --silent download "gh://github.com/haxe-utest/utest#bdb5fec4b8e77d9a3c079d9cfb108f29f153721a" into utest/2.0.0-alpha/github/bdb5fec4b8e77d9a3c079d9cfb108f29f153721a
--cp ${HAXE_LIBCACHE}/utest/2.0.0-alpha/github/bdb5fec4b8e77d9a3c079d9cfb108f29f153721a/src
+# @install: lix --silent download "gh://github.com/haxe-utest/utest#a055e05e2e872ae12a32b53d0200612345059c38" into utest/2.0.0-alpha/github/a055e05e2e872ae12a32b53d0200612345059c38
+-cp ${HAXE_LIBCACHE}/utest/2.0.0-alpha/github/a055e05e2e872ae12a32b53d0200612345059c38/src
 -D utest=2.0.0-alpha
 --macro utest.utils.Macro.importEnvSettings()

install.hxml

@@ -4,12 +4,12 @@
 -lib hxparse:git:https://github.com/simn/hxparse#876070ec62a4869de60081f87763e23457a3bda8
 -lib json2object:git:https://github.com/elnabo/json2object#a75859de1e966c09e73591b6c9186086c143fe60
 -lib test-adapter:3.0.0
--lib utest:git:https://github.com/haxe-utest/utest#bdb5fec4b8e77d9a3c079d9cfb108f29f153721a
+-lib utest:git:https://github.com/haxe-utest/utest#a055e05e2e872ae12a32b53d0200612345059c38
 -lib hxnodejs:git:https://github.com/HaxeFoundation/hxnodejs#504066d
 -lib tokentree:1.2.18
 -lib language-server-protocol:git:https://github.com/vshaxe/language-server-protocol-haxe#20a7f976bc83ec6623cc25144c88f4c15a799586
 -lib hxjsonast:1.1.0
 -lib vscode-json-rpc:git:https://github.com/vshaxe/vscode-json-rpc#0160f06bc9df1dd0547f2edf23753540db74ed5b
 -lib rename:3.0.1
 -lib vshaxe-build:git:https://github.com/vshaxe/vshaxe-build#39ab9c6315ae76080e5399391c8fa561daec6d55
--lib safety:1.1.2
+-lib safety:git:https://github.com/RealyUniqueName/Safety#b3f1c34ef185d127196b04541950c32b7683863f

src/haxeLanguageServer/Context.hx

@@ -83,7 +83,7 @@ class Context {
 		haxeDisplayProtocol = new Protocol(@:nullSafety(Off) writeMessage);
 		haxeServer = @:nullSafety(Off) new HaxeServer(this);
 		documents = new TextDocuments();
-		config = new Configuration(languageServerProtocol, kind -> restartServer('$kind configuration was changed'));
+		config = new Configuration(languageServerProtocol, kind -> @:nullSafety(Off) restartServer('$kind configuration was changed'));
 
 		languageServerProtocol.onRequest(InitializeRequest.type, onInitialize);
 		languageServerProtocol.onRequest(ShutdownRequest.type, onShutdown);
@@ -105,7 +105,7 @@ class Context {
 			return; // don't send cancel notifications, not supported by Haxe
 		}
 		final includeDisplayArguments = method.startsWith("display/") || method == ServerMethods.ReadClassPaths;
-		callDisplay(method, [Json.stringify(message)], token, function(result:DisplayResult) {
+		callDisplay(method, [Json.stringify(message)], null, token, function(result:DisplayResult) {
 			switch result {
 				case DResult("") if (method == DisplayMethods.Diagnostics):
 					haxeDisplayProtocol.handleMessage(({
@@ -122,15 +122,14 @@ class Context {
 				Json.parse(error);
 			} catch (_:Any) {
 				// pretend we got a proper JSON (HaxeFoundation/haxe#7955)
+				final errData:HaxeResponseErrorData = {
+					severity: Error,
+					message: error
+				}
 				final message:ResponseMessage = {
 					jsonrpc: Protocol.PROTOCOL_VERSION,
 					id: @:privateAccess haxeDisplayProtocol.nextRequestId - 1, // ew..
-					error: new ResponseError(ResponseError.InternalError, "Compiler error", ([
-						{
-							severity: Error,
-							message: error
-						}
-					] : HaxeResponseErrorData))
+					error: new ResponseError(ResponseError.InternalError, "Compiler error", [errData])
 				}
 				message;
 			});

src/haxeLanguageServer/features/haxe/completion/CompletionFeature.hx

@@ -67,7 +67,7 @@ class CompletionFeature {
 			explicitNull: true
 		});
 
-		legacy = new CompletionFeatureLegacy(context, contextSupport, formatDocumentation);
+		legacy = new CompletionFeatureLegacy(context, contextSupport, @:nullSafety(Off) formatDocumentation);
 	}
 
 	function checkCapabilities() {

test/testcases/EditTestCaseMacro.hx

@@ -46,9 +46,8 @@ class EditTestCaseMacro {
 	}
 
 	static function collectAllFileNames(path:String):Array<String> {
-		#if display
-		return [];
-		#end
+		if (Context.defined("display"))
+			return [];
 		final items:Array<String> = FileSystem.readDirectory(path);
 		var files:Array<String> = [];
 		for (item in items) {