mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Style and test fixes

Browse source
This commit is contained in:
Kirill Bulatov 2019-08-05 00:47:14 +03:00
parent 15411d4474
commit 3fb6462d54
2 changed files with 45 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
crates/ra_ide_api/src/inlay_hints.rs
View file

@ -216,52 +216,52 @@ fn main() {
assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
InlayHint {
range: [193; 197),
kind: LetBindingType,
kind: TypeHint,
label: "i32",
},
InlayHint {
range: [236; 244),
kind: LetBindingType,
kind: TypeHint,
label: "i32",
},
InlayHint {
range: [275; 279),
kind: LetBindingType,
kind: TypeHint,
label: "&str",
},
InlayHint {
range: [539; 543),
kind: LetBindingType,
kind: TypeHint,
label: "(i32, char)",
},
InlayHint {
range: [566; 567),
kind: LetBindingType,
kind: TypeHint,
label: "i32",
},
InlayHint {
range: [570; 571),
kind: LetBindingType,
kind: TypeHint,
label: "i32",
},
InlayHint {
range: [573; 574),
kind: LetBindingType,
kind: TypeHint,
label: "i32",
},
InlayHint {
range: [584; 585),
kind: LetBindingType,
kind: TypeHint,
label: "i32",
},
InlayHint {
range: [577; 578),
kind: LetBindingType,
kind: TypeHint,
label: "f64",
},
InlayHint {
range: [580; 581),
kind: LetBindingType,
kind: TypeHint,
label: "f64",
},
]"#
@ -283,12 +283,12 @@ fn main() {
assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
InlayHint {
range: [21; 30),
kind: LetBindingType,
kind: TypeHint,
label: "i32",
},
InlayHint {
range: [57; 66),
kind: ClosureParameterType,
kind: TypeHint,
label: "i32",
},
]"#
@ -310,12 +310,12 @@ fn main() {
assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
InlayHint {
range: [21; 30),
kind: LetBindingType,
kind: TypeHint,
label: "i32",
},
InlayHint {
range: [44; 53),
kind: ForExpressionBindingType,
kind: TypeHint,
label: "i32",
},
]"#
@ -356,27 +356,27 @@ fn main() {
assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
InlayHint {
range: [166; 170),
kind: LetBindingType,
kind: TypeHint,
label: "CustomOption<Test>",
},
InlayHint {
range: [334; 338),
kind: IfExpressionType,
kind: TypeHint,
label: "&Test",
},
InlayHint {
range: [389; 390),
kind: IfExpressionType,
kind: TypeHint,
label: "&CustomOption<u32>",
},
InlayHint {
range: [392; 393),
kind: IfExpressionType,
kind: TypeHint,
label: "&u8",
},
InlayHint {
range: [531; 532),
kind: IfExpressionType,
kind: TypeHint,
label: "&u32",
},
]"#
@ -417,7 +417,7 @@ fn main() {
assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
InlayHint {
range: [166; 170),
kind: LetBindingType,
kind: TypeHint,
label: "CustomOption<Test>",
},
]"#
@ -457,23 +457,23 @@ fn main() {
assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
InlayHint {
range: [312; 316),
kind: MatchArmType,
range: [311; 315),
kind: TypeHint,
label: "Test",
},
InlayHint {
range: [359; 360),
kind: MatchArmType,
range: [358; 359),
kind: TypeHint,
label: "CustomOption<u32>",
},
InlayHint {
range: [362; 363),
kind: MatchArmType,
range: [361; 362),
kind: TypeHint,
label: "u8",
},
InlayHint {
range: [485; 486),
kind: MatchArmType,
range: [484; 485),
kind: TypeHint,
label: "u32",
},
]"#

23
editors/code/src/commands/inlay_hints.ts
View file

@ -27,14 +27,19 @@ export class HintsUpdater {
if (this.displayHints) {
const documentUri = this.getEditorDocumentUri(editor);
if (documentUri !== null) {
const latestDecorations = this.drawnDecorations.get(documentUri);
const latestDecorations = this.drawnDecorations.get(
documentUri
);
if (latestDecorations === undefined) {
await this.updateDecorationsFromServer(
documentUri,
editor!
);
} else {
await editor!.setDecorations(typeHintDecorationType, latestDecorations);
await editor!.setDecorations(
typeHintDecorationType,
latestDecorations
);
}
}
}
@ -48,9 +53,12 @@ export class HintsUpdater {
if (displayHints) {
return this.updateHints();
} else {
const editor = vscode.window.activeTextEditor;
if (this.getEditorDocumentUri(editor) !== null) {
return editor!.setDecorations(typeHintDecorationType, []);
const currentEditor = vscode.window.activeTextEditor;
if (this.getEditorDocumentUri(currentEditor) !== null) {
return currentEditor!.setDecorations(
typeHintDecorationType,
[]
);
}
}
}
@ -92,7 +100,10 @@ export class HintsUpdater {
this.drawnDecorations.set(documentUri, newDecorations);
if (this.getEditorDocumentUri(vscode.window.activeTextEditor) === documentUri) {
if (
this.getEditorDocumentUri(vscode.window.activeTextEditor) ===
documentUri
) {
return editor.setDecorations(
typeHintDecorationType,
newDecorations