move lsif types to lsp types crate
This commit is contained in:
hamidreza kalbasi
parent
e803bd25c4
commit
70061d2b7e
3
Cargo.lock
generated
3
Cargo.lock
generated
@ -863,8 +863,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "lsp-types"
|
||||
version = "0.89.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "852e0dedfd52cc32325598b2631e0eba31b7b708959676a9f837042f276b09a2"
|
||||
source = "git+https://github.com/gluon-lang/lsp-types#6b43b1f7184ab379f0a6f89673bb10a8de11d12f"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"serde",
|
||||
|
||||
@ -22,7 +22,7 @@ crossbeam-channel = "0.5.0"
|
||||
dissimilar = "1.0.2"
|
||||
itertools = "0.10.0"
|
||||
jod-thread = "0.1.0"
|
||||
lsp-types = { version = "0.89.0", features = ["proposed"] }
|
||||
lsp-types = { git = "https://github.com/gluon-lang/lsp-types", features = ["proposed"] }
|
||||
parking_lot = "0.11.0"
|
||||
xflags = "0.2.1"
|
||||
oorandom = "11.1.2"
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
//! Lsif generator
|
||||
|
||||
use std::env;
|
||||
use std::time::Instant;
|
||||
|
||||
use ide::{StaticIndex, StaticIndexedFile, TokenStaticData};
|
||||
use ide_db::LineIndexDatabase;
|
||||
|
||||
use ide_db::base_db::salsa::{self, ParallelDatabase};
|
||||
use lsp_types::{Hover, HoverContents, NumberOrString};
|
||||
use lsp_types::{lsif::*, Hover, HoverContents, NumberOrString};
|
||||
use project_model::{CargoConfig, ProjectManifest, ProjectWorkspace};
|
||||
use vfs::AbsPathBuf;
|
||||
|
||||
use crate::cli::lsif::lsif_types::{Document, Vertex};
|
||||
use crate::cli::{
|
||||
flags,
|
||||
load_cargo::{load_workspace, LoadCargoConfig},
|
||||
@ -27,9 +27,6 @@ fn clone(&self) -> Snap<salsa::Snapshot<DB>> {
|
||||
}
|
||||
}
|
||||
|
||||
mod lsif_types;
|
||||
use lsif_types::*;
|
||||
|
||||
#[derive(Default)]
|
||||
struct LsifManager {
|
||||
count: i32,
|
||||
@ -57,17 +54,14 @@ fn emit(&self, data: &str) {
|
||||
println!("{}", data);
|
||||
}
|
||||
|
||||
fn add_tokens(
|
||||
&mut self,
|
||||
line_index: &LineIndex,
|
||||
doc_id: Id,
|
||||
tokens: Vec<TokenStaticData>,
|
||||
) {
|
||||
fn add_tokens(&mut self, line_index: &LineIndex, doc_id: Id, tokens: Vec<TokenStaticData>) {
|
||||
let tokens_id = tokens
|
||||
.into_iter()
|
||||
.map(|token| {
|
||||
let token_id = self
|
||||
.add(Element::Vertex(Vertex::Range(to_proto::range(line_index, token.range))));
|
||||
let token_id = self.add(Element::Vertex(Vertex::Range {
|
||||
range: to_proto::range(line_index, token.range),
|
||||
tag: None,
|
||||
}));
|
||||
if let Some(hover) = token.hover {
|
||||
let hover_id = self.add(Element::Vertex(Vertex::HoverResult {
|
||||
result: Hover {
|
||||
@ -92,6 +86,8 @@ fn add_tokens(
|
||||
|
||||
impl flags::Lsif {
|
||||
pub fn run(self) -> Result<()> {
|
||||
eprintln!("Generating LSIF started...");
|
||||
let now = Instant::now();
|
||||
let cargo_config = CargoConfig::default();
|
||||
let no_progress = &|_| ();
|
||||
let load_cargo_config = LoadCargoConfig {
|
||||
@ -111,17 +107,17 @@ pub fn run(self) -> Result<()> {
|
||||
let si = StaticIndex::compute(db, &analysis)?;
|
||||
|
||||
let mut lsif = LsifManager::default();
|
||||
lsif.add(Element::Vertex(Vertex::MetaData {
|
||||
lsif.add(Element::Vertex(Vertex::MetaData(MetaData {
|
||||
version: String::from("0.5.0"),
|
||||
project_root: lsp_types::Url::from_file_path(path).unwrap(),
|
||||
position_encoding: Encoding::Utf16,
|
||||
tool_info: None,
|
||||
}));
|
||||
})));
|
||||
for StaticIndexedFile { file_id, folds, tokens } in si.files {
|
||||
let path = vfs.file_path(file_id);
|
||||
let path = path.as_path().unwrap();
|
||||
let doc_id = lsif.add(Element::Vertex(Vertex::Document(Document {
|
||||
language_id: Language::Rust,
|
||||
language_id: "rust".to_string(),
|
||||
uri: lsp_types::Url::from_file_path(path).unwrap(),
|
||||
})));
|
||||
let text = analysis.file_text(file_id)?;
|
||||
@ -142,6 +138,7 @@ pub fn run(self) -> Result<()> {
|
||||
})));
|
||||
lsif.add_tokens(&line_index, doc_id, tokens);
|
||||
}
|
||||
eprintln!("Generating LSIF finished in {:?}", now.elapsed());
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,352 +0,0 @@
|
||||
//! This module provides LSIF types. This module is a temporary solution
|
||||
//! and it will go to its own repository in future
|
||||
|
||||
use lsp_types::{FoldingRange, Hover};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
pub(crate) type RangeId = lsp_types::NumberOrString;
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(untagged)]
|
||||
pub(crate) enum LocationOrRangeId {
|
||||
Location(lsp_types::Location),
|
||||
RangeId(RangeId),
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct Entry {
|
||||
pub(crate) id: lsp_types::NumberOrString,
|
||||
#[serde(flatten)]
|
||||
pub(crate) data: Element,
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[serde(tag = "type")]
|
||||
pub(crate) enum Element {
|
||||
Vertex(Vertex),
|
||||
Edge(Edge),
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
pub(crate) struct ToolInfo {
|
||||
name: String,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
args: Option<Vec<String>>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
version: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
pub(crate) enum Encoding {
|
||||
/// Currently only 'utf-16' is supported due to the limitations in LSP.
|
||||
#[serde(rename = "utf-16")]
|
||||
Utf16,
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[serde(tag = "label")]
|
||||
pub(crate) enum Vertex {
|
||||
#[serde(rename_all = "camelCase")]
|
||||
MetaData {
|
||||
/// The version of the LSIF format using semver notation. See https://semver.org/. Please note
|
||||
/// the version numbers starting with 0 don't adhere to semver and adopters have to assume
|
||||
/// that each new version is breaking.
|
||||
version: String,
|
||||
|
||||
/// The project root (in form of an URI) used to compute this dump.
|
||||
project_root: lsp_types::Url,
|
||||
|
||||
/// The string encoding used to compute line and character values in
|
||||
/// positions and ranges.
|
||||
position_encoding: Encoding,
|
||||
|
||||
/// Information about the tool that created the dump
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
tool_info: Option<ToolInfo>,
|
||||
},
|
||||
/// https://github.com/Microsoft/language-server-protocol/blob/master/indexFormat/specification.md#the-project-vertex
|
||||
Project(Project),
|
||||
Document(Document),
|
||||
/// https://github.com/Microsoft/language-server-protocol/blob/master/indexFormat/specification.md#ranges
|
||||
Range(lsp_types::Range),
|
||||
/// https://github.com/Microsoft/language-server-protocol/blob/master/indexFormat/specification.md#result-set
|
||||
ResultSet(ResultSet),
|
||||
|
||||
// FIXME: support all kind of results
|
||||
DefinitionResult {
|
||||
result: DefinitionResultType,
|
||||
},
|
||||
FoldingRangeResult {
|
||||
result: Vec<FoldingRange>,
|
||||
},
|
||||
HoverResult {
|
||||
result: Hover,
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[serde(tag = "label")]
|
||||
pub(crate) enum Edge {
|
||||
Contains(EdgeDataMultiIn),
|
||||
RefersTo(EdgeData),
|
||||
Item(Item),
|
||||
|
||||
// Methods
|
||||
#[serde(rename = "textDocument/definition")]
|
||||
Definition(EdgeData),
|
||||
#[serde(rename = "textDocument/declaration")]
|
||||
Declaration(EdgeData),
|
||||
#[serde(rename = "textDocument/hover")]
|
||||
Hover(EdgeData),
|
||||
#[serde(rename = "textDocument/references")]
|
||||
References(EdgeData),
|
||||
#[serde(rename = "textDocument/implementation")]
|
||||
Implementation(EdgeData),
|
||||
#[serde(rename = "textDocument/typeDefinition")]
|
||||
TypeDefinition(EdgeData),
|
||||
#[serde(rename = "textDocument/foldingRange")]
|
||||
FoldingRange(EdgeData),
|
||||
#[serde(rename = "textDocument/documentLink")]
|
||||
DocumentLink(EdgeData),
|
||||
#[serde(rename = "textDocument/documentSymbol")]
|
||||
DocumentSymbol(EdgeData),
|
||||
#[serde(rename = "textDocument/diagnostic")]
|
||||
Diagnostic(EdgeData),
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct EdgeData {
|
||||
pub(crate) in_v: lsp_types::NumberOrString,
|
||||
pub(crate) out_v: lsp_types::NumberOrString,
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct EdgeDataMultiIn {
|
||||
pub(crate) in_vs: Vec<lsp_types::NumberOrString>,
|
||||
pub(crate) out_v: lsp_types::NumberOrString,
|
||||
}
|
||||
|
||||
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(untagged)]
|
||||
pub(crate) enum DefinitionResultType {
|
||||
Scalar(LocationOrRangeId),
|
||||
Array(LocationOrRangeId),
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[serde(tag = "property")]
|
||||
pub(crate) enum Item {
|
||||
Definition(EdgeData),
|
||||
Reference(EdgeData),
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct Document {
|
||||
pub(crate) uri: lsp_types::Url,
|
||||
pub(crate) language_id: Language,
|
||||
}
|
||||
|
||||
/// https://github.com/Microsoft/language-server-protocol/blob/master/indexFormat/specification.md#result-set
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ResultSet {
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
key: Option<String>,
|
||||
}
|
||||
|
||||
/// https://github.com/Microsoft/language-server-protocol/blob/master/indexFormat/specification.md#the-project-vertex
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct Project {
|
||||
project_file: lsp_types::Url,
|
||||
language_id: Language,
|
||||
}
|
||||
|
||||
/// https://github.com/Microsoft/language-server-protocol/issues/213
|
||||
/// For examples, see: https://code.visualstudio.com/docs/languages/identifiers.
|
||||
#[derive(Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub(crate) enum Language {
|
||||
Rust,
|
||||
TypeScript,
|
||||
#[serde(other)]
|
||||
Other,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
#[cfg(unix)]
|
||||
fn metadata() {
|
||||
let data = Entry {
|
||||
id: lsp_types::NumberOrString::Number(1),
|
||||
data: Element::Vertex(Vertex::MetaData {
|
||||
version: String::from("0.4.3"),
|
||||
project_root: lsp_types::Url::from_file_path("/hello/world").unwrap(),
|
||||
position_encoding: Encoding::Utf16,
|
||||
tool_info: Some(ToolInfo {
|
||||
name: String::from("lsif-tsc"),
|
||||
args: Some(vec![String::from("-p"), String::from(".")]),
|
||||
version: Some(String::from("0.7.2")),
|
||||
}),
|
||||
}),
|
||||
};
|
||||
let text = r#"{"id":1,"type":"vertex","label":"metaData","version":"0.4.3","projectRoot":"file:///hello/world","positionEncoding":"utf-16","toolInfo":{"name":"lsif-tsc","args":["-p","."],"version":"0.7.2"}}"#
|
||||
.replace(' ', "");
|
||||
assert_eq!(serde_json::to_string(&data).unwrap(), text);
|
||||
assert_eq!(serde_json::from_str::<Entry>(&text).unwrap(), data);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(unix)]
|
||||
fn document() {
|
||||
let data = Entry {
|
||||
id: lsp_types::NumberOrString::Number(1),
|
||||
data: Element::Vertex(Vertex::Document(Document {
|
||||
uri: lsp_types::Url::from_file_path("/Users/dirkb/sample.ts").unwrap(),
|
||||
language_id: Language::TypeScript,
|
||||
})),
|
||||
};
|
||||
|
||||
let text = r#"{ "id": 1, "type": "vertex", "label": "document", "uri": "file:///Users/dirkb/sample.ts", "languageId": "typescript" }"#
|
||||
.replace(' ', "");
|
||||
|
||||
assert_eq!(serde_json::to_string(&data).unwrap(), text);
|
||||
assert_eq!(serde_json::from_str::<Entry>(&text).unwrap(), data);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn range() {
|
||||
let data = Entry {
|
||||
id: lsp_types::NumberOrString::Number(4),
|
||||
data: Element::Vertex(Vertex::Range(lsp_types::Range::new(
|
||||
lsp_types::Position::new(0, 9),
|
||||
lsp_types::Position::new(0, 12),
|
||||
))),
|
||||
};
|
||||
|
||||
let text = r#"{ "id": 4, "type": "vertex", "label": "range", "start": { "line": 0, "character": 9}, "end": { "line": 0, "character": 12 } }"#
|
||||
.replace(' ', "");
|
||||
|
||||
assert_eq!(serde_json::to_string(&data).unwrap(), text);
|
||||
assert_eq!(serde_json::from_str::<Entry>(&text).unwrap(), data);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn refers_to() {
|
||||
let data = Entry {
|
||||
id: lsp_types::NumberOrString::Number(5),
|
||||
data: Element::Edge(Edge::RefersTo(EdgeData {
|
||||
in_v: lsp_types::NumberOrString::Number(2),
|
||||
out_v: lsp_types::NumberOrString::Number(3),
|
||||
})),
|
||||
};
|
||||
|
||||
let text = r#"{ "id": 5, "type": "edge", "label": "refersTo", "outV": 3, "inV": 2}"#
|
||||
.replace(' ', "");
|
||||
|
||||
assert_eq!(
|
||||
serde_json::from_str::<serde_json::Value>(&text).unwrap(),
|
||||
serde_json::to_value(&data).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn result_set() {
|
||||
let data = Entry {
|
||||
id: lsp_types::NumberOrString::Number(2),
|
||||
data: Element::Vertex(Vertex::ResultSet(ResultSet { key: None })),
|
||||
};
|
||||
|
||||
let text = r#"{ "id": 2, "type": "vertex", "label": "resultSet" }"#.replace(' ', "");
|
||||
|
||||
assert_eq!(serde_json::to_string(&data).unwrap(), text);
|
||||
assert_eq!(serde_json::from_str::<Entry>(&text).unwrap(), data);
|
||||
|
||||
let data = Entry {
|
||||
id: lsp_types::NumberOrString::Number(4),
|
||||
data: Element::Vertex(Vertex::ResultSet(ResultSet {
|
||||
key: Some(String::from("hello")),
|
||||
})),
|
||||
};
|
||||
|
||||
let text = r#"{ "id": 4, "type": "vertex", "label": "resultSet", "key": "hello" }"#
|
||||
.replace(' ', "");
|
||||
|
||||
assert_eq!(serde_json::to_string(&data).unwrap(), text);
|
||||
assert_eq!(serde_json::from_str::<Entry>(&text).unwrap(), data);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn definition() {
|
||||
let data = Entry {
|
||||
id: lsp_types::NumberOrString::Number(21),
|
||||
data: Element::Edge(Edge::Item(Item::Definition(EdgeData {
|
||||
in_v: lsp_types::NumberOrString::Number(18),
|
||||
out_v: lsp_types::NumberOrString::Number(16),
|
||||
}))),
|
||||
};
|
||||
|
||||
let text = r#"{ "id": 21, "type": "edge", "label": "item", "property": "definition", "outV": 16, "inV": 18}"#
|
||||
.replace(' ', "");
|
||||
|
||||
assert_eq!(
|
||||
serde_json::from_str::<serde_json::Value>(&text).unwrap(),
|
||||
serde_json::to_value(&data).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
mod methods {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn references() {
|
||||
let data = Entry {
|
||||
id: lsp_types::NumberOrString::Number(17),
|
||||
data: Element::Edge(Edge::References(EdgeData {
|
||||
in_v: lsp_types::NumberOrString::Number(16),
|
||||
out_v: lsp_types::NumberOrString::Number(15),
|
||||
})),
|
||||
};
|
||||
|
||||
let text = r#"{ "id": 17, "type": "edge", "label": "textDocument/references", "outV": 15, "inV": 16 }"#;
|
||||
|
||||
assert_eq!(
|
||||
serde_json::from_str::<serde_json::Value>(&text).unwrap(),
|
||||
serde_json::to_value(&data).unwrap()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn definition() {
|
||||
let data = Entry {
|
||||
id: lsp_types::NumberOrString::Number(13),
|
||||
data: Element::Vertex(Vertex::DefinitionResult {
|
||||
result: DefinitionResultType::Scalar(LocationOrRangeId::RangeId(
|
||||
lsp_types::NumberOrString::Number(7),
|
||||
)),
|
||||
}),
|
||||
};
|
||||
|
||||
let text =
|
||||
r#"{ "id": 13, "type": "vertex", "label": "definitionResult", "result": 7 }"#;
|
||||
|
||||
assert_eq!(
|
||||
serde_json::from_str::<serde_json::Value>(&text).unwrap(),
|
||||
serde_json::to_value(&data).unwrap()
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user