Skip to content

Commit 55ba353

Browse files
committed
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.
1 parent 2465fa0 commit 55ba353

File tree

13 files changed

+337
-239
lines changed

13 files changed

+337
-239
lines changed

crates/ide/src/call_hierarchy.rs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ fn caller() {
181181
call<|>ee();
182182
}
183183
"#,
184-
"callee FN FileId(0) 0..14 3..9",
185-
&["caller FN FileId(0) 15..44 18..24 : [33..39]"],
184+
"callee Function FileId(0) 0..14 3..9",
185+
&["caller Function FileId(0) 15..44 18..24 : [33..39]"],
186186
&[],
187187
);
188188
}
@@ -197,8 +197,8 @@ fn caller() {
197197
callee();
198198
}
199199
"#,
200-
"callee FN FileId(0) 0..14 3..9",
201-
&["caller FN FileId(0) 15..44 18..24 : [33..39]"],
200+
"callee Function FileId(0) 0..14 3..9",
201+
&["caller Function FileId(0) 15..44 18..24 : [33..39]"],
202202
&[],
203203
);
204204
}
@@ -214,8 +214,8 @@ fn caller() {
214214
callee();
215215
}
216216
"#,
217-
"callee FN FileId(0) 0..14 3..9",
218-
&["caller FN FileId(0) 15..58 18..24 : [33..39, 47..53]"],
217+
"callee Function FileId(0) 0..14 3..9",
218+
&["caller Function FileId(0) 15..58 18..24 : [33..39, 47..53]"],
219219
&[],
220220
);
221221
}
@@ -234,10 +234,10 @@ fn caller2() {
234234
callee();
235235
}
236236
"#,
237-
"callee FN FileId(0) 0..14 3..9",
237+
"callee Function FileId(0) 0..14 3..9",
238238
&[
239-
"caller1 FN FileId(0) 15..45 18..25 : [34..40]",
240-
"caller2 FN FileId(0) 47..77 50..57 : [66..72]",
239+
"caller1 Function FileId(0) 15..45 18..25 : [34..40]",
240+
"caller2 Function FileId(0) 47..77 50..57 : [66..72]",
241241
],
242242
&[],
243243
);
@@ -263,10 +263,10 @@ mod tests {
263263
}
264264
}
265265
"#,
266-
"callee FN FileId(0) 0..14 3..9",
266+
"callee Function FileId(0) 0..14 3..9",
267267
&[
268-
"caller1 FN FileId(0) 15..45 18..25 : [34..40]",
269-
"test_caller FN FileId(0) 95..149 110..121 : [134..140]",
268+
"caller1 Function FileId(0) 15..45 18..25 : [34..40]",
269+
"test_caller Function FileId(0) 95..149 110..121 : [134..140]",
270270
],
271271
&[],
272272
);
@@ -287,8 +287,8 @@ fn caller() {
287287
//- /foo/mod.rs
288288
pub fn callee() {}
289289
"#,
290-
"callee FN FileId(1) 0..18 7..13",
291-
&["caller FN FileId(0) 27..56 30..36 : [45..51]"],
290+
"callee Function FileId(1) 0..18 7..13",
291+
&["caller Function FileId(0) 27..56 30..36 : [45..51]"],
292292
&[],
293293
);
294294
}
@@ -304,9 +304,9 @@ fn call<|>er() {
304304
callee();
305305
}
306306
"#,
307-
"caller FN FileId(0) 15..58 18..24",
307+
"caller Function FileId(0) 15..58 18..24",
308308
&[],
309-
&["callee FN FileId(0) 0..14 3..9 : [33..39, 47..53]"],
309+
&["callee Function FileId(0) 0..14 3..9 : [33..39, 47..53]"],
310310
);
311311
}
312312

@@ -325,9 +325,9 @@ fn call<|>er() {
325325
//- /foo/mod.rs
326326
pub fn callee() {}
327327
"#,
328-
"caller FN FileId(0) 27..56 30..36",
328+
"caller Function FileId(0) 27..56 30..36",
329329
&[],
330-
&["callee FN FileId(1) 0..18 7..13 : [45..51]"],
330+
&["callee Function FileId(1) 0..18 7..13 : [45..51]"],
331331
);
332332
}
333333

@@ -348,9 +348,9 @@ fn caller3() {
348348
349349
}
350350
"#,
351-
"caller2 FN FileId(0) 33..64 36..43",
352-
&["caller1 FN FileId(0) 0..31 3..10 : [19..26]"],
353-
&["caller3 FN FileId(0) 66..83 69..76 : [52..59]"],
351+
"caller2 Function FileId(0) 33..64 36..43",
352+
&["caller1 Function FileId(0) 0..31 3..10 : [19..26]"],
353+
&["caller3 Function FileId(0) 66..83 69..76 : [52..59]"],
354354
);
355355
}
356356

@@ -368,9 +368,9 @@ fn main() {
368368
a<|>()
369369
}
370370
"#,
371-
"a FN FileId(0) 0..18 3..4",
372-
&["main FN FileId(0) 31..52 34..38 : [47..48]"],
373-
&["b FN FileId(0) 20..29 23..24 : [13..14]"],
371+
"a Function FileId(0) 0..18 3..4",
372+
&["main Function FileId(0) 31..52 34..38 : [47..48]"],
373+
&["b Function FileId(0) 20..29 23..24 : [13..14]"],
374374
);
375375

376376
check_hierarchy(
@@ -385,8 +385,8 @@ fn main() {
385385
a()
386386
}
387387
"#,
388-
"b FN FileId(0) 20..29 23..24",
389-
&["a FN FileId(0) 0..18 3..4 : [13..14]"],
388+
"b Function FileId(0) 20..29 23..24",
389+
&["a Function FileId(0) 0..18 3..4 : [13..14]"],
390390
&[],
391391
);
392392
}

crates/ide/src/display.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
//! This module contains utilities for turning SyntaxNodes and HIR types
22
//! into types that may be used to render in a UI.
33
4-
mod navigation_target;
4+
pub(crate) mod navigation_target;
55
mod short_label;
66

7-
pub use navigation_target::NavigationTarget;
87
pub(crate) use navigation_target::{ToNav, TryToNav};
98
pub(crate) use short_label::ShortLabel;
109

0 commit comments

Comments
 (0)