-use languageserver_types::{
- self, Location, Position, Range, SymbolKind, TextDocumentEdit, TextDocumentIdentifier,
- TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier, InsertTextFormat,
+use lsp_types::{
+ self, CreateFile, Documentation, DocumentChangeOperation, DocumentChanges, Location, LocationLink,
+ MarkupContent, MarkupKind, Position, Range, RenameFile, ResourceOp, SymbolKind, TextDocumentEdit, TextDocumentIdentifier,
+ TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier,
+ WorkspaceEdit,
+};
+use ra_ide_api::{
+ CompletionItem, CompletionItemKind, FileId, FilePosition, FileRange, FileSystemEdit,
+ NavigationTarget, SourceChange, SourceFileEdit, RangeInfo,
+ LineCol, LineIndex, translate_offset_with_edit, InsertTextFormat
};
-use ra_analysis::{FileId, FileSystemEdit, SourceChange, SourceFileEdit, FilePosition,FileRange, CompletionItem, CompletionItemKind, InsertText, NavigationTarget};
-use ra_editor::{LineCol, LineIndex, translate_offset_with_edit};
-use ra_text_edit::{AtomTextEdit, TextEdit};
use ra_syntax::{SyntaxKind, TextRange, TextUnit};
+use ra_text_edit::{AtomTextEdit, TextEdit};
use crate::{req, server_world::ServerWorld, Result};
SyntaxKind::TYPE_DEF => SymbolKind::TypeParameter,
SyntaxKind::STATIC_DEF => SymbolKind::Constant,
SyntaxKind::CONST_DEF => SymbolKind::Constant,
- SyntaxKind::IMPL_ITEM => SymbolKind::Object,
+ SyntaxKind::IMPL_BLOCK => SymbolKind::Object,
_ => SymbolKind::Variable,
}
}
}
impl Conv for CompletionItemKind {
- type Output = ::languageserver_types::CompletionItemKind;
+ type Output = ::lsp_types::CompletionItemKind;
fn conv(self) -> <Self as Conv>::Output {
- use ::languageserver_types::CompletionItemKind::*;
+ use lsp_types::CompletionItemKind::*;
match self {
CompletionItemKind::Keyword => Keyword,
CompletionItemKind::Snippet => Snippet,
CompletionItemKind::EnumVariant => EnumMember,
CompletionItemKind::Binding => Variable,
CompletionItemKind::Field => Field,
+ CompletionItemKind::Trait => Interface,
+ CompletionItemKind::TypeAlias => Struct,
+ CompletionItemKind::Const => Constant,
+ CompletionItemKind::Static => Value,
+ CompletionItemKind::Method => Method,
}
}
}
-impl Conv for CompletionItem {
- type Output = ::languageserver_types::CompletionItem;
+impl ConvWith for CompletionItem {
+ type Ctx = LineIndex;
+ type Output = ::lsp_types::CompletionItem;
+
+ fn conv_with(mut self, ctx: &LineIndex) -> ::lsp_types::CompletionItem {
+ let atom_text_edit = AtomTextEdit::replace(self.source_range(), self.insert_text());
+ let text_edit = (&atom_text_edit).conv_with(ctx);
+ let additional_text_edits = if let Some(edit) = self.take_text_edit() {
+ Some(edit.conv_with(ctx))
+ } else {
+ None
+ };
- fn conv(self) -> <Self as Conv>::Output {
- let mut res = ::languageserver_types::CompletionItem {
+ let mut res = lsp_types::CompletionItem {
label: self.label().to_string(),
+ detail: self.detail().map(|it| it.to_string()),
filter_text: Some(self.lookup().to_string()),
kind: self.kind().map(|it| it.conv()),
+ text_edit: Some(text_edit),
+ additional_text_edits,
+ documentation: self.documentation().map(|it| it.conv()),
..Default::default()
};
- match self.insert_text() {
- InsertText::PlainText { text } => {
- res.insert_text = Some(text);
- res.insert_text_format = Some(InsertTextFormat::PlainText);
- }
- InsertText::Snippet { text } => {
- res.insert_text = Some(text);
- res.insert_text_format = Some(InsertTextFormat::Snippet);
- }
- }
+ res.insert_text_format = Some(match self.insert_text_format() {
+ InsertTextFormat::Snippet => lsp_types::InsertTextFormat::Snippet,
+ InsertTextFormat::PlainText => lsp_types::InsertTextFormat::PlainText,
+ });
+
res
}
}
}
}
+impl Conv for ra_ide_api::Documentation {
+ type Output = lsp_types::Documentation;
+ fn conv(self) -> Documentation {
+ Documentation::MarkupContent(MarkupContent {
+ kind: MarkupKind::Markdown,
+ value: crate::markdown::sanitize_markdown(self).into(),
+ })
+ }
+}
+
impl ConvWith for TextEdit {
type Ctx = LineIndex;
- type Output = Vec<languageserver_types::TextEdit>;
+ type Output = Vec<lsp_types::TextEdit>;
- fn conv_with(self, line_index: &LineIndex) -> Vec<languageserver_types::TextEdit> {
+ fn conv_with(self, line_index: &LineIndex) -> Vec<lsp_types::TextEdit> {
self.as_atoms()
.into_iter()
.map_conv_with(line_index)
impl<'a> ConvWith for &'a AtomTextEdit {
type Ctx = LineIndex;
- type Output = languageserver_types::TextEdit;
+ type Output = lsp_types::TextEdit;
- fn conv_with(self, line_index: &LineIndex) -> languageserver_types::TextEdit {
- languageserver_types::TextEdit {
+ fn conv_with(self, line_index: &LineIndex) -> lsp_types::TextEdit {
+ lsp_types::TextEdit {
range: self.delete.conv_with(line_index),
new_text: self.insert.clone(),
}
})
}
};
- let source_file_edits = self.source_file_edits.try_conv_with(world)?;
- let file_system_edits = self.file_system_edits.try_conv_with(world)?;
+ let mut document_changes: Vec<DocumentChangeOperation> = Vec::new();
+ for resource_op in self.file_system_edits.try_conv_with(world)? {
+ document_changes.push(DocumentChangeOperation::Op(resource_op));
+ }
+ for text_document_edit in self.source_file_edits.try_conv_with(world)? {
+ document_changes.push(DocumentChangeOperation::Edit(text_document_edit));
+ }
+ let workspace_edit = WorkspaceEdit {
+ changes: None,
+ document_changes: Some(DocumentChanges::Operations(document_changes)),
+ };
Ok(req::SourceChange {
label: self.label,
- source_file_edits,
- file_system_edits,
+ workspace_edit,
cursor_position,
})
}
impl TryConvWith for FileSystemEdit {
type Ctx = ServerWorld;
- type Output = req::FileSystemEdit;
- fn try_conv_with(self, world: &ServerWorld) -> Result<req::FileSystemEdit> {
+ type Output = ResourceOp;
+ fn try_conv_with(self, world: &ServerWorld) -> Result<ResourceOp> {
let res = match self {
FileSystemEdit::CreateFile { source_root, path } => {
let uri = world.path_to_uri(source_root, &path)?;
- req::FileSystemEdit::CreateFile { uri }
+ ResourceOp::Create(CreateFile { uri, options: None })
}
FileSystemEdit::MoveFile {
src,
dst_source_root,
dst_path,
} => {
- let src = world.file_id_to_uri(src)?;
- let dst = world.path_to_uri(dst_source_root, &dst_path)?;
- req::FileSystemEdit::MoveFile { src, dst }
+ let old_uri = world.file_id_to_uri(src)?;
+ let new_uri = world.path_to_uri(dst_source_root, &dst_path)?;
+ ResourceOp::Rename(RenameFile {
+ old_uri,
+ new_uri,
+ options: None,
+ })
}
};
Ok(res)
type Output = Location;
fn try_conv_with(self, world: &ServerWorld) -> Result<Location> {
let line_index = world.analysis().file_line_index(self.file_id());
- to_location(self.file_id(), self.range(), &world, &line_index)
+ let range = self.focus_range().unwrap_or(self.full_range());
+ to_location(self.file_id(), range, &world, &line_index)
}
}
+pub fn to_location_link(
+ target: &RangeInfo<NavigationTarget>,
+ world: &ServerWorld,
+ // line index for original range file
+ line_index: &LineIndex,
+) -> Result<LocationLink> {
+ let target_uri = target.info.file_id().try_conv_with(world)?;
+ let tgt_line_index = world.analysis().file_line_index(target.info.file_id());
+
+ let target_range = target.info.full_range().conv_with(&tgt_line_index);
+
+ let target_selection_range = target
+ .info
+ .focus_range()
+ .map(|it| it.conv_with(&tgt_line_index))
+ .unwrap_or(target_range);
+
+ let res = LocationLink {
+ origin_selection_range: Some(target.range.conv_with(line_index)),
+ target_uri,
+ target_range,
+ target_selection_range: target_selection_range,
+ };
+ Ok(res)
+}
+
pub fn to_location(
file_id: FileId,
range: TextRange,
projects / rust.git / blobdiff