git.iko.soy/helix
on master help sign in
improve test harness

* Use new macro syntax for encoding sequences of keys * Make convenience helpers for common test pattern * Use indoc for inline indented raw strings * Add feature flag for integration testing to disable rendering

commit502d3290fb88d8a871b0824adc7987a98104933d authorSkyler Hawthorne <skyler@dead10ck.com> dateMon 17 Jan 2022, 19:04 (5 years ago) parent308cab3
7 files changed+359−126
compare with master
unifiedsplit
Cargo.lock+187−98 helix-core/Cargo.toml+1 helix-loader/src/lib.rs+5−5 helix-term/Cargo.toml+5 helix-term/src/application.rs+14−6 helix-term/tests/integration.rs+146−17 helix-view/src/editor.rs+1
Cargo.lock+187−98
@@ -13,9 +13,9 @@ dependencies = [
1313
1414[[package]]
1515name = "anyhow"
16−version = "1.0.57"
16+version = "1.0.53"
1717source = "registry+https://github.com/rust-lang/crates.io-index"
18−checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
18+checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
1919
2020[[package]]
2121name = "arc-swap"
@@ -25,9 +25,9 @@ checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f"
2525
2626[[package]]
2727name = "autocfg"
28−version = "1.1.0"
28+version = "1.0.1"
2929source = "registry+https://github.com/rust-lang/crates.io-index"
30−checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
30+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
3131
3232[[package]]
3333name = "bitflags"
@@ -66,9 +66,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
6666
6767[[package]]
6868name = "cc"
69−version = "1.0.73"
69+version = "1.0.72"
7070source = "registry+https://github.com/rust-lang/crates.io-index"
71−checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
71+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
7272
7373[[package]]
7474name = "cfg-if"
@@ -121,9 +121,9 @@ dependencies = [
121121
122122[[package]]
123123name = "crossbeam-utils"
124−version = "0.8.8"
124+version = "0.8.7"
125125source = "registry+https://github.com/rust-lang/crates.io-index"
126−checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
126+checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
127127dependencies = [
128128 "cfg-if",
129129 "lazy_static",
@@ -131,15 +131,15 @@ dependencies = [
131131
132132[[package]]
133133name = "crossterm"
134−version = "0.23.2"
134+version = "0.23.0"
135135source = "registry+https://github.com/rust-lang/crates.io-index"
136−checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17"
136+checksum = "77b75a27dc8d220f1f8521ea69cd55a34d720a200ebb3a624d9aa19193d3b432"
137137dependencies = [
138138 "bitflags",
139139 "crossterm_winapi",
140140 "futures-core",
141141 "libc",
142− "mio",
142+ "mio 0.7.14",
143143 "parking_lot",
144144 "signal-hook",
145145 "signal-hook-mio",
@@ -184,9 +184,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
184184
185185[[package]]
186186name = "encoding_rs"
187−version = "0.8.31"
187+version = "0.8.30"
188188source = "registry+https://github.com/rust-lang/crates.io-index"
189−checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
189+checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
190190dependencies = [
191191 "cfg-if",
192192]
@@ -293,9 +293,9 @@ dependencies = [
293293
294294[[package]]
295295name = "getrandom"
296−version = "0.2.6"
296+version = "0.2.4"
297297source = "registry+https://github.com/rust-lang/crates.io-index"
298−checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
298+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
299299dependencies = [
300300 "cfg-if",
301301 "libc",
@@ -452,6 +452,7 @@ dependencies = [
452452 "helix-tui",
453453 "helix-view",
454454 "ignore",
455+ "indoc",
455456 "log",
456457 "once_cell",
457458 "pulldown-cmark",
@@ -460,6 +461,7 @@ dependencies = [
460461 "serde_json",
461462 "signal-hook",
462463 "signal-hook-tokio",
464+ "smallvec",
463465 "tokio",
464466 "tokio-stream",
465467 "toml",
@@ -544,11 +546,20 @@ dependencies = [
544546 "winapi-util",
545547]
546548
549+[[package]]
550+name = "indoc"
551+version = "1.0.3"
552+source = "registry+https://github.com/rust-lang/crates.io-index"
553+checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
554+dependencies = [
555+ "unindent",
556+]
557+
547558[[package]]
548559name = "itoa"
549−version = "1.0.2"
560+version = "1.0.1"
550561source = "registry+https://github.com/rust-lang/crates.io-index"
551−checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
562+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
552563
553564[[package]]
554565name = "lazy_static"
@@ -558,9 +569,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
558569
559570[[package]]
560571name = "libc"
561−version = "0.2.126"
572+version = "0.2.125"
562573source = "registry+https://github.com/rust-lang/crates.io-index"
563−checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
574+checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
564575
565576[[package]]
566577name = "libloading"
@@ -574,19 +585,18 @@ dependencies = [
574585
575586[[package]]
576587name = "lock_api"
577−version = "0.4.7"
588+version = "0.4.6"
578589source = "registry+https://github.com/rust-lang/crates.io-index"
579−checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
590+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
580591dependencies = [
581− "autocfg",
582592 "scopeguard",
583593]
584594
585595[[package]]
586596name = "log"
587−version = "0.4.17"
597+version = "0.4.14"
588598source = "registry+https://github.com/rust-lang/crates.io-index"
589−checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
599+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
590600dependencies = [
591601 "cfg-if",
592602]
@@ -612,9 +622,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
612622
613623[[package]]
614624name = "memchr"
615−version = "2.5.0"
625+version = "2.4.1"
616626source = "registry+https://github.com/rust-lang/crates.io-index"
617−checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
627+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
618628
619629[[package]]
620630name = "memmap2"
@@ -625,6 +635,19 @@ dependencies = [
625635 "libc",
626636]
627637
638+[[package]]
639+name = "mio"
640+version = "0.7.14"
641+source = "registry+https://github.com/rust-lang/crates.io-index"
642+checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
643+dependencies = [
644+ "libc",
645+ "log",
646+ "miow",
647+ "ntapi",
648+ "winapi",
649+]
650+
628651[[package]]
629652name = "mio"
630653version = "0.8.3"
@@ -634,14 +657,32 @@ dependencies = [
634657 "libc",
635658 "log",
636659 "wasi 0.11.0+wasi-snapshot-preview1",
637− "windows-sys",
660+ "windows-sys 0.36.1",
661+]
662+
663+[[package]]
664+name = "miow"
665+version = "0.3.7"
666+source = "registry+https://github.com/rust-lang/crates.io-index"
667+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
668+dependencies = [
669+ "winapi",
670+]
671+
672+[[package]]
673+name = "ntapi"
674+version = "0.3.6"
675+source = "registry+https://github.com/rust-lang/crates.io-index"
676+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
677+dependencies = [
678+ "winapi",
638679]
639680
640681[[package]]
641682name = "num-integer"
642−version = "0.1.45"
683+version = "0.1.44"
643684source = "registry+https://github.com/rust-lang/crates.io-index"
644−checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
685+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
645686dependencies = [
646687 "autocfg",
647688 "num-traits",
@@ -649,9 +690,9 @@ dependencies = [
649690
650691[[package]]
651692name = "num-traits"
652−version = "0.2.15"
693+version = "0.2.14"
653694source = "registry+https://github.com/rust-lang/crates.io-index"
654−checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
695+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
655696dependencies = [
656697 "autocfg",
657698]
@@ -684,15 +725,15 @@ dependencies = [
684725
685726[[package]]
686727name = "parking_lot_core"
687−version = "0.9.3"
728+version = "0.9.1"
688729source = "registry+https://github.com/rust-lang/crates.io-index"
689−checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
730+checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
690731dependencies = [
691732 "cfg-if",
692733 "libc",
693734 "redox_syscall",
694735 "smallvec",
695− "windows-sys",
736+ "windows-sys 0.32.0",
696737]
697738
698739[[package]]
@@ -703,9 +744,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
703744
704745[[package]]
705746name = "pin-project-lite"
706−version = "0.2.9"
747+version = "0.2.8"
707748source = "registry+https://github.com/rust-lang/crates.io-index"
708−checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
749+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
709750
710751[[package]]
711752name = "pin-utils"
@@ -715,11 +756,11 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
715756
716757[[package]]
717758name = "proc-macro2"
718−version = "1.0.39"
759+version = "1.0.36"
719760source = "registry+https://github.com/rust-lang/crates.io-index"
720−checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
761+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
721762dependencies = [
722− "unicode-ident",
763+ "unicode-xid",
723764]
724765
725766[[package]]
@@ -744,18 +785,18 @@ dependencies = [
744785
745786[[package]]
746787name = "quote"
747−version = "1.0.18"
788+version = "1.0.15"
748789source = "registry+https://github.com/rust-lang/crates.io-index"
749−checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
790+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
750791dependencies = [
751792 "proc-macro2",
752793]
753794
754795[[package]]
755796name = "rand"
756−version = "0.8.5"
797+version = "0.8.4"
757798source = "registry+https://github.com/rust-lang/crates.io-index"
758−checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
799+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
759800dependencies = [
760801 "rand_core",
761802]
@@ -771,29 +812,28 @@ dependencies = [
771812
772813[[package]]
773814name = "redox_syscall"
774−version = "0.2.13"
815+version = "0.2.10"
775816source = "registry+https://github.com/rust-lang/crates.io-index"
776−checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
817+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
777818dependencies = [
778819 "bitflags",
779820]
780821
781822[[package]]
782823name = "redox_users"
783−version = "0.4.3"
824+version = "0.4.0"
784825source = "registry+https://github.com/rust-lang/crates.io-index"
785−checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
826+checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
786827dependencies = [
787828 "getrandom",
788829 "redox_syscall",
789− "thiserror",
790830]
791831
792832[[package]]
793833name = "regex"
794−version = "1.5.6"
834+version = "1.5.4"
795835source = "registry+https://github.com/rust-lang/crates.io-index"
796−checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
836+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
797837dependencies = [
798838 "aho-corasick",
799839 "memchr",
@@ -808,15 +848,15 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
808848
809849[[package]]
810850name = "regex-syntax"
811−version = "0.6.26"
851+version = "0.6.25"
812852source = "registry+https://github.com/rust-lang/crates.io-index"
813−checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
853+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
814854
815855[[package]]
816856name = "retain_mut"
817−version = "0.1.9"
857+version = "0.1.7"
818858source = "registry+https://github.com/rust-lang/crates.io-index"
819−checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
859+checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086"
820860
821861[[package]]
822862name = "ropey"
@@ -830,9 +870,9 @@ dependencies = [
830870
831871[[package]]
832872name = "ryu"
833−version = "1.0.10"
873+version = "1.0.9"
834874source = "registry+https://github.com/rust-lang/crates.io-index"
835−checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
875+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
836876
837877[[package]]
838878name = "same-file"
@@ -851,18 +891,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
851891
852892[[package]]
853893name = "serde"
854−version = "1.0.137"
894+version = "1.0.136"
855895source = "registry+https://github.com/rust-lang/crates.io-index"
856−checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
896+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
857897dependencies = [
858898 "serde_derive",
859899]
860900
861901[[package]]
862902name = "serde_derive"
863−version = "1.0.137"
903+version = "1.0.136"
864904source = "registry+https://github.com/rust-lang/crates.io-index"
865−checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
905+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
866906dependencies = [
867907 "proc-macro2",
868908 "quote",
@@ -871,9 +911,9 @@ dependencies = [
871911
872912[[package]]
873913name = "serde_json"
874−version = "1.0.81"
914+version = "1.0.79"
875915source = "registry+https://github.com/rust-lang/crates.io-index"
876−checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
916+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
877917dependencies = [
878918 "itoa",
879919 "ryu",
@@ -882,9 +922,9 @@ dependencies = [
882922
883923[[package]]
884924name = "serde_repr"
885−version = "0.1.8"
925+version = "0.1.7"
886926source = "registry+https://github.com/rust-lang/crates.io-index"
887−checksum = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed"
927+checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
888928dependencies = [
889929 "proc-macro2",
890930 "quote",
@@ -903,12 +943,12 @@ dependencies = [
903943
904944[[package]]
905945name = "signal-hook-mio"
906−version = "0.2.3"
946+version = "0.2.1"
907947source = "registry+https://github.com/rust-lang/crates.io-index"
908−checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
948+checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4"
909949dependencies = [
910950 "libc",
911− "mio",
951+ "mio 0.7.14",
912952 "signal-hook",
913953]
914954
@@ -941,9 +981,9 @@ checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3"
941981
942982[[package]]
943983name = "slab"
944−version = "0.4.6"
984+version = "0.4.5"
945985source = "registry+https://github.com/rust-lang/crates.io-index"
946−checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
986+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
947987
948988[[package]]
949989name = "slotmap"
@@ -995,9 +1035,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
9951035
9961036[[package]]
9971037name = "str-buf"
998−version = "1.0.6"
1038+version = "1.0.5"
9991039source = "registry+https://github.com/rust-lang/crates.io-index"
1000−checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
1040+checksum = "d44a3643b4ff9caf57abcee9c2c621d6c03d9135e0d8b589bd9afb5992cb176a"
10011041
10021042[[package]]
10031043name = "str_indices"
@@ -1007,13 +1047,13 @@ checksum = "9d9199fa80c817e074620be84374a520062ebac833f358d74b37060ce4a0f2c0"
10071047
10081048[[package]]
10091049name = "syn"
1010−version = "1.0.95"
1050+version = "1.0.86"
10111051source = "registry+https://github.com/rust-lang/crates.io-index"
1012−checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
1052+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
10131053dependencies = [
10141054 "proc-macro2",
10151055 "quote",
1016− "unicode-ident",
1056+ "unicode-xid",
10171057]
10181058
10191059[[package]]
@@ -1029,18 +1069,18 @@ dependencies = [
10291069
10301070[[package]]
10311071name = "thiserror"
1032−version = "1.0.31"
1072+version = "1.0.30"
10331073source = "registry+https://github.com/rust-lang/crates.io-index"
1034−checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
1074+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
10351075dependencies = [
10361076 "thiserror-impl",
10371077]
10381078
10391079[[package]]
10401080name = "thiserror-impl"
1041−version = "1.0.31"
1081+version = "1.0.30"
10421082source = "registry+https://github.com/rust-lang/crates.io-index"
1043−checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
1083+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
10441084dependencies = [
10451085 "proc-macro2",
10461086 "quote",
@@ -1067,9 +1107,9 @@ dependencies = [
10671107
10681108[[package]]
10691109name = "tinyvec"
1070−version = "1.6.0"
1110+version = "1.5.1"
10711111source = "registry+https://github.com/rust-lang/crates.io-index"
1072−checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
1112+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
10731113dependencies = [
10741114 "tinyvec_macros",
10751115]
@@ -1089,7 +1129,7 @@ dependencies = [
10891129 "bytes",
10901130 "libc",
10911131 "memchr",
1092− "mio",
1132+ "mio 0.8.3",
10931133 "num_cpus",
10941134 "once_cell",
10951135 "parking_lot",
@@ -1133,9 +1173,9 @@ dependencies = [
11331173
11341174[[package]]
11351175name = "tree-sitter"
1136−version = "0.20.6"
1176+version = "0.20.4"
11371177source = "registry+https://github.com/rust-lang/crates.io-index"
1138−checksum = "09b3b781640108d29892e8b9684642d2cda5ea05951fd58f0fea1db9edeb9b71"
1178+checksum = "4e34327f8eac545e3f037382471b2b19367725a242bba7bc45edb9efb49fe39a"
11391179dependencies = [
11401180 "cc",
11411181 "regex",
@@ -1152,9 +1192,9 @@ dependencies = [
11521192
11531193[[package]]
11541194name = "unicode-bidi"
1155−version = "0.3.8"
1195+version = "0.3.7"
11561196source = "registry+https://github.com/rust-lang/crates.io-index"
1157−checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
1197+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
11581198
11591199[[package]]
11601200name = "unicode-general-category"
@@ -1162,12 +1202,6 @@ version = "0.5.1"
11621202source = "registry+https://github.com/rust-lang/crates.io-index"
11631203checksum = "1218098468b8085b19a2824104c70d976491d247ce194bbd9dc77181150cdfd6"
11641204
1165−[[package]]
1166−name = "unicode-ident"
1167−version = "1.0.0"
1168−source = "registry+https://github.com/rust-lang/crates.io-index"
1169−checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
1170−
11711205[[package]]
11721206name = "unicode-linebreak"
11731207version = "0.1.2"
@@ -1198,6 +1232,18 @@ version = "0.1.9"
11981232source = "registry+https://github.com/rust-lang/crates.io-index"
11991233checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
12001234
1235+[[package]]
1236+name = "unicode-xid"
1237+version = "0.2.2"
1238+source = "registry+https://github.com/rust-lang/crates.io-index"
1239+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
1240+
1241+[[package]]
1242+name = "unindent"
1243+version = "0.1.7"
1244+source = "registry+https://github.com/rust-lang/crates.io-index"
1245+checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
1246+
12011247[[package]]
12021248name = "url"
12031249version = "2.2.2"
@@ -1242,9 +1288,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
12421288
12431289[[package]]
12441290name = "which"
1245−version = "4.2.5"
1291+version = "4.2.4"
12461292source = "registry+https://github.com/rust-lang/crates.io-index"
1247−checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
1293+checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2"
12481294dependencies = [
12491295 "either",
12501296 "lazy_static",
@@ -1282,43 +1328,86 @@ version = "0.4.0"
12821328source = "registry+https://github.com/rust-lang/crates.io-index"
12831329checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
12841330
1331+[[package]]
1332+name = "windows-sys"
1333+version = "0.32.0"
1334+source = "registry+https://github.com/rust-lang/crates.io-index"
1335+checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6"
1336+dependencies = [
1337+ "windows_aarch64_msvc 0.32.0",
1338+ "windows_i686_gnu 0.32.0",
1339+ "windows_i686_msvc 0.32.0",
1340+ "windows_x86_64_gnu 0.32.0",
1341+ "windows_x86_64_msvc 0.32.0",
1342+]
1343+
12851344[[package]]
12861345name = "windows-sys"
12871346version = "0.36.1"
12881347source = "registry+https://github.com/rust-lang/crates.io-index"
12891348checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
12901349dependencies = [
1291− "windows_aarch64_msvc",
1292− "windows_i686_gnu",
1293− "windows_i686_msvc",
1294− "windows_x86_64_gnu",
1295− "windows_x86_64_msvc",
1350+ "windows_aarch64_msvc 0.36.1",
1351+ "windows_i686_gnu 0.36.1",
1352+ "windows_i686_msvc 0.36.1",
1353+ "windows_x86_64_gnu 0.36.1",
1354+ "windows_x86_64_msvc 0.36.1",
12961355]
12971356
1357+[[package]]
1358+name = "windows_aarch64_msvc"
1359+version = "0.32.0"
1360+source = "registry+https://github.com/rust-lang/crates.io-index"
1361+checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
1362+
12981363[[package]]
12991364name = "windows_aarch64_msvc"
13001365version = "0.36.1"
13011366source = "registry+https://github.com/rust-lang/crates.io-index"
13021367checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
13031368
1369+[[package]]
1370+name = "windows_i686_gnu"
1371+version = "0.32.0"
1372+source = "registry+https://github.com/rust-lang/crates.io-index"
1373+checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
1374+
13041375[[package]]
13051376name = "windows_i686_gnu"
13061377version = "0.36.1"
13071378source = "registry+https://github.com/rust-lang/crates.io-index"
13081379checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
13091380
1381+[[package]]
1382+name = "windows_i686_msvc"
1383+version = "0.32.0"
1384+source = "registry+https://github.com/rust-lang/crates.io-index"
1385+checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
1386+
13101387[[package]]
13111388name = "windows_i686_msvc"
13121389version = "0.36.1"
13131390source = "registry+https://github.com/rust-lang/crates.io-index"
13141391checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
13151392
1393+[[package]]
1394+name = "windows_x86_64_gnu"
1395+version = "0.32.0"
1396+source = "registry+https://github.com/rust-lang/crates.io-index"
1397+checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
1398+
13161399[[package]]
13171400name = "windows_x86_64_gnu"
13181401version = "0.36.1"
13191402source = "registry+https://github.com/rust-lang/crates.io-index"
13201403checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
13211404
1405+[[package]]
1406+name = "windows_x86_64_msvc"
1407+version = "0.32.0"
1408+source = "registry+https://github.com/rust-lang/crates.io-index"
1409+checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
1410+
13221411[[package]]
13231412name = "windows_x86_64_msvc"
13241413version = "0.36.1"
helix-core/Cargo.toml+1
@@ -12,6 +12,7 @@ include = ["src/**/*", "README.md"]
1212
1313[features]
1414unicode-lines = ["ropey/unicode_lines"]
15+integration = []
1516
1617[dependencies]
1718helix-loader = { version = "0.6", path = "../helix-loader" }
helix-loader/src/lib.rs+5−5
@@ -11,17 +11,17 @@ pub fn runtime_dir() -> std::path::PathBuf {
1111 return dir.into();
1212 }
1313
14+ if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {
15+ // this is the directory of the crate being run by cargo, we need the workspace path so we take the parent
16+ return std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR);
17+ }
18+
1419 const RT_DIR: &str = "runtime";
1520 let conf_dir = config_dir().join(RT_DIR);
1621 if conf_dir.exists() {
1722 return conf_dir;
1823 }
1924
20− if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {
21− // this is the directory of the crate being run by cargo, we need the workspace path so we take the parent
22− return std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR);
23− }
24−
2525 // fallback to location of the executable being run
2626 std::env::current_exe()
2727 .ok()
helix-term/Cargo.toml+5
@@ -17,6 +17,7 @@ app = true
1717
1818[features]
1919unicode-lines = ["helix-core/unicode-lines"]
20+integration = []
2021
2122[[bin]]
2223name = "hx"
@@ -73,3 +74,7 @@ signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
7374
7475[build-dependencies]
7576helix-loader = { version = "0.6", path = "../helix-loader" }
77+
78+[dev-dependencies]
79+smallvec = "1.8"
80+indoc = "1.0.3"
helix-term/src/application.rs+14−6
@@ -187,13 +187,21 @@ impl Application {
187187 }
188188
189189 fn render(&mut self) {
190− let mut cx = crate::compositor::Context {
191− editor: &mut self.editor,
192− jobs: &mut self.jobs,
193− scroll: None,
194− };
190+ #[cfg(feature = "integration")]
191+ return;
192+
193+ #[allow(unreachable_code)]
194+ {
195+ let compositor = &mut self.compositor;
195196
196− // self.compositor.render(&mut cx);
197+ let mut cx = crate::compositor::Context {
198+ editor: &mut self.editor,
199+ jobs: &mut self.jobs,
200+ scroll: None,
201+ };
202+
203+ compositor.render(&mut cx);
204+ }
197205 }
198206
199207 pub async fn event_loop(&mut self) {
helix-term/tests/integration.rs+146−17
@@ -1,24 +1,153 @@
1−use helix_term::{application::Application, args::Args, config::Config};
2−use helix_view::current;
1+#[cfg(feature = "integration")]
2+mod integration {
3+ use std::path::PathBuf;
34
4−use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
5+ use helix_core::{syntax::AutoPairConfig, Position, Selection, Tendril, Transaction};
6+ use helix_term::{application::Application, args::Args, config::Config};
7+ use helix_view::{current, doc, input::parse_macro};
58
6−#[tokio::test]
7−async fn it_works() {
8− let args = Args::default();
9− let config = Config::default();
10− let mut app = Application::new(args, config).unwrap();
9+ use crossterm::event::{Event, KeyEvent};
10+ use indoc::indoc;
1111
12− let inputs = &['i', 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd'];
12+ pub struct TestCase {
13+ pub in_text: String,
14+ pub in_selection: Selection,
15+ pub in_keys: String,
16+ pub out_text: String,
17+ pub out_selection: Selection,
18+ }
19+
20+ fn test_key_sequence(
21+ app: Option<Application>,
22+ test_case: &TestCase,
23+ test_fn: &dyn Fn(&mut Application),
24+ ) -> anyhow::Result<()> {
25+ let mut app =
26+ app.unwrap_or_else(|| Application::new(Args::default(), Config::default()).unwrap());
27+
28+ let (view, doc) = current!(app.editor);
29+
30+ doc.apply(
31+ &Transaction::insert(
32+ doc.text(),
33+ &Selection::single(1, 0),
34+ Tendril::from(&test_case.in_text),
35+ )
36+ .with_selection(test_case.in_selection.clone()),
37+ view.id,
38+ );
39+
40+ let input_keys = parse_macro(&test_case.in_keys)?
41+ .into_iter()
42+ .map(|key_event| Event::Key(KeyEvent::from(key_event)));
43+
44+ for key in input_keys {
45+ app.handle_terminal_events(Ok(key));
46+ }
47+
48+ test_fn(&mut app);
49+
50+ Ok(())
51+ }
52+
53+ /// Use this for very simple test cases where there is one input
54+ /// document, selection, and sequence of key presses, and you just
55+ /// want to verify the resulting document and selection.
56+ fn test_key_sequence_text_result(
57+ args: Args,
58+ config: Config,
59+ test_case: TestCase,
60+ ) -> anyhow::Result<()> {
61+ let app = Application::new(args, config).unwrap();
62+
63+ test_key_sequence(Some(app), &test_case, &|app| {
64+ let doc = doc!(app.editor);
65+ assert_eq!(&test_case.out_text, doc.text());
1366
14− for input in inputs {
15− // TODO: use input.parse::<KeyEvent>
16− app.handle_terminal_events(Ok(Event::Key(KeyEvent {
17− code: KeyCode::Char(*input),
18− modifiers: KeyModifiers::NONE,
19− })));
67+ let mut selections: Vec<_> = doc.selections().values().cloned().collect();
68+ assert_eq!(1, selections.len());
69+
70+ let sel = selections.pop().unwrap();
71+ assert_eq!(test_case.out_selection, sel);
72+ })?;
73+
74+ Ok(())
75+ }
76+
77+ #[tokio::test]
78+ async fn hello_world() -> anyhow::Result<()> {
79+ test_key_sequence_text_result(
80+ Args::default(),
81+ Config::default(),
82+ TestCase {
83+ in_text: String::new(),
84+ in_selection: Selection::single(0, 1),
85+ // TODO: fix incorrect selection on new doc
86+ in_keys: String::from("ihello world<esc>hl"),
87+ out_text: String::from("hello world\n"),
88+ out_selection: Selection::single(11, 12),
89+ },
90+ )?;
91+
92+ Ok(())
2093 }
2194
22− let (_, doc) = current!(app.editor);
23− assert_eq!(doc.text(), "hello world\n");
95+ #[tokio::test]
96+ async fn auto_pairs_basic() -> anyhow::Result<()> {
97+ test_key_sequence_text_result(
98+ Args::default(),
99+ Config::default(),
100+ TestCase {
101+ in_text: String::new(),
102+ in_selection: Selection::single(0, 1),
103+ in_keys: String::from("i(<esc>hl"),
104+ out_text: String::from("()\n"),
105+ out_selection: Selection::single(1, 2),
106+ },
107+ )?;
108+
109+ test_key_sequence_text_result(
110+ Args::default(),
111+ Config {
112+ editor: helix_view::editor::Config {
113+ auto_pairs: AutoPairConfig::Enable(false),
114+ ..Default::default()
115+ },
116+ ..Default::default()
117+ },
118+ TestCase {
119+ in_text: String::new(),
120+ in_selection: Selection::single(0, 1),
121+ in_keys: String::from("i(<esc>hl"),
122+ out_text: String::from("(\n"),
123+ out_selection: Selection::single(1, 2),
124+ },
125+ )?;
126+
127+ Ok(())
128+ }
129+
130+ #[tokio::test]
131+ async fn auto_indent_rs() -> anyhow::Result<()> {
132+ test_key_sequence_text_result(
133+ Args {
134+ files: vec![(PathBuf::from("foo.c"), Position::default())],
135+ ..Default::default()
136+ },
137+ Config::default(),
138+ TestCase {
139+ in_text: String::from("void foo() {}"),
140+ in_selection: Selection::single(12, 13),
141+ in_keys: String::from("i<ret><esc>"),
142+ out_text: String::from(indoc! {r#"
143+ void foo() {
144+
145+ }
146+ "#}),
147+ out_selection: Selection::single(15, 16),
148+ },
149+ )?;
150+
151+ Ok(())
152+ }
24153}
helix-view/src/editor.rs+1
@@ -769,6 +769,7 @@ impl Editor {
769769 Ok(self.new_file_from_document(action, Document::from(rope, Some(encoding))))
770770 }
771771
772+ // ???
772773 pub fn open(&mut self, path: PathBuf, action: Action) -> Result<DocumentId, Error> {
773774 let path = helix_core::path::get_canonicalized_path(&path)?;
774775 let id = self.document_by_path(&path).map(|doc| doc.id);