Skip to content

Commit f247090

Browse files
listochkinlistochkin
committed
prettier run
1 parent 8e9f54f commit f247090

24 files changed

+1177
-816
lines changed

‎editors/code/.eslintrc.js

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
11
module.exports = {
2-
"env": {
3-
"es6": true,
4-
"node": true
2+
env: {
3+
es6: true,
4+
node: true,
55
},
6-
"extends": ["prettier"],
7-
"parser": "@typescript-eslint/parser",
8-
"parserOptions": {
9-
"project": "tsconfig.eslint.json",
10-
"tsconfigRootDir": __dirname,
11-
"sourceType": "module"
6+
extends: ["prettier"],
7+
parser: "@typescript-eslint/parser",
8+
parserOptions: {
9+
project: "tsconfig.eslint.json",
10+
tsconfigRootDir: __dirname,
11+
sourceType: "module",
1212
},
13-
"plugins": [
14-
"@typescript-eslint"
15-
],
16-
"rules": {
17-
"camelcase": ["error"],
18-
"eqeqeq": ["error", "always", { "null": "ignore" }],
13+
plugins: ["@typescript-eslint"],
14+
rules: {
15+
camelcase: ["error"],
16+
eqeqeq: ["error", "always", { null: "ignore" }],
1917
"no-console": ["error", { allow: ["warn", "error"] }],
2018
"prefer-const": "error",
2119
"@typescript-eslint/member-delimiter-style": [
2220
"error",
2321
{
24-
"multiline": {
25-
"delimiter": "semi",
26-
"requireLast": true
22+
multiline: {
23+
delimiter: "semi",
24+
requireLast: true,
2725
},
28-
"singleline": {
29-
"delimiter": "semi",
30-
"requireLast": false
31-
}
32-
}
33-
],
34-
"@typescript-eslint/semi": [
35-
"error",
36-
"always"
26+
singleline: {
27+
delimiter: "semi",
28+
requireLast: false,
29+
},
30+
},
3731
],
32+
"@typescript-eslint/semi": ["error", "always"],
3833
"@typescript-eslint/no-unnecessary-type-assertion": "error",
39-
"@typescript-eslint/no-floating-promises": "error"
40-
}
34+
"@typescript-eslint/no-floating-promises": "error",
35+
},
4136
};

‎editors/code/language-configuration.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"comments": {
33
"lineComment": "//",
4-
"blockComment": [ "/*", "*/" ]
4+
"blockComment": ["/*", "*/"]
55
},
66
"brackets": [
77
["{", "}"],
88
["[", "]"],
99
["(", ")"]
1010
],
1111
"colorizedBracketPairs": [
12-
["{", "}"],
13-
["[", "]"],
14-
["(", ")"]
15-
],
12+
["{", "}"],
13+
["[", "]"],
14+
["(", ")"]
15+
],
1616
"autoClosingPairs": [
1717
{ "open": "{", "close": "}" },
1818
{ "open": "[", "close": "]" },

‎editors/code/ra_syntax_tree.tmGrammar.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,5 @@
2525
"name": "string"
2626
}
2727
},
28-
"fileTypes": [
29-
"rast"
30-
]
28+
"fileTypes": ["rast"]
3129
}

‎editors/code/src/ast_inspector.ts

Lines changed: 54 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import * as vscode from 'vscode';
1+
import * as vscode from "vscode";
22

3-
import { Ctx, Disposable } from './ctx';
4-
import { RustEditor, isRustEditor } from './util';
3+
import { Ctx, Disposable } from "./ctx";
4+
import { RustEditor, isRustEditor } from "./util";
55

66
// FIXME: consider implementing this via the Tree View API?
77
// https://code.visualstudio.com/api/extension-guides/tree-view
88
export class AstInspector implements vscode.HoverProvider, vscode.DefinitionProvider, Disposable {
99
private readonly astDecorationType = vscode.window.createTextEditorDecorationType({
10-
borderColor: new vscode.ThemeColor('rust_analyzer.syntaxTreeBorder'),
10+
borderColor: new vscode.ThemeColor("rust_analyzer.syntaxTreeBorder"),
1111
borderStyle: "solid",
1212
borderWidth: "2px",
1313
});
@@ -35,11 +35,23 @@ export class AstInspector implements vscode.HoverProvider, vscode.DefinitionProv
3535
});
3636

3737
constructor(ctx: Ctx) {
38-
ctx.pushCleanup(vscode.languages.registerHoverProvider({ scheme: 'rust-analyzer' }, this));
38+
ctx.pushCleanup(vscode.languages.registerHoverProvider({ scheme: "rust-analyzer" }, this));
3939
ctx.pushCleanup(vscode.languages.registerDefinitionProvider({ language: "rust" }, this));
40-
vscode.workspace.onDidCloseTextDocument(this.onDidCloseTextDocument, this, ctx.subscriptions);
41-
vscode.workspace.onDidChangeTextDocument(this.onDidChangeTextDocument, this, ctx.subscriptions);
42-
vscode.window.onDidChangeVisibleTextEditors(this.onDidChangeVisibleTextEditors, this, ctx.subscriptions);
40+
vscode.workspace.onDidCloseTextDocument(
41+
this.onDidCloseTextDocument,
42+
this,
43+
ctx.subscriptions
44+
);
45+
vscode.workspace.onDidChangeTextDocument(
46+
this.onDidChangeTextDocument,
47+
this,
48+
ctx.subscriptions
49+
);
50+
vscode.window.onDidChangeVisibleTextEditors(
51+
this.onDidChangeVisibleTextEditors,
52+
this,
53+
ctx.subscriptions
54+
);
4355

4456
ctx.pushCleanup(this);
4557
}
@@ -48,7 +60,10 @@ export class AstInspector implements vscode.HoverProvider, vscode.DefinitionProv
4860
}
4961

