mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-26 13:03:31 +00:00
remove slower impl, add benchmarks
This commit is contained in:
Bernardo
parent
a005d2a614
commit
d6312085a1
6 changed files with 304 additions and 201 deletions
178
Cargo.lock
generated
178
Cargo.lock
generated
|
|
@ -122,6 +122,11 @@ dependencies = [
|
|||
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cast"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.27"
|
||||
|
|
@ -164,6 +169,51 @@ dependencies = [
|
|||
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "criterion"
|
||||
version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"criterion-plot 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"criterion-stats 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"handlebars 0.32.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"itertools-num 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"simplelog 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "criterion-plot"
|
||||
version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "criterion-stats"
|
||||
version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"thread-scoped 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-channel"
|
||||
version = "0.2.6"
|
||||
|
|
@ -233,6 +283,23 @@ dependencies = [
|
|||
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "csv"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "csv-core"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derive-new"
|
||||
version = "0.5.6"
|
||||
|
|
@ -368,6 +435,21 @@ name = "glob"
|
|||
version = "0.2.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "handlebars"
|
||||
version = "0.32.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"pest_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.3.1"
|
||||
|
|
@ -418,6 +500,14 @@ dependencies = [
|
|||
"either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itertools-num"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "0.4.3"
|
||||
|
|
@ -596,6 +686,11 @@ name = "percent-encoding"
|
|||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "pest"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "pest"
|
||||
version = "2.0.2"
|
||||
|
|
@ -604,6 +699,16 @@ dependencies = [
|
|||
"ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pest_derive"
|
||||
version = "1.0.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pest_derive"
|
||||
version = "2.0.1"
|
||||
|
|
@ -665,6 +770,11 @@ name = "quick-error"
|
|||
version = "1.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "0.3.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "0.6.10"
|
||||
|
|
@ -721,11 +831,15 @@ dependencies = [
|
|||
name = "ra_editor"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"criterion 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"join_to_string 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ra_syntax 0.1.0",
|
||||
"ra_text_edit 0.1.0",
|
||||
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"superslice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"test_utils 0.1.0",
|
||||
|
|
@ -1126,6 +1240,16 @@ dependencies = [
|
|||
"fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "simplelog"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "slug"
|
||||
version = "0.1.4"
|
||||
|
|
@ -1165,6 +1289,16 @@ name = "superslice"
|
|||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "0.11.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "0.14.9"
|
||||
|
|
@ -1185,6 +1319,14 @@ dependencies = [
|
|||
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "synom"
|
||||
version = "0.11.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "synstructure"
|
||||
version = "0.10.1"
|
||||
|
|
@ -1249,6 +1391,15 @@ dependencies = [
|
|||
"tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "term"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "termion"
|
||||
version = "1.5.1"
|
||||
|
|
@ -1285,6 +1436,11 @@ dependencies = [
|
|||
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thread-scoped"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "thread_local"
|
||||
version = "0.3.6"
|
||||
|
|
@ -1413,6 +1569,11 @@ name = "unicode-width"
|
|||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.1.0"
|
||||
|
|
@ -1527,11 +1688,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
|
||||
"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
|
||||
"checksum cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1b4d380e1bab994591a24c2bdd1b054f64b60bef483a8c598c7c345bc3bbe"
|
||||
"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427"
|
||||
"checksum cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "155ed195f7bd722d1dfeb30365b9d0c1f6a078fa7ca4014497e5935d90993d6f"
|
||||
"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
|
||||
"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
|
||||
"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
|
||||
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
|
||||
"checksum criterion 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c47d2b548c5647e1a436dc0cb78d4ebf51b6bf7ab101ed76662828bdd4d3a24a"
|
||||
"checksum criterion-plot 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6e649d6aacdbbdb94ec659561a309a71336fc5655ed408f3afd28df2fc0c4f4f"
|
||||
"checksum criterion-stats 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ff43cac80562f91ead0b617c1be74edf350adfaa195809d355de98dfc8f9237d"
|
||||
"checksum crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b85741761b7f160bc5e7e0c14986ef685b7f8bf9b7ad081c60c604bb4649827"
|
||||
"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
|
||||
"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150"
|
||||
|
|
@ -1539,6 +1704,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
|
||||
"checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015"
|
||||
"checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
|
||||
"checksum csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd1c44c58078cfbeaf11fbb3eac9ae5534c23004ed770cc4bfb48e658ae4f04"
|
||||
"checksum csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5cdef62f37e6ffe7d1f07a381bc0db32b7a3ff1cac0de56cb0d81e71f53d65"
|
||||
"checksum derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ca414e896ae072546f4d789f452daaecf60ddee4c9df5dc6d5936d769e3d87c"
|
||||
"checksum deunicode 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690"
|
||||
"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
|
||||
|
|
@ -1556,6 +1723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
|
||||
"checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
|
||||
"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
|
||||
"checksum handlebars 0.32.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d89ec99d1594f285d4590fc32bac5f75cdab383f1123d504d27862c644a807dd"
|
||||
"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
|
||||
"checksum humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e"
|
||||
"checksum id-arena 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3a7250033feafee46a1cecd2c2616a64aec1d064f38c9ae2bdd297728542843e"
|
||||
|
|
@ -1563,6 +1731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
"checksum im 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9c7f9bb8aee47fc16d535a705f7867a9fc83bb822e5e1043bb98e77ffeed3c"
|
||||
"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
|
||||
"checksum itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d"
|
||||
"checksum itertools-num 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a872a22f9e6f7521ca557660adb96dd830e54f0f490fa115bb55dd69d38b27e7"
|
||||
"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
|
||||
"checksum join_to_string 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7bddc885f3fd69dd4b5d747c2efe6dd2c36d795ea9938281ed50910e32c95e31"
|
||||
"checksum languageserver-types 0.53.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0be4f8f783832a308975035043c0e8ad18e11c3f3d395aa6f1a9f3a30b8e654"
|
||||
|
|
@ -1586,13 +1755,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
|
||||
"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
|
||||
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
|
||||
"checksum pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0fce5d8b5cc33983fc74f78ad552b5522ab41442c4ca91606e4236eb4b5ceefc"
|
||||
"checksum pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a677051ad923732bb5c70f2d45f8985a96e3eee2e2bff86697e3b11b0c3fcfde"
|
||||
"checksum pest_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3294f437119209b084c797604295f40227cffa35c57220b1e99a6ff3bf8ee4"
|
||||
"checksum pest_derive 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b76f477146419bc539a63f4ef40e902166cb43b3e51cecc71d9136fd12c567e7"
|
||||
"checksum pest_generator 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ebee4e9680be4fd162e6f3394ae4192a6b60b1e4d17d845e631f0c68d1a3386"
|
||||
"checksum pest_meta 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1f6d5f6f0e6082578c86af197d780dc38328e3f768cec06aac9bc46d714e8221"
|
||||
"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
|
||||
"checksum proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "926d0604475349f463fe44130aae73f2294b5309ab2ca0310b998bd334ef191f"
|
||||
"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
|
||||
"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
|
||||
"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
|
||||
"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
|
||||
"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
|
||||
|
|
@ -1629,22 +1801,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
"checksum serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)" = "96a7f9496ac65a2db5929afa087b54f8fc5008dcfbe48a8874ed20049b0d6154"
|
||||
"checksum serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "c37ccd6be3ed1fdf419ee848f7c758eb31b054d7cd3ae3600e3bae0adf569811"
|
||||
"checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded"
|
||||
"checksum simplelog 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e95345f185d5adeb8ec93459d2dc99654e294cc6ccf5b75414d8ea262de9a13"
|
||||
"checksum slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373"
|
||||
"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
|
||||
"checksum smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "486a74e9b9fc53373808f7a17e10fc728adcb1fbe272292271d8bea61175e181"
|
||||
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
|
||||
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
|
||||
"checksum superslice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b50b13d42370e0f5fc62eafdd5c2d20065eaf5458dab215ff3e20e63eea96b30"
|
||||
"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
|
||||
"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
|
||||
"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
|
||||
"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
|
||||
"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
|
||||
"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
|
||||
"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
|
||||
"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
|
||||
"checksum teraron 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d89ad4617d1dec55331067fadaa041e813479e1779616f3d3ce9308bf46184e"
|
||||
"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
|
||||
"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
|
||||
"checksum text_unit 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8009d7bdbd896a7e09b595f8f9325a19047fc708653e60d0895202b82135048f"
|
||||
"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
|
||||
"checksum thread-scoped 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bcbb6aa301e5d3b0b5ef639c9a9c7e2f1c944f177b460c04dc24c69b1fa2bd99"
|
||||
"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
|
||||
"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
|
||||
"checksum time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "847da467bf0db05882a9e2375934a8a55cffdc9db0d128af1518200260ba1f6c"
|
||||
|
|
@ -1661,6 +1838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
|
||||
"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
|
||||
"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
|
||||
"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
|
||||
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
|
||||
"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
|
||||
"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
|
||||
|
|
|
|||
|
|
@ -18,3 +18,11 @@ proptest = "0.8.7"
|
|||
|
||||
[dev-dependencies]
|
||||
test_utils = { path = "../test_utils" }
|
||||
criterion = "0.2"
|
||||
rand = "*"
|
||||
rand_xorshift = "*"
|
||||
lazy_static = "*"
|
||||
|
||||
[[bench]]
|
||||
name = "translate_offset_with_edit_benchmark"
|
||||
harness = false
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
use criterion::{criterion_group, criterion_main};
|
||||
use criterion::Criterion;
|
||||
use criterion::Fun;
|
||||
use ra_text_edit::AtomTextEdit;
|
||||
use ra_text_edit::test_utils::{arb_edits_custom, arb_offset};
|
||||
use ra_editor::line_index_utils;
|
||||
use ra_editor::LineIndex;
|
||||
use ra_syntax::TextUnit;
|
||||
use proptest::test_runner;
|
||||
use proptest::string::string_regex;
|
||||
use proptest::strategy::{Strategy, ValueTree};
|
||||
use rand_xorshift::XorShiftRng;
|
||||
use rand::SeedableRng;
|
||||
use lazy_static::lazy_static;
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Data {
|
||||
text: String,
|
||||
line_index: LineIndex,
|
||||
edits: Vec<AtomTextEdit>,
|
||||
offset: TextUnit,
|
||||
}
|
||||
|
||||
fn setup_data() -> Data {
|
||||
let mut runner = test_runner::TestRunner::default();
|
||||
{
|
||||
struct TestRng {
|
||||
rng: XorShiftRng,
|
||||
}
|
||||
// HACK to be able to manually seed the TestRunner
|
||||
let rng: &mut TestRng = unsafe { std::mem::transmute(runner.rng()) };
|
||||
rng.rng = XorShiftRng::seed_from_u64(0);
|
||||
}
|
||||
|
||||
let text = {
|
||||
let arb = string_regex("([a-zA-Z_0-9]{10,50}.{1,5}\n){100,500}").unwrap();
|
||||
let tree = arb.new_tree(&mut runner).unwrap();
|
||||
tree.current()
|
||||
};
|
||||
|
||||
let edits = {
|
||||
let arb = arb_edits_custom(&text, 99, 100);
|
||||
let tree = arb.new_tree(&mut runner).unwrap();
|
||||
tree.current()
|
||||
};
|
||||
|
||||
let offset = {
|
||||
let arb = arb_offset(&text);
|
||||
let tree = arb.new_tree(&mut runner).unwrap();
|
||||
tree.current()
|
||||
};
|
||||
|
||||
let line_index = LineIndex::new(&text);
|
||||
|
||||
Data {
|
||||
text,
|
||||
line_index,
|
||||
edits,
|
||||
offset,
|
||||
}
|
||||
}
|
||||
|
||||
lazy_static! {
|
||||
static ref DATA: Data = setup_data();
|
||||
}
|
||||
|
||||
fn compare_translates(c: &mut Criterion) {
|
||||
let f1 = Fun::new("translate_after_edit", |b, _| {
|
||||
b.iter(|| {
|
||||
let d = &*DATA;
|
||||
line_index_utils::translate_after_edit(&d.text, d.offset, d.edits.clone());
|
||||
})
|
||||
});
|
||||
|
||||
let f2 = Fun::new("count_newlines", |b, _| {
|
||||
b.iter(|| {
|
||||
let d = &*DATA;
|
||||
line_index_utils::count_newlines(d.offset, &d.line_index, &d.edits);
|
||||
})
|
||||
});
|
||||
|
||||
let functions = vec![f1, f2];
|
||||
|
||||
c.bench_functions("translate", functions, ());
|
||||
}
|
||||
|
||||
criterion_group!(benches, compare_translates);
|
||||
criterion_main!(benches);
|
||||
|
|
@ -2,7 +2,8 @@ mod code_actions;
|
|||
mod extend_selection;
|
||||
mod folding_ranges;
|
||||
mod line_index;
|
||||
mod line_index_utils;
|
||||
// public for benchmarkig
|
||||
pub mod line_index_utils;
|
||||
mod symbols;
|
||||
#[cfg(test)]
|
||||
mod test_utils;
|
||||
|
|
@ -13,7 +14,6 @@ pub use self::{
|
|||
extend_selection::extend_selection,
|
||||
folding_ranges::{folding_ranges, Fold, FoldKind},
|
||||
line_index::{LineCol, LineIndex},
|
||||
line_index_utils::translate_offset_with_edit,
|
||||
symbols::{file_structure, file_symbols, FileSymbol, StructureNode},
|
||||
typing::{join_lines, on_enter, on_eq_typed},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,136 +24,6 @@ impl<'a> Iterator for OffsetNewlineIter<'a> {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct AltEdit<'a> {
|
||||
insert_newlines: OffsetNewlineIter<'a>,
|
||||
delete: TextRange,
|
||||
diff: i64,
|
||||
}
|
||||
|
||||
fn translate_range_by(range: TextRange, diff: i64) -> TextRange {
|
||||
if diff == 0 {
|
||||
range
|
||||
} else {
|
||||
let start = translate_by(range.start(), diff);
|
||||
let end = translate_by(range.end(), diff);
|
||||
TextRange::from_to(start, end)
|
||||
}
|
||||
}
|
||||
|
||||
fn translate_by(x: TextUnit, diff: i64) -> TextUnit {
|
||||
if diff == 0 {
|
||||
x
|
||||
} else {
|
||||
TextUnit::from((x.to_usize() as i64 + diff) as u32)
|
||||
}
|
||||
}
|
||||
|
||||
fn to_alt_edits<'a>(offset: TextUnit, edits: &'a [AtomTextEdit]) -> Vec<AltEdit<'a>> {
|
||||
let mut xs: Vec<AltEdit<'a>> = Vec::with_capacity(edits.len());
|
||||
// collect and sort edits
|
||||
for edit in edits {
|
||||
// TODO discard after translating?
|
||||
// if edit.delete.start() >= offset {
|
||||
// continue;
|
||||
// }
|
||||
let insert_index = xs.upper_bound_by_key(&edit.delete.start(), |x| x.delete.start());
|
||||
let diff = edit.insert.len() as i64 - edit.delete.len().to_usize() as i64;
|
||||
xs.insert(
|
||||
insert_index,
|
||||
AltEdit {
|
||||
insert_newlines: OffsetNewlineIter {
|
||||
offset: edit.delete.start(),
|
||||
text: &edit.insert,
|
||||
},
|
||||
delete: edit.delete,
|
||||
diff: diff,
|
||||
},
|
||||
);
|
||||
}
|
||||
// translate edits by previous edits
|
||||
for i in 1..xs.len() {
|
||||
let (x, prevs) = xs[0..=i].split_last_mut().unwrap();
|
||||
for prev in prevs {
|
||||
x.delete = translate_range_by(x.delete, prev.diff);
|
||||
x.insert_newlines.offset = translate_by(x.insert_newlines.offset, prev.diff);
|
||||
}
|
||||
}
|
||||
xs
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
enum NextNewline {
|
||||
Use,
|
||||
Discard,
|
||||
Replace(TextUnit),
|
||||
New(TextUnit),
|
||||
}
|
||||
|
||||
fn next_newline(candidate: Option<TextUnit>, edits: &mut [AltEdit]) -> NextNewline {
|
||||
let mut candidate = match candidate {
|
||||
None => {
|
||||
for edit in edits {
|
||||
if let Some(inserted) = edit.insert_newlines.next() {
|
||||
return NextNewline::New(inserted);
|
||||
}
|
||||
}
|
||||
return NextNewline::Use; // END
|
||||
}
|
||||
Some(x) => x,
|
||||
};
|
||||
|
||||
for edit in edits {
|
||||
if candidate <= edit.delete.start() {
|
||||
return NextNewline::Replace(candidate);
|
||||
} else if candidate <= edit.delete.end() {
|
||||
return match edit.insert_newlines.next() {
|
||||
Some(x) => NextNewline::Replace(x),
|
||||
None => NextNewline::Discard,
|
||||
};
|
||||
} else {
|
||||
if let Some(inserted) = edit.insert_newlines.next() {
|
||||
return NextNewline::New(inserted);
|
||||
}
|
||||
candidate = translate_by(candidate, edit.diff);
|
||||
}
|
||||
}
|
||||
return NextNewline::Replace(candidate);
|
||||
}
|
||||
|
||||
pub fn count_newlines(offset: TextUnit, line_index: &LineIndex, edits: &[AtomTextEdit]) -> u32 {
|
||||
let mut edits = to_alt_edits(offset, edits);
|
||||
let mut orig_newlines = line_index.newlines().iter().map(|x| *x).peekable();
|
||||
|
||||
let mut count = 0;
|
||||
|
||||
loop {
|
||||
let res = next_newline(orig_newlines.peek().map(|x| *x), &mut edits);
|
||||
let next = match res {
|
||||
NextNewline::Use => orig_newlines.next(),
|
||||
NextNewline::Discard => {
|
||||
orig_newlines.next();
|
||||
continue;
|
||||
}
|
||||
NextNewline::Replace(new) => {
|
||||
orig_newlines.next();
|
||||
Some(new)
|
||||
}
|
||||
NextNewline::New(new) => Some(new),
|
||||
};
|
||||
match next {
|
||||
Some(n) if n <= offset => {
|
||||
count += 1;
|
||||
}
|
||||
_ => {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
count
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
enum NextNewlines<'a> {
|
||||
Use,
|
||||
|
|
@ -188,7 +58,7 @@ impl<'a, 'b> Edits<'a, 'b> {
|
|||
self.acc_diff += self.current.as_ref().map_or(0, |x| x.diff);
|
||||
match self.edits.split_first() {
|
||||
Some((next, rest)) => {
|
||||
let delete = translate_range_by(next.delete, self.acc_diff);
|
||||
let delete = self.translate_range(next.delete);
|
||||
let diff = next.insert.len() as i64 - next.delete.len().to_usize() as i64;
|
||||
self.current = Some(TranslatedEdit {
|
||||
delete,
|
||||
|
|
@ -241,9 +111,27 @@ impl<'a, 'b> Edits<'a, 'b> {
|
|||
};
|
||||
res
|
||||
}
|
||||
|
||||
fn translate_range(&self, range: TextRange) -> TextRange {
|
||||
if self.acc_diff == 0 {
|
||||
range
|
||||
} else {
|
||||
let start = self.translate(range.start());
|
||||
let end = self.translate(range.end());
|
||||
TextRange::from_to(start, end)
|
||||
}
|
||||
}
|
||||
|
||||
fn translate(&self, x: TextUnit) -> TextUnit {
|
||||
if self.acc_diff == 0 {
|
||||
x
|
||||
} else {
|
||||
TextUnit::from((x.to_usize() as i64 + self.acc_diff) as u32)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn count_newlines_alt(offset: TextUnit, line_index: &LineIndex, edits: &[AtomTextEdit]) -> u32 {
|
||||
pub fn count_newlines(offset: TextUnit, line_index: &LineIndex, edits: &[AtomTextEdit]) -> u32 {
|
||||
let mut sorted_edits: Vec<&AtomTextEdit> = Vec::with_capacity(edits.len());
|
||||
for edit in edits {
|
||||
let insert_index =
|
||||
|
|
@ -257,7 +145,7 @@ pub fn count_newlines_alt(offset: TextUnit, line_index: &LineIndex, edits: &[Ato
|
|||
|
||||
for &orig_newline in line_index.newlines() {
|
||||
loop {
|
||||
let translated_newline = translate_by(orig_newline, state.acc_diff);
|
||||
let translated_newline = state.translate(orig_newline);
|
||||
match state.next_newlines(translated_newline) {
|
||||
NextNewlines::Use => {
|
||||
if offset < translated_newline {
|
||||
|
|
@ -369,69 +257,5 @@ mod test {
|
|||
let actual_lines = count_newlines(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt(x in arb_text_with_offset_and_edits()) {
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt_1() {
|
||||
let x = ArbTextWithOffsetAndEdits {
|
||||
text: String::from("aA\n"),
|
||||
offset: 2.into(),
|
||||
edits: vec![AtomTextEdit::delete(TextRange::from_to(1.into(), 2.into()))],
|
||||
};
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt_2() {
|
||||
let x = ArbTextWithOffsetAndEdits {
|
||||
text: String::from("\nqꀸ#"),
|
||||
offset: 5.into(),
|
||||
edits: vec![AtomTextEdit::insert(1.into(), "\n".into())],
|
||||
};
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt_3() {
|
||||
let x = ArbTextWithOffsetAndEdits {
|
||||
text: String::from("\n\n\n"),
|
||||
offset: 0.into(),
|
||||
edits: vec![AtomTextEdit::delete(TextRange::from_to(0.into(), 2.into()))],
|
||||
};
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_translate_offset_with_edit_alt_4() {
|
||||
let x = ArbTextWithOffsetAndEdits {
|
||||
text: String::from("☻54翑\"A"),
|
||||
offset: 5.into(),
|
||||
edits: vec![
|
||||
AtomTextEdit::delete(TextRange::from_to(0.into(), 8.into())),
|
||||
AtomTextEdit::insert(9.into(), String::from("\n")),
|
||||
],
|
||||
};
|
||||
let line_index = LineIndex::new(&x.text);
|
||||
let expected = translate_after_edit(&x.text, x.offset, x.edits.clone());
|
||||
let actual_lines = count_newlines_alt(x.offset, &line_index, &x.edits);
|
||||
assert_eq!(actual_lines, expected.line);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@ pub fn arb_offset(text: &str) -> BoxedStrategy<TextUnit> {
|
|||
}
|
||||
|
||||
pub fn arb_edits(text: &str) -> BoxedStrategy<Vec<AtomTextEdit>> {
|
||||
arb_edits_custom(&text, 0, 7)
|
||||
}
|
||||
|
||||
pub fn arb_edits_custom(text: &str, min: usize, max: usize) -> BoxedStrategy<Vec<AtomTextEdit>> {
|
||||
if text.is_empty() {
|
||||
// only valid edits
|
||||
return Just(vec![])
|
||||
|
|
@ -37,9 +41,10 @@ pub fn arb_edits(text: &str) -> BoxedStrategy<Vec<AtomTextEdit>> {
|
|||
}
|
||||
|
||||
let offsets = text_offsets(text);
|
||||
let max_cuts = offsets.len().min(7);
|
||||
let max_cuts = max.min(offsets.len());
|
||||
let min_cuts = min.min(offsets.len() - 1);
|
||||
|
||||
proptest::sample::subsequence(offsets, 0..max_cuts)
|
||||
proptest::sample::subsequence(offsets, min_cuts..max_cuts)
|
||||
.prop_flat_map(|cuts| {
|
||||
let strategies: Vec<_> = cuts
|
||||
.chunks(2)
|
||||
|
|
|
|||
Loading…
Reference in a new issue