kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix missing null cases in KissConfig.kiss

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-11-29 16:19:54 -07:00
parent 663f9df8c3
commit c896f98e78
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/kiss-vscode/config/KissConfig.hx
View File

@@ -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;

13
projects/kiss-vscode/config/KissConfig.kiss
View File

@@ -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))</p>")]
command)
(otherwise))</p>")]
"<!DOCTYPE html>
<html lang=\"en\">
<head>
@@ -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<String,ShortcutKey> prefixMap]
@@ -186,7 +188,8 @@
((Final _)
(warningMessage conflictMessage))
((Prefix innerPrefixMap)
(registerShortcut keys description innerPrefixMap)))
(registerShortcut keys description innerPrefixMap))
(otherwise))
(warningMessage conflictMessage))))
(true
(if keys

1
projects/kiss-vscode/src/Main.hx
View File

@@ -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;

1
projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.hx
View File

@@ -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;

1
projects/kiss-vscode/src/ktxt2/KTxt2EditorProvider.kiss
View File

@@ -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