git.iko.soy/helix
on master help sign in
More work on the UI.
commit3859f6963dfad2d2d09c979a8e6bb283bc5e2cb3 authorBlaž Hrastnik <blaz@mxxn.io> dateSat 19 Sep 2020, 11:55 (6 years ago) parenteb477ec
6 files changed+148−60
compare with master
unifiedsplit
Cargo.lock+87−36 helix-core/src/state.rs+5 helix-core/src/syntax.rs+1−1 helix-core/src/transaction.rs+2−2 helix-term/src/editor.rs+49−21 helix-term/src/theme.rs+4
Cargo.lock+87−36
@@ -73,9 +73,9 @@ dependencies = [
7373
7474[[package]]
7575name = "async-executor"
76−version = "1.0.0"
76+version = "1.1.1"
7777source = "registry+https://github.com/rust-lang/crates.io-index"
78−checksum = "62f049075ec7a47ee59ed2e3013026e26e66b7430b1f2276c1e6ad9d5cfbff8f"
78+checksum = "a831e74aa1937d3bbd3a356f34c23dbc6b6f0abc5160bd5484a9f75d5e76aea8"
7979dependencies = [
8080 "async-task",
8181 "concurrent-queue",
@@ -86,9 +86,9 @@ dependencies = [
8686
8787[[package]]
8888name = "async-fs"
89−version = "1.2.1"
89+version = "1.3.0"
9090source = "registry+https://github.com/rust-lang/crates.io-index"
91−checksum = "3361d088d288026af2cb21b9d9b8444bf0ba73bce56a4fc4b5742ba88f82ee74"
91+checksum = "e3572236ba37147ca2b674a0bd5afd20aec0cd925ab125ab6fad6543960f9002"
9292dependencies = [
9393 "blocking",
9494 "futures-lite",
@@ -96,31 +96,27 @@ dependencies = [
9696
9797[[package]]
9898name = "async-io"
99−version = "1.0.1"
99+version = "1.1.2"
100100source = "registry+https://github.com/rust-lang/crates.io-index"
101−checksum = "016a7f0eda7091ef24ad8562d6503ad8da47af8c432d4d3fa440eea9e89055fe"
101+checksum = "64c629684e697f58c0e99e5e2d84a840e3b336afbcfdbac7b44c3b1e222c2fd8"
102102dependencies = [
103− "cfg-if",
104103 "concurrent-queue",
105104 "fastrand",
106105 "futures-lite",
107− "libc",
108106 "log",
107+ "nb-connect",
109108 "once_cell",
110109 "parking",
111110 "polling",
112− "socket2",
113111 "vec-arena",
114112 "waker-fn",
115− "wepoll-sys-stjepang",
116− "winapi",
117113]
118114
119115[[package]]
120116name = "async-lock"
121−version = "2.1.2"
117+version = "2.1.3"
122118source = "registry+https://github.com/rust-lang/crates.io-index"
123−checksum = "2b123db9bf64e4c4840d5b1985fdb4f69fbe50a4fc95e895d11ff49931ce9802"
119+checksum = "ab3ad7fb4345397e57c19566844b0eba274b92e5d2d2791bb0664cc441697b95"
124120dependencies = [
125121 "async-barrier",
126122 "async-mutex",
@@ -139,9 +135,9 @@ dependencies = [
139135
140136[[package]]
141137name = "async-net"
142−version = "1.2.0"
138+version = "1.3.0"
143139source = "registry+https://github.com/rust-lang/crates.io-index"
144−checksum = "f9c1d358c27ba114eab4330c50d21879ad0e6af192f01dba6fec1ab3b1e03d90"
140+checksum = "a48af5438be856056bdeb6c5d895148a715be5915fccee49d1e5b50851dc9b8b"
145141dependencies = [
146142 "async-io",
147143 "blocking",
@@ -229,9 +225,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
229225
230226[[package]]
231227name = "cc"
232−version = "1.0.59"
228+version = "1.0.60"
233229source = "registry+https://github.com/rust-lang/crates.io-index"
234−checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
230+checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
235231dependencies = [
236232 "jobserver",
237233]
@@ -262,13 +258,13 @@ dependencies = [
262258
263259[[package]]
264260name = "crossterm"
265−version = "0.17.8"
261+version = "0.17.7"
266262source = "registry+https://github.com/rust-lang/crates.io-index"
267−checksum = "858085e389f71d31a6909f2b55a56b87d1cb8b168c0f513dcbed5e66a3e1039c"
263+checksum = "6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7"
268264dependencies = [
269265 "bitflags",
270266 "crossterm_winapi",
271− "futures-core",
267+ "futures-util",
272268 "lazy_static",
273269 "libc",
274270 "mio",
@@ -342,9 +338,9 @@ checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
342338
343339[[package]]
344340name = "futures-lite"
345−version = "1.3.0"
341+version = "1.7.0"
346342source = "registry+https://github.com/rust-lang/crates.io-index"
347−checksum = "4fc6854fcb40c6446abf6043e82604e42567dcf3d652a5ff4e997fc36876414c"
343+checksum = "5b77e08e656f472d8ea84c472fa8b0a7a917883048e1cf2d4e34a323cd0aaf63"
348344dependencies = [
349345 "fastrand",
350346 "futures-core",
@@ -355,6 +351,24 @@ dependencies = [
355351 "waker-fn",
356352]
357353
354+[[package]]
355+name = "futures-task"
356+version = "0.3.5"
357+source = "registry+https://github.com/rust-lang/crates.io-index"
358+checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
359+
360+[[package]]
361+name = "futures-util"
362+version = "0.3.5"
363+source = "registry+https://github.com/rust-lang/crates.io-index"
364+checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
365+dependencies = [
366+ "futures-core",
367+ "futures-task",
368+ "pin-project",
369+ "pin-utils",
370+]
371+
358372[[package]]
359373name = "heck"
360374version = "0.3.1"
@@ -370,6 +384,7 @@ version = "0.1.0"
370384dependencies = [
371385 "anyhow",
372386 "helix-syntax",
387+ "once_cell",
373388 "ropey",
374389 "smallvec",
375390 "tendril",
@@ -427,9 +442,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
427442
428443[[package]]
429444name = "libc"
430−version = "0.2.76"
445+version = "0.2.77"
431446source = "registry+https://github.com/rust-lang/crates.io-index"
432−checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
447+checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
433448
434449[[package]]
435450name = "lock_api"
@@ -485,6 +500,16 @@ dependencies = [
485500 "winapi",
486501]
487502
503+[[package]]
504+name = "nb-connect"
505+version = "1.0.0"
506+source = "registry+https://github.com/rust-lang/crates.io-index"
507+checksum = "e847c76b390f44529c2071ef06d0b52fbb4bdb04cc8987a5cfa63954c000abca"
508+dependencies = [
509+ "libc",
510+ "winapi",
511+]
512+
488513[[package]]
489514name = "new_debug_unreachable"
490515version = "1.0.4"
@@ -546,17 +571,43 @@ dependencies = [
546571 "winapi",
547572]
548573
574+[[package]]
575+name = "pin-project"
576+version = "0.4.23"
577+source = "registry+https://github.com/rust-lang/crates.io-index"
578+checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
579+dependencies = [
580+ "pin-project-internal",
581+]
582+
583+[[package]]
584+name = "pin-project-internal"
585+version = "0.4.23"
586+source = "registry+https://github.com/rust-lang/crates.io-index"
587+checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
588+dependencies = [
589+ "proc-macro2",
590+ "quote",
591+ "syn",
592+]
593+
549594[[package]]
550595name = "pin-project-lite"
551596version = "0.1.7"
552597source = "registry+https://github.com/rust-lang/crates.io-index"
553598checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
554599
600+[[package]]
601+name = "pin-utils"
602+version = "0.1.0"
603+source = "registry+https://github.com/rust-lang/crates.io-index"
604+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
605+
555606[[package]]
556607name = "polling"
557−version = "1.0.1"
608+version = "1.0.3"
558609source = "registry+https://github.com/rust-lang/crates.io-index"
559−checksum = "0835fa5f9af34c170eb38638ae6bc88e1b11ecdd0b968c9d9de8e343450385eb"
610+checksum = "0307b8c7f438902536321f63c28cab0362f6ee89f1c7da47e3642ff956641c8b"
560611dependencies = [
561612 "cfg-if",
562613 "libc",
@@ -567,9 +618,9 @@ dependencies = [
567618
568619[[package]]
569620name = "proc-macro2"
570−version = "1.0.20"
621+version = "1.0.21"
571622source = "registry+https://github.com/rust-lang/crates.io-index"
572−checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"
623+checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c"
573624dependencies = [
574625 "unicode-xid",
575626]
@@ -651,9 +702,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
651702
652703[[package]]
653704name = "smol"
654−version = "1.0.0"
705+version = "1.0.1"
655706source = "registry+https://github.com/rust-lang/crates.io-index"
656−checksum = "1ee895b9f862d88d6bad9d82f6ce727710d177338e697057a691ea684800d4a6"
707+checksum = "712d02afa6ac9e7b8c777fd181aff476d009280b54b8c28703d10fa5d7e80d83"
657708dependencies = [
658709 "async-channel",
659710 "async-executor",
@@ -669,9 +720,9 @@ dependencies = [
669720
670721[[package]]
671722name = "socket2"
672−version = "0.3.12"
723+version = "0.3.15"
673724source = "registry+https://github.com/rust-lang/crates.io-index"
674−checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
725+checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44"
675726dependencies = [
676727 "cfg-if",
677728 "libc",
@@ -681,9 +732,9 @@ dependencies = [
681732
682733[[package]]
683734name = "syn"
684−version = "1.0.40"
735+version = "1.0.41"
685736source = "registry+https://github.com/rust-lang/crates.io-index"
686−checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
737+checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
687738dependencies = [
688739 "proc-macro2",
689740 "quote",
@@ -770,9 +821,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
770821
771822[[package]]
772823name = "wepoll-sys-stjepang"
773−version = "1.0.6"
824+version = "1.0.8"
774825source = "registry+https://github.com/rust-lang/crates.io-index"
775−checksum = "6fd319e971980166b53e17b1026812ad66c6b54063be879eb182342b55284694"
826+checksum = "1fdfbb03f290ca0b27922e8d48a0997b4ceea12df33269b9f75e713311eb178d"
776827dependencies = [
777828 "cc",
778829]
helix-core/src/state.rs+5
@@ -102,6 +102,11 @@ impl State {
102102 self.mode
103103 }
104104
105+ #[inline]
106+ pub fn path(&self) -> Option<&PathBuf> {
107+ self.path.as_ref()
108+ }
109+
105110 // pub fn doc<R>(&self, range: R) -> RopeSlice
106111 // where
107112 // R: std::ops::RangeBounds<usize>,
helix-core/src/syntax.rs+1−1
@@ -173,7 +173,7 @@ impl LanguageLayer {
173173 self.tree.as_ref().unwrap()
174174 }
175175
176− fn parse<'a>(
176+ fn parse(
177177 &mut self,
178178 parser: &mut Parser,
179179 config: &HighlightConfiguration,
helix-core/src/transaction.rs+2−2
@@ -243,13 +243,13 @@ impl ChangeSet {
243243 let old_end = old_pos + len;
244244
245245 match change {
246− Retain(_len) => {
246+ Retain(_) => {
247247 if old_end > pos {
248248 return new_pos + (pos - old_pos);
249249 }
250250 new_pos += len;
251251 }
252− Delete(_len) => {
252+ Delete(_) => {
253253 // a subsequent ins means a replace, consume it
254254 let ins = if let Some(Insert(s)) = iter.peek() {
255255 iter.next();
helix-term/src/editor.rs+49−21
@@ -80,6 +80,8 @@ impl Editor {
8080 }
8181
8282 fn render(&mut self) {
83+ use tui::backend::Backend;
84+ use tui::style::Color;
8385 // TODO: ideally not mut but highlights require it because of cursor cache
8486 match &mut self.state {
8587 Some(state) => {
@@ -87,9 +89,21 @@ impl Editor {
8789 let mut stdout = stdout();
8890 self.surface.reset(); // reset is faster than allocating new empty surface
8991
92+ // clear with background color
93+ self.surface
94+ .set_style(area, self.theme.get("ui.background"));
95+
96+ let offset = 5 + 1; // 5 linenr + 1 gutter
97+ let viewport = Rect::new(offset, 0, self.size.0, self.size.1 - 1); // - 1 for statusline
98+
9099 // TODO: inefficient, should feed chunks.iter() to tree_sitter.parse_with(|offset, pos|)
91100 let source_code = state.doc().to_string();
92101
102+ let last_line = std::cmp::min(
103+ (self.first_line + viewport.height - 1) as usize,
104+ state.doc().len_lines() - 1,
105+ );
106+
93107 // TODO: cache highlight results
94108 // TODO: only recalculate when state.doc is actually modified
95109 let highlights: Vec<_> = state
@@ -102,12 +116,10 @@ impl Editor {
102116
103117 let mut spans = Vec::new();
104118
105− let offset = 2;
106−
107119 let mut visual_x = 0;
108− let mut line = 0;
120+ let mut line = 0u16;
109121
110− for event in highlights {
122+ 'outer: for event in highlights {
111123 match event.unwrap() {
112124 HighlightEvent::HighlightStart(span) => {
113125 spans.push(span);
@@ -125,8 +137,6 @@ impl Editor {
125137
126138 use helix_core::graphemes::{grapheme_width, RopeGraphemes};
127139
128− use tui::style::Color;
129−
130140 let style = match spans.first() {
131141 Some(span) => self.theme.get(self.theme.scopes()[span.0].as_str()),
132142 None => Style::default().fg(Color::Rgb(164, 160, 232)), // lavender
@@ -143,6 +153,11 @@ impl Editor {
143153 if grapheme == "\n" {
144154 visual_x = 0;
145155 line += 1;
156+
157+ // TODO: with proper iter this shouldn't be necessary
158+ if line >= viewport.height {
159+ break 'outer;
160+ }
146161 } else {
147162 // Cow will prevent allocations if span contained in a single slice
148163 // which should really be the majority case
@@ -163,7 +178,13 @@ impl Editor {
163178 }
164179 }
165180
166− //
181+ let mut line = 0;
182+ let style = self.theme.get("ui.linenr");
183+ for i in self.first_line..(last_line as u16) {
184+ self.surface
185+ .set_stringn(0, line, format!("{:>5}", i + 1), 5, style); // lavender
186+ line += 1;
187+ }
167188
168189 // let lines = state
169190 // .doc
@@ -190,19 +211,23 @@ impl Editor {
190211 // // TODO: don't highlight next char in append mode
191212 // }
192213
193− // let mode = match state.mode {
194− // Mode::Insert => "INS",
195− // Mode::Normal => "NOR",
196− // };
197−
198− // execute!(
199− // stdout,
200− // SetForegroundColor(Color::Reset),
201− // cursor::MoveTo(0, self.size.1),
202− // Print(mode)
203− // );
204−
205− use tui::backend::Backend;
214+ // statusline
215+ let mode = match state.mode() {
216+ Mode::Insert => "INS",
217+ Mode::Normal => "NOR",
218+ };
219+ self.surface.set_style(
220+ Rect::new(0, self.size.1 - 1, self.size.0, 1),
221+ self.theme.get("ui.statusline"),
222+ );
223+ // TODO: unfocused one with different color
224+ let text_color = Style::default().fg(Color::Rgb(219, 191, 239)); // lilac
225+ self.surface
226+ .set_string(1, self.size.1 - 1, mode, text_color);
227+ if let Some(path) = state.path() {
228+ self.surface
229+ .set_string(6, self.size.1 - 1, path.to_string_lossy(), text_color);
230+ }
206231
207232 self.terminal
208233 .backend_mut()
@@ -221,7 +246,10 @@ impl Editor {
221246 let coords = coords_at_pos(&state.doc().slice(..), pos);
222247 execute!(
223248 stdout,
224− cursor::MoveTo((coords.col + 2) as u16, coords.row as u16)
249+ cursor::MoveTo(
250+ coords.col as u16 + viewport.x,
251+ coords.row as u16 - self.first_line + viewport.y,
252+ )
225253 );
226254 }
227255 None => (),
helix-term/src/theme.rs+4
@@ -72,6 +72,10 @@ impl Default for Theme {
7272 "module" => Style::default().fg(Color::Rgb(255, 0, 0)), // white
7373 "variable" => Style::default().fg(Color::Rgb(255, 0, 0)), // white
7474 "function.builtin" => Style::default().fg(Color::Rgb(255, 0, 0)), // white
75+
76+ "ui.background" => Style::default().bg(Color::Rgb(59, 34, 76)), // midnight
77+ "ui.linenr" => Style::default().fg(Color::Rgb(90, 89, 119)), // comet
78+ "ui.statusline" => Style::default().bg(Color::Rgb(40, 23, 51)), // revolver
7579 };
7680
7781 let scopes = mapping.keys().map(ToString::to_string).collect();