mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-22 18:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
656 commits 510 branches 815 tags 252 MiB
Commit graph

656 commits

This branch
This branch
All branches
Author SHA1 Message Date
Max Brunsfeld
3c0673852b 💄 Add Buffer::row_count 2021-05-26 12:01:09 -07:00
Antonio Scandurra
7c084846af Batch indent_for_rows 
There's still a `todo!` in the test to write more assertions and verify
this more complex, batched logic.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-26 17:37:50 +02:00
Antonio Scandurra
9b69cea75a Replace mod_item with declaration_list for Rust's autoindent 2021-05-26 16:00:01 +02:00
Antonio Scandurra
acf84f939d Add Buffer::autoindent_for_row 2021-05-26 16:00:01 +02:00
Antonio Scandurra
d38d944fef Add indent and indent_nodes configs in the language config.toml 2021-05-26 15:45:58 +02:00
Antonio Scandurra
04c7989720 Extract a LanguageConfig and load it from language-dir/config.toml 2021-05-26 10:27:14 +02:00
Antonio Scandurra
5485c1a749 Add test for font selection 2021-05-26 09:41:57 +02:00
Antonio Scandurra
9642e9b425 Honor italic in syntax themes 2021-05-26 09:41:30 +02:00
Antonio Scandurra
e0cb5ccfba Honor bold in syntax themes 2021-05-26 09:23:48 +02:00
Antonio Scandurra
ab64f2dd1d Update tree-sitter 2021-05-26 09:10:06 +02:00
Max Brunsfeld
c80812c809 Add a few more rust highlighting patterns 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-25 17:42:46 -07:00
Max Brunsfeld
5d2ac3f4e4 Use new Tree-sitter captures API 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-25 16:02:43 -07:00
Antonio Scandurra
43ddb6f640 WIP: Push failing test for DisplayMap::highlighted_chunks_at 2021-05-25 17:20:46 +02:00
Antonio Scandurra
2e7593dd79 💄 2021-05-25 14:20:53 +02:00
Antonio Scandurra
bafac35d6a Reparse if syntax tree is up-to-date but in an interpolated state 2021-05-25 12:10:36 +02:00
Antonio Scandurra
aeb68867da Move highlighted_text_in_range from Buffer to buffer::Snapshot 2021-05-25 11:51:29 +02:00
Max Brunsfeld
e54a31ead2 Bump tree-sitter for QueryCaptures::advance methods 2021-05-24 21:21:31 -07:00
Max Brunsfeld
8340958b33 Convert query capture indices to style ids 
* Introduce a Theme struct as a new part of the app's settings
* Store on each Language a ThemeMap, which converts the capture ids
  from that language's highlight query into StyleIds, which identify
  styles in the current Theme.
* Update `highlighted_chunks` methods to provide StyleIds instead of
  capture ids.
 2021-05-24 16:44:14 -07:00
Antonio Scandurra
bc8d2b2f1d 💄 2021-05-24 17:14:17 +02:00
Antonio Scandurra
d063ebdf9b Correctly store current chunk offset in fold_map::HighlightedChunks 2021-05-24 16:52:01 +02:00
Antonio Scandurra
c50f978eff Change BufferView::layout_lines to use highlighted_chunks_at 2021-05-24 16:51:32 +02:00
Antonio Scandurra
d1788c69ab Support highlighted_text_for_range for buffers without a language 2021-05-24 16:47:13 +02:00
Antonio Scandurra
4b8805bad2 Add DisplayMap::highlighted_chunks_at(row) 
Note that this API doesn't take a DisplayPoint: it could but it
makes things a bit harder on the implementation side and we don't
really need it anyway, as text is laid out on a line-by-line basis
anyway.
 2021-05-24 16:46:11 +02:00