5062
private onDidChangeTextDocument(event: vscode.TextDocumentChangeEvent) {
51-
if (this.rustEditor && event.document.uri.toString() === this.rustEditor.document.uri.toString()) {
63+
if (
64+
this.rustEditor &&
65+
event.document.uri.toString() === this.rustEditor.document.uri.toString()
66+
) {
5267
this.rust2Ast.reset();
5368
}
5469
}
@@ -68,7 +83,9 @@ export class AstInspector implements vscode.HoverProvider, vscode.DefinitionProv
6883
}
6984

7085
private findAstTextEditor(): undefined | vscode.TextEditor {
71-
return vscode.window.visibleTextEditors.find(it => it.document.uri.scheme === 'rust-analyzer');
86+
return vscode.window.visibleTextEditors.find(
87+
(it) => it.document.uri.scheme === "rust-analyzer"
88+
);
7289
}
7390

7491
private setRustEditor(newRustEditor: undefined | RustEditor) {
@@ -80,30 +97,41 @@ export class AstInspector implements vscode.HoverProvider, vscode.DefinitionProv
8097
}
8198

8299
// additional positional params are omitted
83-
provideDefinition(doc: vscode.TextDocument, pos: vscode.Position): vscode.ProviderResult<vscode.DefinitionLink[]> {
84-
if (!this.rustEditor || doc.uri.toString() !== this.rustEditor.document.uri.toString()) return;
100+
provideDefinition(
101+
doc: vscode.TextDocument,
102+
pos: vscode.Position
103+
): vscode.ProviderResult<vscode.DefinitionLink[]> {
104+
if (!this.rustEditor || doc.uri.toString() !== this.rustEditor.document.uri.toString())
105+
return;
85106

86107
const astEditor = this.findAstTextEditor();
87108
if (!astEditor) return;
88109

89-
const rust2AstRanges = this.rust2Ast.get()?.find(([rustRange, _]) => rustRange.contains(pos));
110+
const rust2AstRanges = this.rust2Ast
111+
.get()
112+
?.find(([rustRange, _]) => rustRange.contains(pos));
90113
if (!rust2AstRanges) return;
91114

92115
const [rustFileRange, astFileRange] = rust2AstRanges;
93116

94117
astEditor.revealRange(astFileRange);
95118
astEditor.selection = new vscode.Selection(astFileRange.start, astFileRange.end);
96119

97-
return [{
98-
targetRange: astFileRange,
99-
targetUri: astEditor.document.uri,
100-
originSelectionRange: rustFileRange,
101-
targetSelectionRange: astFileRange,
102-
}];
120+
return [
121+
{
122+
targetRange: astFileRange,
123+
targetUri: astEditor.document.uri,
124+
originSelectionRange: rustFileRange,
125+
targetSelectionRange: astFileRange,
126+
},
127+
];
103128
}
104129

105130
// additional positional params are omitted
106-
provideHover(doc: vscode.TextDocument, hoverPosition: vscode.Position): vscode.ProviderResult<vscode.Hover> {
131+
provideHover(
132+
doc: vscode.TextDocument,
133+
hoverPosition: vscode.Position
134+
): vscode.ProviderResult<vscode.Hover> {
107135
if (!this.rustEditor) return;
108136

109137
const astFileLine = doc.lineAt(hoverPosition.line);
@@ -127,13 +155,14 @@ export class AstInspector implements vscode.HoverProvider, vscode.DefinitionProv
127155
return new vscode.Range(begin, end);
128156
}
129157

130-
private parseRustTextRange(doc: vscode.TextDocument, astLine: string): undefined | vscode.Range {
158+
private parseRustTextRange(
159+
doc: vscode.TextDocument,
160+
astLine: string
161+
): undefined | vscode.Range {
131162
const parsedRange = /(\d+)\.\.(\d+)/.exec(astLine);
132163
if (!parsedRange) return;
133164

134-
const [begin, end] = parsedRange
135-
.slice(1)
136-
.map(off => this.positionAt(doc, +off));
165+
const [begin, end] = parsedRange.slice(1).map((off) => this.positionAt(doc, +off));
137166

138167
return new vscode.Range(begin, end);
139168
}
@@ -173,7 +202,7 @@ export class AstInspector implements vscode.HoverProvider, vscode.DefinitionProv
173202
class Lazy<T> {
174203
val: undefined | T;
175204

176-
constructor(private readonly compute: () => undefined | T) { }
205+
constructor(private readonly compute: () => undefined | T) {}
177206

178207
get() {
179208
return this.val ?? (this.val = this.compute());

0 commit comments

Comments
 (0)