Don't expose SyntaxKind from IDE API

SyntaxKind is somewhat of an internal type, but IDE is using it to
basically specify an icon. Let's have a dedicated entity for this
instead.
This commit is contained in:
Aleksey Kladov 2020-12-17 14:29:05 +03:00
parent 2465fa02b7
commit 55ba353b39
13 changed files with 337 additions and 239 deletions

View file

@ -2191,7 +2191,7 @@ fn foo_<|>test() {}
11..19,
),
name: "foo_test",
kind: FN,
kind: Function,
container_name: None,
description: None,
docs: None,
@ -2234,7 +2234,7 @@ mod tests<|> {
4..9,
),
name: "tests",
kind: MODULE,
kind: Module,
container_name: None,
description: None,
docs: None,
@ -2273,7 +2273,7 @@ fn main() { let s<|>t = S{ f1:0 }; }
7..8,
),
name: "S",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S",
@ -2312,7 +2312,7 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; }
24..25,
),
name: "S",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S",
@ -2331,7 +2331,7 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; }
7..10,
),
name: "Arg",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct Arg",
@ -2370,7 +2370,7 @@ fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; }
24..25,
),
name: "S",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S",
@ -2389,7 +2389,7 @@ fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; }
7..10,
),
name: "Arg",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct Arg",
@ -2431,7 +2431,7 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
7..8,
),
name: "A",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct A",
@ -2450,7 +2450,7 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
22..23,
),
name: "B",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct B",
@ -2469,7 +2469,7 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
53..54,
),
name: "C",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"pub struct C",
@ -2508,7 +2508,7 @@ fn main() { let s<|>t = foo(); }
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -2548,7 +2548,7 @@ fn main() { let s<|>t = foo(); }
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -2567,7 +2567,7 @@ fn main() { let s<|>t = foo(); }
23..24,
),
name: "S",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S",
@ -2607,7 +2607,7 @@ fn main() { let s<|>t = foo(); }
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -2626,7 +2626,7 @@ fn main() { let s<|>t = foo(); }
19..22,
),
name: "Bar",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Bar",
@ -2669,7 +2669,7 @@ fn main() { let s<|>t = foo(); }
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -2688,7 +2688,7 @@ fn main() { let s<|>t = foo(); }
22..25,
),
name: "Bar",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Bar",
@ -2707,7 +2707,7 @@ fn main() { let s<|>t = foo(); }
39..41,
),
name: "S1",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S1",
@ -2726,7 +2726,7 @@ fn main() { let s<|>t = foo(); }
52..54,
),
name: "S2",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S2",
@ -2763,7 +2763,7 @@ fn foo(ar<|>g: &impl Foo) {}
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -2803,7 +2803,7 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -2822,7 +2822,7 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
19..22,
),
name: "Bar",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Bar",
@ -2841,7 +2841,7 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {}
36..37,
),
name: "S",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S",
@ -2886,7 +2886,7 @@ mod future {
140..146,
),
name: "Future",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"pub trait Future",
@ -2905,7 +2905,7 @@ mod future {
7..8,
),
name: "S",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S",
@ -2943,7 +2943,7 @@ fn foo(ar<|>g: &impl Foo<S>) {}
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -2962,7 +2962,7 @@ fn foo(ar<|>g: &impl Foo<S>) {}
23..24,
),
name: "S",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S",
@ -3005,7 +3005,7 @@ fn main() { let s<|>t = foo(); }
49..50,
),
name: "B",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct B",
@ -3024,7 +3024,7 @@ fn main() { let s<|>t = foo(); }
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -3061,7 +3061,7 @@ fn foo(ar<|>g: &dyn Foo) {}
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -3099,7 +3099,7 @@ fn foo(ar<|>g: &dyn Foo<S>) {}
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",
@ -3118,7 +3118,7 @@ fn foo(ar<|>g: &dyn Foo<S>) {}
23..24,
),
name: "S",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S",
@ -3159,7 +3159,7 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
6..15,
),
name: "ImplTrait",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait ImplTrait",
@ -3178,7 +3178,7 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
50..51,
),
name: "B",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct B",
@ -3197,7 +3197,7 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
28..36,
),
name: "DynTrait",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait DynTrait",
@ -3216,7 +3216,7 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
65..66,
),
name: "S",
kind: STRUCT,
kind: Struct,
container_name: None,
description: Some(
"struct S",
@ -3264,7 +3264,7 @@ fn main() { let s<|>t = test().get(); }
6..9,
),
name: "Foo",
kind: TRAIT,
kind: Trait,
container_name: None,
description: Some(
"trait Foo",