Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

vscode: postrefactor

Browse source
This commit is contained in:
veetaha 2020-04-02 03:35:58 +03:00
parent e4c69443e7
commit 036a8aee2a
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editors/code/src/commands/syntax_tree.ts
View file

@ -82,7 +82,7 @@ class TextDocumentContentProvider implements vscode.TextDocumentContentProvider
// FIXME: consider implementing this via the Tree View API? // FIXME: consider implementing this via the Tree View API?
// https://code.visualstudio.com/api/extension-guides/tree-view // https://code.visualstudio.com/api/extension-guides/tree-view
class AstInspector implements vscode.HoverProvider, Disposable { class AstInspector implements vscode.HoverProvider, vscode.DefinitionProvider, Disposable {
private readonly astDecorationType = vscode.window.createTextEditorDecorationType({ private readonly astDecorationType = vscode.window.createTextEditorDecorationType({
borderColor: new vscode.ThemeColor('rust_analyzer.syntaxTreeBorder'), borderColor: new vscode.ThemeColor('rust_analyzer.syntaxTreeBorder'),
borderStyle: "solid", borderStyle: "solid",
@ -96,8 +96,7 @@ class AstInspector implements vscode.HoverProvider, Disposable {
const astEditor = this.findAstTextEditor(); const astEditor = this.findAstTextEditor();
if (!this.rustEditor || !astEditor) return undefined; if (!this.rustEditor || !astEditor) return undefined;
console.time("Build goto def index"); const buf: [vscode.Range, vscode.Range][] = [];
let buf: [vscode.Range, vscode.Range][] = [];
for (let i = 0; i < astEditor.document.lineCount; ++i) { for (let i = 0; i < astEditor.document.lineCount; ++i) {
const astLine = astEditor.document.lineAt(i); const astLine = astEditor.document.lineAt(i);
@ -108,10 +107,8 @@ class AstInspector implements vscode.HoverProvider, Disposable {
const rustRange = this.parseRustTextRange(this.rustEditor.document, astLine.text); const rustRange = this.parseRustTextRange(this.rustEditor.document, astLine.text);
if (!rustRange) continue; if (!rustRange) continue;
buf.push([rustRange, this.findAstRange(astLine)]); buf.push([rustRange, this.findAstNodeRange(astLine)]);
} }
console.timeEnd("Build goto def index");
return buf; return buf;
}); });
@ -167,9 +164,7 @@ class AstInspector implements vscode.HoverProvider, Disposable {
const astEditor = this.findAstTextEditor(); const astEditor = this.findAstTextEditor();
if (!astEditor) return; if (!astEditor) return;
console.time("Goto def");
const rust2AstRanges = this.rust2Ast.get()?.find(([rustRange, _]) => rustRange.contains(pos)); const rust2AstRanges = this.rust2Ast.get()?.find(([rustRange, _]) => rustRange.contains(pos));
console.timeEnd("Goto def");
if (!rust2AstRanges) return; if (!rust2AstRanges) return;
const [rustFileRange, astFileRange] = rust2AstRanges; const [rustFileRange, astFileRange] = rust2AstRanges;
@ -198,12 +193,12 @@ class AstInspector implements vscode.HoverProvider, Disposable {
this.rustEditor.revealRange(rustFileRange); this.rustEditor.revealRange(rustFileRange);
const rustSourceCode = this.rustEditor.document.getText(rustFileRange); const rustSourceCode = this.rustEditor.document.getText(rustFileRange);
const astFileRange = this.findAstRange(astFileLine); const astFileRange = this.findAstNodeRange(astFileLine);
return new vscode.Hover(["```rust\n" + rustSourceCode + "\n```"], astFileRange); return new vscode.Hover(["```rust\n" + rustSourceCode + "\n```"], astFileRange);
} }
private findAstRange(astLine: vscode.TextLine) { private findAstNodeRange(astLine: vscode.TextLine) {
const lineOffset = astLine.range.start; const lineOffset = astLine.range.start;
const begin = lineOffset.translate(undefined, astLine.firstNonWhitespaceCharacterIndex); const begin = lineOffset.translate(undefined, astLine.firstNonWhitespaceCharacterIndex);
const end = lineOffset.translate(undefined, astLine.text.trimEnd().length); const end = lineOffset.translate(undefined, astLine.text.trimEnd().length);
@ -223,7 +218,7 @@ class AstInspector implements vscode.HoverProvider, Disposable {
class Lazy<T> { class Lazy<T> {
val: undefined | T; val: undefined | T;
constructor(private readonly compute: () => undefined | T) {} constructor(private readonly compute: () => undefined | T) { }
get() { get() {
return this.val ?? (this.val = this.compute()); return this.val ?? (this.val = this.compute());
@ -232,5 +227,4 @@ class Lazy<T> {
reset() { reset() {
this.val = undefined; this.val = undefined;
} }
} }