diff --git a/projects/kiss-vscode/config/KissConfig.hx b/projects/kiss-vscode/config/KissConfig.hx index 2f5ceb83..25a3d5d3 100644 --- a/projects/kiss-vscode/config/KissConfig.hx +++ b/projects/kiss-vscode/config/KissConfig.hx @@ -13,6 +13,7 @@ import haxe.io.Path; import sys.io.File; import sys.FileSystem; import ktxt2.KTxt2; +import re_flex.R; using haxe.io.Path; using StringTools; diff --git a/projects/kiss-vscode/config/KissConfig.kiss b/projects/kiss-vscode/config/KissConfig.kiss index 03f984d3..610738c2 100644 --- a/projects/kiss-vscode/config/KissConfig.kiss +++ b/projects/kiss-vscode/config/KissConfig.kiss @@ -112,7 +112,8 @@ (if documentBeforeShortcut (awaitLet [_ (Vscode.window.showTextDocument documentBeforeShortcut)] (_runCommand command selectedTextBeforeShortcut)) - (_runCommand command selectedTextBeforeShortcut))))) + (_runCommand command selectedTextBeforeShortcut))) + (otherwise))) ("Escape" (shortcutPanel.dispose)) @@ -128,7 +129,8 @@ ((Prefix innerMap) "$(Lambda.count innerMap) shortcuts") ((Final command) - command))

")] + command) + (otherwise))

")] " @@ -168,10 +170,10 @@ (case (stream.takeUntilAndDrop "]") ((Some newShortcuts) (extractKeyboardShortcuts str stream (+ shortcuts (newShortcuts.toLowerCase)))) - (None + (otherwise (warningMessage "unclosed [ in $str") ""))) - (None + (otherwise shortcuts))) (function :Void registerShortcut [keys description &opt :Map prefixMap] @@ -186,7 +188,8 @@ ((Final _) (warningMessage conflictMessage)) ((Prefix innerPrefixMap) - (registerShortcut keys description innerPrefixMap))) + (registerShortcut keys description innerPrefixMap)) + (otherwise)) (warningMessage conflictMessage)))) (true (if keys diff --git a/projects/kiss-vscode/src/Main.hx b/projects/kiss-vscode/src/Main.hx index 366565d4..bbf84700 100644 --- a/projects/kiss-vscode/src/Main.hx +++ b/projects/kiss-vscode/src/Main.hx @@ -11,6 +11,7 @@ import haxe.io.Path; import js.Node; import js.node.ChildProcess; import uuid.Uuid; +import re_flex.R; using StringTools; using uuid.Uuid; diff --git a/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.hx b/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.hx index af975b5b..d68e59fd 100644 --- a/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.hx +++ b/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.hx @@ -6,6 +6,7 @@ import kiss.Stream; import vscode.*; import js.lib.Promise; import sys.io.File; +import re_flex.R; using haxe.io.Path; using StringTools; diff --git a/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss b/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss index d6304303..0ef35559 100644 --- a/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss +++ b/projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss @@ -51,7 +51,6 @@ ((objectWith [type "deleteBlock"] start end) (makeEdit ->edit (edit.delete document.uri (new Range (streamPosToOffsetDocumentPos start -KTxt2.blockStartEnd.length) (streamPosToOffsetDocumentPos end KTxt2.blockStartEnd.length))))) - ((object type "tryFullAutoConvert") (let [fullConverted (KTxt2.tryFullAutoConvert document.fileName Main.config.conversions)] (makeEdit