Put Arguments and Util together

vshaxe · Mar 28, 2024 · 63227c9 · 63227c9
1 parent 513af49
commit 63227c9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/src/Arguments.hx b/src/Arguments.hx
diff --git a/src/Extension.hx b/src/Extension.hx
@@ -1,5 +1,6 @@
 import js.lib.Promise;
 import vscode.*;
+import Utils;
 
 class Extension {
 	@:expose("activate")

diff --git a/src/HLAdapter.hx b/src/HLAdapter.hx
@@ -1,4 +1,5 @@
 import haxe.CallStack;
+import Utils;
 
 import vscode.debugProtocol.DebugProtocol;
 import vscode.debugAdapter.DebugSession;
@@ -1066,11 +1067,11 @@ class HLAdapter extends DebugSession {
 	// Communicate with Extension
 
 	#if vscode
-	public function formatInt( args:Util.VariableContextCommandArg ) {
+	public function formatInt( args:VariableContextCommandArg ) {
 		var i = Std.parseInt(args.variable.value);
 		if (i == null)
 			return;
-		Vscode.window.showInformationMessage(args.variable.name + "(" + i + ") = 0x" + Util.toString(i,16) + " = 0b" + Util.toString(i,2));
+		Vscode.window.showInformationMessage(args.variable.name + "(" + i + ") = 0x" + Utils.toString(i,16) + " = 0b" + Utils.toString(i,2));
 	}
 	#end
 

diff --git a/src/Util.hx → src/Utils.hx b/src/Util.hx → src/Utils.hx
@@ -1,3 +1,17 @@
+typedef Arguments = {
+	cwd:String,
+	classPaths:Array<String>,
+	?hl:String,
+	?env:haxe.DynamicAccess<String>,
+	?program:String,
+	?args:Array<String>,
+	?argsFile:String,
+	?port:Int,
+	?hotReload:Bool,
+	?profileSamples:Int,
+	?allowEval:Bool
+}
+
 typedef Container = {
 	var name : String;
 	var variablesReference : Int;
@@ -11,11 +25,12 @@ typedef VariableContextCommandArg = {
 	var variable : vscode.debugProtocol.DebugProtocol.Variable;
 }
 
-class Util {
+class Utils {
 
 	inline public static function toString(value:Int, base:Int):String {
 		#if js
 		return untyped value.toString(base);
 		#end
 	}
+
 }