diff --git a/kiss/src/kiss/Prelude.hx b/kiss/src/kiss/Prelude.hx index 06aa53d5..3106e89b 100644 --- a/kiss/src/kiss/Prelude.hx +++ b/kiss/src/kiss/Prelude.hx @@ -259,7 +259,6 @@ class Prelude { return f; } - // TODO Kiss-Vscode should overload print with infoMessage() public static dynamic function print(v:T):T { #if (sys || hxnodejs) Sys.println(v); diff --git a/projects/kiss-vscode/config/KissConfig.hx b/projects/kiss-vscode/config/KissConfig.hx index 64135db1..53ee0069 100644 --- a/projects/kiss-vscode/config/KissConfig.hx +++ b/projects/kiss-vscode/config/KissConfig.hx @@ -16,7 +16,7 @@ typedef Command = (String) -> Void; enum ShortcutKey { Final(command:String); - Prefix(keys: Map); + Prefix(keys:Map); } @:expose diff --git a/projects/kiss-vscode/config/KissConfig.kiss b/projects/kiss-vscode/config/KissConfig.kiss index 82d05560..f6f9107d 100644 --- a/projects/kiss-vscode/config/KissConfig.kiss +++ b/projects/kiss-vscode/config/KissConfig.kiss @@ -119,7 +119,6 @@ (defun :Void registerShortcut [keys description &opt :Map prefixMap] (unless prefixMap (set prefixMap commandShortcuts)) - (print keys) (let [firstKey (keys.shift)] (cond ((prefixMap.exists firstKey) diff --git a/projects/kiss-vscode/src/Main.kiss b/projects/kiss-vscode/src/Main.kiss index 20a5d920..81389577 100644 --- a/projects/kiss-vscode/src/Main.kiss +++ b/projects/kiss-vscode/src/Main.kiss @@ -7,7 +7,7 @@ (.replace (.replace (.toString (Date.now)) ":" "-") " " "-")) (defvar &mut activeConfigDir "") -(defvar &mut :Dynamic config null) +(defvar &mut :KissConfig config null) (defun :Void tryLoadConfig [&opt :String text] (let [activeConfigPath (Path.join [activeConfigDir "config.js"]) @@ -36,13 +36,13 @@ (let [activeConfigFile (Path.join [activeConfigDir "config.js"]) uniqueConfigFile (Path.join [activeConfigDir "$(.toShort (Uuid.v4)).js"])] (File.copy activeConfigFile uniqueConfigFile) - (set config .KissConfig (Node.require uniqueConfigFile)) + (set config (the KissConfig .KissConfig (Node.require uniqueConfigFile))) // (FileSystem.deleteFile uniqueConfigFile) - (.registerBuiltins (the KissConfig config)) - (.registerCommand (the KissConfig config) "Reload Kiss config" tryLoadConfig) - (.prepareInterp (the KissConfig config)) + (config.registerBuiltins) + (config.registerCommand "Reload Kiss config" tryLoadConfig) + (config.prepareInterp) // User-defined init: - (.init (the KissConfig config)) + (config.init) (Vscode.window.showInformationMessage "Config loaded successfully!")) // If there's a build error, restore the config.js backup (begin