Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename CompletionLabel to CodeLabel and add Project::symbols

Browse source 
This only works locally for now and we haven't implemented the
`RustLsp::label_for_symbol` method yet.
This commit is contained in:
Antonio Scandurra 2022-02-22 10:01:08 +01:00
parent 8f375a5026
commit 8a8ae0fbcd
7 changed files with 107 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/project_symbols/src/project_symbols.rs
View file

@ -1,6 +1,8 @@
use std::{cmp, sync::Arc};
use editor::{combine_syntax_and_fuzzy_match_highlights, Editor, EditorSettings};
use editor::{
combine_syntax_and_fuzzy_match_highlights, styled_runs_for_code_label, Editor, EditorSettings,
};
use fuzzy::StringMatch;
use gpui::{
action,
@ -167,7 +169,12 @@ impl ProjectSymbolsView {
cx.emit(Event::Dismissed);
}
fn update_matches(&mut self, _: &mut ViewContext<Self>) {}
fn update_matches(&mut self, cx: &mut ViewContext<Self>) {
let query = self.query_editor.read(cx).text(cx);
self.project
.update(cx, |project, cx| project.symbols(&query, cx))
.detach_and_log_err(cx);
}
fn render_matches(&self) -> ElementBox {
if self.matches.is_empty() {
@ -215,13 +222,18 @@ impl ProjectSymbolsView {
&settings.theme.selector.item
};
let symbol = &self.symbols[string_match.candidate_id];
let syntax_runs = styled_runs_for_code_label(
&symbol.label,
style.label.text.color,
&settings.theme.editor.syntax,
);
Text::new(symbol.text.clone(), style.label.text.clone())
Text::new(symbol.label.text.clone(), style.label.text.clone())
.with_soft_wrap(false)
.with_highlights(combine_syntax_and_fuzzy_match_highlights(
&symbol.text,
&symbol.label.text,
style.label.text.clone().into(),
symbol.highlight_ranges.iter().cloned(),
syntax_runs,
&string_match.positions,
))
.contained()