Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-28 21:05:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #3404

Browse source 
3404: lsp-types 0.72 r=matklad a=kjeremy



Co-authored-by: kjeremy <kjeremy@gmail.com>
This commit is contained in:
bors[bot] 2020-03-02 17:05:38 +00:00 committed by GitHub
commit 71b53b2cae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -662,9 +662,9 @@ dependencies = [
[[package]] [[package]]
name = "lsp-types" name = "lsp-types"
version = "0.71.0" version = "0.72.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efa6b75633b0c3412ee36fc416e6d9c1e4ff576b536217f4ac3f34ac83d9e564" checksum = "face91691e558746745dc9dc6c67a4e2a24e044926e274d8378e6f19659329f0"
dependencies = [ dependencies = [
"base64", "base64",
"bitflags", "bitflags",

2
crates/ra_cargo_watch/Cargo.toml
View file

@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"]
[dependencies] [dependencies]
crossbeam-channel = "0.4.0" crossbeam-channel = "0.4.0"
lsp-types = { version = "0.71.0", features = ["proposed"] } lsp-types = { version = "0.72.0", features = ["proposed"] }
log = "0.4.8" log = "0.4.8"
cargo_metadata = "0.9.1" cargo_metadata = "0.9.1"
serde_json = "1.0.48" serde_json = "1.0.48"

2
crates/rust-analyzer/Cargo.toml
View file

@ -20,7 +20,7 @@ globset = "0.4.4"
itertools = "0.8.2" itertools = "0.8.2"
jod-thread = "0.1.0" jod-thread = "0.1.0"
log = "0.4.8" log = "0.4.8"
lsp-types = { version = "0.71.0", features = ["proposed"] } lsp-types = { version = "0.72.0", features = ["proposed"] }
parking_lot = "0.10.0" parking_lot = "0.10.0"
pico-args = "0.3.1" pico-args = "0.3.1"
rand = { version = "0.7.3", features = ["small_rng"] } rand = { version = "0.7.3", features = ["small_rng"] }

18
crates/rust-analyzer/src/req.rs
View file

@ -42,14 +42,14 @@ impl Request for SyntaxTree {
const METHOD: &'static str = "rust-analyzer/syntaxTree"; const METHOD: &'static str = "rust-analyzer/syntaxTree";
} }
#[derive(Deserialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct SyntaxTreeParams { pub struct SyntaxTreeParams {
pub text_document: TextDocumentIdentifier, pub text_document: TextDocumentIdentifier,
pub range: Option<Range>, pub range: Option<Range>,
} }
#[derive(Serialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct ExpandedMacro { pub struct ExpandedMacro {
pub name: String, pub name: String,
@ -64,7 +64,7 @@ impl Request for ExpandMacro {
const METHOD: &'static str = "rust-analyzer/expandMacro"; const METHOD: &'static str = "rust-analyzer/expandMacro";
} }
#[derive(Deserialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct ExpandMacroParams { pub struct ExpandMacroParams {
pub text_document: TextDocumentIdentifier, pub text_document: TextDocumentIdentifier,
@ -79,7 +79,7 @@ impl Request for FindMatchingBrace {
const METHOD: &'static str = "rust-analyzer/findMatchingBrace"; const METHOD: &'static str = "rust-analyzer/findMatchingBrace";
} }
#[derive(Deserialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct FindMatchingBraceParams { pub struct FindMatchingBraceParams {
pub text_document: TextDocumentIdentifier, pub text_document: TextDocumentIdentifier,
@ -101,14 +101,14 @@ impl Notification for PublishDecorations {
const METHOD: &'static str = "rust-analyzer/publishDecorations"; const METHOD: &'static str = "rust-analyzer/publishDecorations";
} }
#[derive(Serialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct PublishDecorationsParams { pub struct PublishDecorationsParams {
pub uri: Url, pub uri: Url,
pub decorations: Vec<Decoration>, pub decorations: Vec<Decoration>,
} }
#[derive(Serialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Decoration { pub struct Decoration {
pub range: Range, pub range: Range,
@ -132,7 +132,7 @@ impl Request for JoinLines {
const METHOD: &'static str = "rust-analyzer/joinLines"; const METHOD: &'static str = "rust-analyzer/joinLines";
} }
#[derive(Deserialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct JoinLinesParams { pub struct JoinLinesParams {
pub text_document: TextDocumentIdentifier, pub text_document: TextDocumentIdentifier,
@ -162,7 +162,7 @@ pub struct RunnablesParams {
pub position: Option<Position>, pub position: Option<Position>,
} }
#[derive(Serialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Runnable { pub struct Runnable {
pub range: Range, pub range: Range,
@ -173,7 +173,7 @@ pub struct Runnable {
pub cwd: Option<String>, pub cwd: Option<String>,
} }
#[derive(Serialize, Debug)] #[derive(Deserialize, Serialize, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct SourceChange { pub struct SourceChange {
pub label: String, pub label: String,

3
crates/rust-analyzer/src/semantic_tokens.rs
View file

@ -49,12 +49,9 @@ pub(crate) const SUPPORTED_MODIFIERS: &[SemanticTokenModifier] = &[
SemanticTokenModifier::DOCUMENTATION, SemanticTokenModifier::DOCUMENTATION,
SemanticTokenModifier::DECLARATION, SemanticTokenModifier::DECLARATION,
SemanticTokenModifier::DEFINITION, SemanticTokenModifier::DEFINITION,
SemanticTokenModifier::REFERENCE,
SemanticTokenModifier::STATIC, SemanticTokenModifier::STATIC,
SemanticTokenModifier::ABSTRACT, SemanticTokenModifier::ABSTRACT,
SemanticTokenModifier::DEPRECATED, SemanticTokenModifier::DEPRECATED,
SemanticTokenModifier::ASYNC,
SemanticTokenModifier::VOLATILE,
SemanticTokenModifier::READONLY, SemanticTokenModifier::READONLY,
CONSTANT, CONSTANT,
MUTABLE, MUTABLE,