diff options
Diffstat (limited to 'crates/ra_lsp_server/src')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/req.rs | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index ace3da020..9478ebfb8 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -581,7 +581,7 @@ pub fn handle_code_action( | |||
581 | let edit = source_edit.try_conv_with(&world)?; | 581 | let edit = source_edit.try_conv_with(&world)?; |
582 | let cmd = Command { | 582 | let cmd = Command { |
583 | title, | 583 | title, |
584 | command: "ra-lsp.applySourceChange".to_string(), | 584 | command: "rust-analyzer.applySourceChange".to_string(), |
585 | arguments: Some(vec![to_value(edit).unwrap()]), | 585 | arguments: Some(vec![to_value(edit).unwrap()]), |
586 | }; | 586 | }; |
587 | res.push(cmd); | 587 | res.push(cmd); |
@@ -623,7 +623,7 @@ pub fn handle_code_lens( | |||
623 | range, | 623 | range, |
624 | command: Some(Command { | 624 | command: Some(Command { |
625 | title: title.into(), | 625 | title: title.into(), |
626 | command: "ra-lsp.run-single".into(), | 626 | command: "rust-analyzer.runSingle".into(), |
627 | arguments: Some(vec![to_value(r).unwrap()]), | 627 | arguments: Some(vec![to_value(r).unwrap()]), |
628 | }), | 628 | }), |
629 | data: None, | 629 | data: None, |
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs index 5968e592b..a4d890755 100644 --- a/crates/ra_lsp_server/src/req.rs +++ b/crates/ra_lsp_server/src/req.rs | |||
@@ -16,7 +16,7 @@ pub enum AnalyzerStatus {} | |||
16 | impl Request for AnalyzerStatus { | 16 | impl Request for AnalyzerStatus { |
17 | type Params = (); | 17 | type Params = (); |
18 | type Result = String; | 18 | type Result = String; |
19 | const METHOD: &'static str = "ra/analyzerStatus"; | 19 | const METHOD: &'static str = "rust-analyzer/analyzerStatus"; |
20 | } | 20 | } |
21 | 21 | ||
22 | pub enum CollectGarbage {} | 22 | pub enum CollectGarbage {} |
@@ -24,7 +24,7 @@ pub enum CollectGarbage {} | |||
24 | impl Request for CollectGarbage { | 24 | impl Request for CollectGarbage { |
25 | type Params = (); | 25 | type Params = (); |
26 | type Result = (); | 26 | type Result = (); |
27 | const METHOD: &'static str = "ra/collectGarbage"; | 27 | const METHOD: &'static str = "rust-analyzer/collectGarbage"; |
28 | } | 28 | } |
29 | 29 | ||
30 | pub enum SyntaxTree {} | 30 | pub enum SyntaxTree {} |
@@ -32,7 +32,7 @@ pub enum SyntaxTree {} | |||
32 | impl Request for SyntaxTree { | 32 | impl Request for SyntaxTree { |
33 | type Params = SyntaxTreeParams; | 33 | type Params = SyntaxTreeParams; |
34 | type Result = String; | 34 | type Result = String; |
35 | const METHOD: &'static str = "m/syntaxTree"; | 35 | const METHOD: &'static str = "rust-analyzer/syntaxTree"; |
36 | } | 36 | } |
37 | 37 | ||
38 | #[derive(Deserialize, Debug)] | 38 | #[derive(Deserialize, Debug)] |
@@ -46,7 +46,7 @@ pub enum ExtendSelection {} | |||
46 | impl Request for ExtendSelection { | 46 | impl Request for ExtendSelection { |
47 | type Params = ExtendSelectionParams; | 47 | type Params = ExtendSelectionParams; |
48 | type Result = ExtendSelectionResult; | 48 | type Result = ExtendSelectionResult; |
49 | const METHOD: &'static str = "m/extendSelection"; | 49 | const METHOD: &'static str = "rust-analyzer/extendSelection"; |
50 | } | 50 | } |
51 | 51 | ||
52 | #[derive(Deserialize, Debug)] | 52 | #[derive(Deserialize, Debug)] |
@@ -67,7 +67,7 @@ pub enum FindMatchingBrace {} | |||
67 | impl Request for FindMatchingBrace { | 67 | impl Request for FindMatchingBrace { |
68 | type Params = FindMatchingBraceParams; | 68 | type Params = FindMatchingBraceParams; |
69 | type Result = Vec<Position>; | 69 | type Result = Vec<Position>; |
70 | const METHOD: &'static str = "m/findMatchingBrace"; | 70 | const METHOD: &'static str = "rust-analyzer/findMatchingBrace"; |
71 | } | 71 | } |
72 | 72 | ||
73 | #[derive(Deserialize, Debug)] | 73 | #[derive(Deserialize, Debug)] |
@@ -82,14 +82,14 @@ pub enum DecorationsRequest {} | |||
82 | impl Request for DecorationsRequest { | 82 | impl Request for DecorationsRequest { |
83 | type Params = TextDocumentIdentifier; | 83 | type Params = TextDocumentIdentifier; |
84 | type Result = Vec<Decoration>; | 84 | type Result = Vec<Decoration>; |
85 | const METHOD: &'static str = "m/decorationsRequest"; | 85 | const METHOD: &'static str = "rust-analyzer/decorationsRequest"; |
86 | } | 86 | } |
87 | 87 | ||
88 | pub enum PublishDecorations {} | 88 | pub enum PublishDecorations {} |
89 | 89 | ||
90 | impl Notification for PublishDecorations { | 90 | impl Notification for PublishDecorations { |
91 | type Params = PublishDecorationsParams; | 91 | type Params = PublishDecorationsParams; |
92 | const METHOD: &'static str = "m/publishDecorations"; | 92 | const METHOD: &'static str = "rust-analyzer/publishDecorations"; |
93 | } | 93 | } |
94 | 94 | ||
95 | #[derive(Serialize, Debug)] | 95 | #[derive(Serialize, Debug)] |
@@ -112,7 +112,7 @@ pub enum ParentModule {} | |||
112 | impl Request for ParentModule { | 112 | impl Request for ParentModule { |
113 | type Params = TextDocumentPositionParams; | 113 | type Params = TextDocumentPositionParams; |
114 | type Result = Vec<Location>; | 114 | type Result = Vec<Location>; |
115 | const METHOD: &'static str = "m/parentModule"; | 115 | const METHOD: &'static str = "rust-analyzer/parentModule"; |
116 | } | 116 | } |
117 | 117 | ||
118 | pub enum JoinLines {} | 118 | pub enum JoinLines {} |
@@ -120,7 +120,7 @@ pub enum JoinLines {} | |||
120 | impl Request for JoinLines { | 120 | impl Request for JoinLines { |
121 | type Params = JoinLinesParams; | 121 | type Params = JoinLinesParams; |
122 | type Result = SourceChange; | 122 | type Result = SourceChange; |
123 | const METHOD: &'static str = "m/joinLines"; | 123 | const METHOD: &'static str = "rust-analyzer/joinLines"; |
124 | } | 124 | } |
125 | 125 | ||
126 | #[derive(Deserialize, Debug)] | 126 | #[derive(Deserialize, Debug)] |
@@ -135,7 +135,7 @@ pub enum OnEnter {} | |||
135 | impl Request for OnEnter { | 135 | impl Request for OnEnter { |
136 | type Params = TextDocumentPositionParams; | 136 | type Params = TextDocumentPositionParams; |
137 | type Result = Option<SourceChange>; | 137 | type Result = Option<SourceChange>; |
138 | const METHOD: &'static str = "m/onEnter"; | 138 | const METHOD: &'static str = "rust-analyzer/onEnter"; |
139 | } | 139 | } |
140 | 140 | ||
141 | pub enum Runnables {} | 141 | pub enum Runnables {} |
@@ -143,7 +143,7 @@ pub enum Runnables {} | |||
143 | impl Request for Runnables { | 143 | impl Request for Runnables { |
144 | type Params = RunnablesParams; | 144 | type Params = RunnablesParams; |
145 | type Result = Vec<Runnable>; | 145 | type Result = Vec<Runnable>; |
146 | const METHOD: &'static str = "m/runnables"; | 146 | const METHOD: &'static str = "rust-analyzer/runnables"; |
147 | } | 147 | } |
148 | 148 | ||
149 | #[derive(Serialize, Deserialize, Debug)] | 149 | #[derive(Serialize, Deserialize, Debug)] |