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

Add lsp_settings_changed: Task to Project, need to resolve cx in Project::on_settings_changed

Browse source
This commit is contained in:
Isaac Clayton 2022-07-04 18:25:05 +02:00
parent f4b4212932
commit 7d128e81aa
2 changed files with 162 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/language/src/proto.rs
View file

@ -399,7 +399,7 @@ pub fn serialize_completion(completion: &Completion) -> proto::Completion {
pub async fn deserialize_completion(
completion: proto::Completion,
language: Option<&Arc<Language>>,
language: Option<Arc<Language>>,
) -> Result<Completion> {
let old_start = completion
.old_start

111
crates/project/src/project.rs
View file

@ -113,6 +113,7 @@ pub struct Project {
collaborators: HashMap<PeerId, Collaborator>,
client_subscriptions: Vec<client::Subscription>,
_subscriptions: Vec<gpui::Subscription>,
lsp_settings_changed: Option<Task<()>>,
opened_buffer: (Rc<RefCell<watch::Sender<()>>>, watch::Receiver<()>),
shared_buffers: HashMap<PeerId, HashSet<u64>>,
loading_buffers: HashMap<
@ -488,6 +489,7 @@ impl Project {
next_language_server_id: 0,
nonce: StdRng::from_entropy().gen(),
initialized_persistent_state: false,
lsp_settings_changed: None,
}
})
}
@ -602,6 +604,7 @@ impl Project {
buffer_snapshots: Default::default(),
nonce: StdRng::from_entropy().gen(),
initialized_persistent_state: false,
lsp_settings_changed: None,
};
for worktree in worktrees {
this.add_worktree(&worktree, cx);
@ -710,12 +713,13 @@ impl Project {
fn on_settings_changed(&mut self, cx: &mut ModelContext<'_, Self>) {
let settings = cx.global::<Settings>();
self.lsp_settings_changed = Some(cx.spawn(|_, _| async {
let mut language_servers_to_start = Vec::new();
for buffer in self.opened_buffers.values() {
if let Some(buffer) = buffer.upgrade(cx) {
let buffer = buffer.read(cx);
if let Some((file, language)) = File::from_dyn(buffer.file()).zip(buffer.language())
if let Some((file, language)) =
File::from_dyn(buffer.file()).zip(buffer.language())
{
if settings.enable_language_server(Some(&language.name())) {
let worktree = file.worktree.read(cx);
@ -734,9 +738,11 @@ impl Project {
if let Some(lsp_adapter) = language.lsp_adapter() {
if !settings.enable_language_server(Some(&language.name())) {
let lsp_name = lsp_adapter.name().await;
for (worktree_id, started_lsp_name) in self.started_language_servers.keys() {
for (worktree_id, started_lsp_name) in self.started_language_servers.keys()
{
if lsp_name == *started_lsp_name {
language_servers_to_stop.push((*worktree_id, started_lsp_name.clone()));
language_servers_to_stop
.push((*worktree_id, started_lsp_name.clone()));
}
}
}
@ -755,6 +761,7 @@ impl Project {
}
cx.notify();
}))
}
pub fn buffer_for_id(&self, remote_id: u64, cx: &AppContext) -> Option<ModelHandle<Buffer>> {
@ -3482,9 +3489,9 @@ impl Project {
let snapshot = this.snapshot();
let clipped_position = this.clip_point_utf16(position, Bias::Left);
let mut range_for_token = None;
Ok(completions
.into_iter()
.filter_map(|lsp_completion| {
let result = Vec::new();
for lsp_completion in completions.into_iter() {
// For now, we can only handle additional edits if they are returned
// when resolving the completion, not if they are present initially.
if lsp_completion
@ -3492,9 +3499,8 @@ impl Project {
.as_ref()
.map_or(false, |edits| !edits.is_empty())
{
return None;
continue;
}
let (old_range, mut new_text) = match lsp_completion.text_edit.as_ref()
{
// If the language server provides a range to overwrite, then
@ -3540,14 +3546,62 @@ impl Project {
text.clone(),
)
}
Some(lsp::CompletionTextEdit::InsertAndReplace(_)) => {
log::info!("unsupported insert/replace completion");
return None;
(
snapshot.anchor_before(start)..snapshot.anchor_after(end),
edit.new_text.clone(),
)
}
// If the language server does not provide a range, then infer
// the range based on the syntax tree.
None => {
if position != clipped_position {
log::info!("completion out of expected range");
continue;
}
};
LineEnding::normalize(&mut new_text);
Some(Completion {
old_range,
new_text,
label: {
match language.as_ref() {
Some(l) => l.label_for_completion(&lsp_completion).await,
None => None,
}
.unwrap_or_else(|| {
CodeLabel::plain(
lsp_completion.label.clone(),
lsp_completion.filter_text.as_deref(),
)
let Range { start, end } = range_for_token
.get_or_insert_with(|| {
let offset = position.to_offset(&snapshot);
let (range, kind) = snapshot.surrounding_word(offset);
if kind == Some(CharKind::Word) {
range
} else {
offset..offset
}
})
.clone();
let text = lsp_completion
.insert_text
.as_ref()
.unwrap_or(&lsp_completion.label)
.clone();
(
snapshot.anchor_before(start)..snapshot.anchor_after(end),
text.clone(),
)
}
Some(lsp::CompletionTextEdit::InsertAndReplace(_)) => {
log::info!("unsupported insert/replace completion");
continue;
}
};
let completion = Completion {
old_range,
new_text,
label: {
@ -3563,9 +3617,11 @@ impl Project {
})
},
lsp_completion,
})
})
.collect())
};
result.push(completion);
}
Ok(result)
})
})
} else if let Some(project_id) = self.remote_id() {
@ -3587,10 +3643,8 @@ impl Project {
let completions = Vec::new();
for completion in response.completions.into_iter() {
completions.push(
language::proto::deserialize_completion(completion, language.as_ref())
.await,
);
completions
.push(language::proto::deserialize_completion(completion, language).await);
}
completions.into_iter().collect()
})
@ -5205,7 +5259,7 @@ impl Project {
.payload
.completion
.ok_or_else(|| anyhow!("invalid completion"))?,
language,
language.cloned(),
);
Ok::<_, anyhow::Error>((buffer, completion))
})?;
@ -5605,7 +5659,12 @@ impl Project {
})
}
async fn deserialize_symbol(&self, serialized_symbol: proto::Symbol) -> Result<Symbol> {
fn deserialize_symbol(
&self,
serialized_symbol: proto::Symbol,
) -> impl Future<Output = Result<Symbol>> {
let languages = self.languages.clone();
async move {
let source_worktree_id = WorktreeId::from_proto(serialized_symbol.source_worktree_id);
let worktree_id = WorktreeId::from_proto(serialized_symbol.worktree_id);
let start = serialized_symbol
@ -5616,11 +5675,13 @@ impl Project {
.ok_or_else(|| anyhow!("invalid end"))?;
let kind = unsafe { mem::transmute(serialized_symbol.kind) };
let path = PathBuf::from(serialized_symbol.path);
let language = self.languages.select_language(&path);
let language = languages.select_language(&path);
Ok(Symbol {
source_worktree_id,
worktree_id,
language_server_name: LanguageServerName(serialized_symbol.language_server_name.into()),
language_server_name: LanguageServerName(
serialized_symbol.language_server_name.into(),
),
label: {
match language {
Some(language) => {
@ -5635,7 +5696,8 @@ impl Project {
name: serialized_symbol.name,
path,
range: PointUtf16::new(start.row, start.column)..PointUtf16::new(end.row, end.column),
range: PointUtf16::new(start.row, start.column)
..PointUtf16::new(end.row, end.column),
kind,
signature: serialized_symbol
.signature
@ -5643,6 +5705,7 @@ impl Project {
.map_err(|_| anyhow!("invalid signature"))?,
})
}
}
async fn handle_buffer_saved(
this: ModelHandle<Self>,