Antonio Scandurra
4ddf10967e Introduce fold_map::HighlightedChunks 2021-05-24 15:39:22 +02:00
Antonio Scandurra
491932b691 Rename HighlightedChunksIter to HighlightedChunks 2021-05-24 15:07:02 +02:00
Antonio Scandurra
4ada5e0666 Rename rope::ChunksIter to rope::Chunks 
This is consistent with how we name the other chunk iterators.
 2021-05-24 15:05:11 +02:00
Antonio Scandurra
6e791edb18 Don't acquire the buffer mutably in highlighted_text_for_range 2021-05-24 12:43:29 +02:00
Antonio Scandurra
23b25307d9 Start on a basic implementation of HighlightedChunksIter 2021-05-24 11:23:42 +02:00
Max Brunsfeld
b51ae1f668 WIP 2021-05-23 21:42:45 -07:00
Antonio Scandurra
b0859d4265 Extract a Buffer::syntax_tree to sync the syntax tree with the buffer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-22 12:34:35 +02:00
Antonio Scandurra
c1b4cca48b Delete commented-out diff code 2021-05-22 12:34:35 +02:00
Antonio Scandurra
3a576f0b65 Don't clone visible_text for splicing edits into the parse tree 2021-05-22 12:34:35 +02:00
Antonio Scandurra
64b1113455 Restructure parsing to use edits_since 2021-05-22 12:34:35 +02:00
Antonio Scandurra
9836f1f638 Reparse buffer on undo, redo and after applying a remote operation 2021-05-22 12:34:35 +02:00
Max Brunsfeld
fe8dc9fba0 Add a unit test for reparsing a buffer 2021-05-22 12:34:35 +02:00
Max Brunsfeld
46e6b2cff4 Start maintaining a syntax tree on buffers 2021-05-22 12:34:35 +02:00
Max Brunsfeld
4e74a8726c Bump context-predicate grammar to the latest Tree-sitter 2021-05-22 12:34:35 +02:00
Max Brunsfeld
2f378be1a8 Introduce LanguageRegistry object 
* Include it, along with settings in `OpenParams` grouped under a new struct called `AppState`

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-22 12:34:35 +02:00
Nathan Sobo
eb345e7182
Merge pull request #71 from zed-industries/simplify-text-layout 
Pass scalar lengths and include colors when specifying styling runs during text layout
 2021-05-21 14:40:48 -06:00
Nathan Sobo
5d614e7e54 Fix test assertions 2021-05-21 14:36:52 -06:00
Nathan Sobo
2c122eb253 Fix typo 2021-05-21 14:36:44 -06:00
Nathan Sobo
b075b0108d Clarify variable name 2021-05-21 14:14:05 -06:00
Nathan Sobo
92ff7f4e5e Accept colors in styling runs passed to layout_str 
Also move from the runs being expressed as ranges to the runs being expressed as a sequence of contiguous scalar lengths.
 2021-05-21 14:10:38 -06:00
Antonio Scandurra
b42f5142f7 Rename rightmost_{row,chars} to longest_{row,chars} 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-20 16:32:09 +02:00
Antonio Scandurra
86199c588f
Merge pull request #70 from zed-industries/optimizations 
Structure buffer APIs in terms of strings and byte counts instead of chars and character counts
 2021-05-20 13:02:46 +02:00
Antonio Scandurra
6a0757ebf9 Don't store rightmost row/char-column as a Point 2021-05-20 12:52:58 +02:00
Antonio Scandurra
995b80ff26 Index into prefix or path depending on where the match was found 
This fixes a couple of tests that were panicking due to an out-of-bound
access.
 2021-05-20 12:47:08 +02:00
Antonio Scandurra
ed57ffe5fa Replace rightmost_point with righmost_row 2021-05-20 12:47:08 +02:00
Antonio Scandurra
96538354b3 Express rightmost_point in terms of chars as opposed to bytes 2021-05-20 12:47:08 +02:00
Antonio Scandurra
608336c279 Complete unit test for Label highlights 2021-05-20 12:47:08 +02:00