Merge pull request #995 from staktrace/rlsbump

Bump rls-data and rls-analysis versions.
rust-lang · Aug 23, 2018 · 15816d6 · 15816d6
2 parents ff0977c + ab53dc6
commit 15816d6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,9 +26,9 @@ log = "0.4"
 num_cpus = "1"
 racer = { version = "2.1.4", default-features = false }
 rayon = "1"
-rls-analysis = "0.14"
+rls-analysis = "0.16"
 rls-blacklist = "0.1.2"
-rls-data = { version = "0.16", features = ["serialize-serde"] }
+rls-data = { version = "0.18", features = ["serialize-serde"] }
 rls-rustc = "0.5.0"
 rls-span = { version = "0.4", features = ["serialize-serde"] }
 rls-vfs = "0.4.6"

diff --git a/src/lsp_data.rs b/src/lsp_data.rs
@@ -185,10 +185,10 @@ pub mod ls_util {
 pub fn source_kind_from_def_kind(k: DefKind) -> SymbolKind {
     match k {
         DefKind::Enum | DefKind::Union => SymbolKind::Enum,
-        DefKind::Static | DefKind::Const => SymbolKind::Constant,
+        DefKind::Static | DefKind::Const | DefKind::ForeignStatic => SymbolKind::Constant,
         DefKind::Tuple => SymbolKind::Array,
         DefKind::Struct => SymbolKind::Class,
-        DefKind::Function | DefKind::Macro => SymbolKind::Function,
+        DefKind::Function | DefKind::Macro | DefKind::ForeignFunction => SymbolKind::Function,
         DefKind::Method => SymbolKind::Method,
         DefKind::Mod => SymbolKind::Module,
         DefKind::Trait | DefKind::Type | DefKind::ExternType => SymbolKind::Interface,