Skip to content

Commit 9c9cb12

Browse files
RedCMDRedCMD
committed
Format Imports
1 parent 015b415 commit 9c9cb12

23 files changed

+143
-128
lines changed

‎src/DiagnosticCollection.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import * as vscode from 'vscode';
2+
import * as webTreeSitter from 'web-tree-sitter';
23
import * as vscodeOniguruma from 'vscode-oniguruma';
34
import * as textmateOnigmo from "./Onigmo/Onigmo";
4-
import { Node, QueryCapture } from 'web-tree-sitter';
5-
import { getLastNode, getTrees, queryNode, toRange, trees } from "./TreeSitter";
65
import { closeEnoughQuestionMark, DocumentSelector, getPackageJSON, stringify, wagnerFischer } from "./extension";
7-
import { unicodeproperties } from "./UNICODE_PROPERTIES";
6+
import { getLastNode, getTrees, queryNode, toRange, trees } from "./TreeSitter";
87
import { ignoreDiagnosticsUnusedRepos } from "./Providers/CodeActionsProvider";
8+
import { unicodeproperties } from "./UNICODE_PROPERTIES";
99

1010

1111
type Pointer = number;
@@ -214,7 +214,7 @@ async function Diagnostics(document: vscode.TextDocument) {
214214
}
215215

216216

217-
async function diagnosticsTreeSitterJSONErrors(diagnostics: vscode.Diagnostic[], rootNode: Node) {
217+
async function diagnosticsTreeSitterJSONErrors(diagnostics: vscode.Diagnostic[], rootNode: webTreeSitter.Node) {
218218
// vscode.window.showInformationMessage(JSON.stringify("diagnostics JSON"));
219219
// const start = performance.now();
220220
const jsonQuery = `;scm
@@ -397,7 +397,7 @@ async function diagnosticsOnigurumaRegexErrors(diagnostics: vscode.Diagnostic[],
397397
continue;
398398
}
399399

400-
let groupCaptures!: QueryCapture[];
400+
let groupCaptures!: webTreeSitter.QueryCapture[];
401401

402402
const regex: string = JSON.parse(`"${text}"`);
403403
const hasBackreferences = (key.text == 'end' || key.text == 'while') && /\\[0-9]/.test(regex);
@@ -530,7 +530,7 @@ async function diagnosticsOnigurumaRegexErrors(diagnostics: vscode.Diagnostic[],
530530
// vscode.window.showInformationMessage(`Oniguruma ${(performance.now() - start).toFixed(3)}ms`);
531531
}
532532

533-
async function diagnosticsBrokenIncludes(diagnostics: vscode.Diagnostic[], rootNode: Node) {
533+
async function diagnosticsBrokenIncludes(diagnostics: vscode.Diagnostic[], rootNode: webTreeSitter.Node) {
534534
// vscode.window.showInformationMessage(JSON.stringify("diagnostics #includes"))
535535
// const start = performance.now();
536536

@@ -540,7 +540,7 @@ async function diagnosticsBrokenIncludes(diagnostics: vscode.Diagnostic[], rootN
540540
const nestedRepoQuery = `;scm
541541
(repo (repository (repo (key) @repo)))
542542
`;
543-
let nestedRepoCaptures: QueryCapture[] = [];
543+
let nestedRepoCaptures: webTreeSitter.QueryCapture[] = [];
544544

545545
// TreeSitter compiling sibling nodes query very slow
546546
// https://github.com/tree-sitter/tree-sitter/issues/3956
@@ -691,14 +691,14 @@ async function diagnosticsBrokenIncludes(diagnostics: vscode.Diagnostic[], rootN
691691
// vscode.window.showInformationMessage(`include ${(performance.now() - start).toFixed(3)}ms`);
692692
}
693693

694-
async function diagnosticsUnusedRepos(diagnostics: vscode.Diagnostic[], rootNode: Node) {
694+
async function diagnosticsUnusedRepos(diagnostics: vscode.Diagnostic[], rootNode: webTreeSitter.Node) {
695695
if (ignoreDiagnosticsUnusedRepos) {
696696
return;
697697
}
698698
// vscode.window.showInformationMessage(`diagnostics unusedRepos\n${JSON.stringify(rootNode)}`)
699699
// const start = performance.now();
700700

701-
const includeCapturesCache: { [id: number]: QueryCapture[]; } = {};
701+
const includeCapturesCache: { [id: number]: webTreeSitter.QueryCapture[]; } = {};
702702

703703
// should validate all #include first
704704
// but TS too slow
@@ -746,7 +746,7 @@ async function diagnosticsUnusedRepos(diagnostics: vscode.Diagnostic[], rootNode
746746
// vscode.window.showInformationMessage(`unusedRepos ${(performance.now() - start).toFixed(3)}ms`);
747747
}
748748

749-
async function diagnosticsDeadTextMateCode(diagnostics: vscode.Diagnostic[], rootNode: Node) {
749+
async function diagnosticsDeadTextMateCode(diagnostics: vscode.Diagnostic[], rootNode: webTreeSitter.Node) {
750750
// vscode.window.showInformationMessage(JSON.stringify("diagnostics TextMate dead"));
751751
// const start = performance.now();
752752

@@ -837,7 +837,7 @@ async function diagnosticsDeadTextMateCode(diagnostics: vscode.Diagnostic[], roo
837837
// vscode.window.showInformationMessage(`dead ${(performance.now() - start).toFixed(3)}ms\n${JSON.stringify(diagnostics, stringify)}`);
838838
}
839839

840-
async function diagnosticsMismatchingRootScopeName(diagnostics: vscode.Diagnostic[], rootNode: Node, document: vscode.TextDocument) {
840+
async function diagnosticsMismatchingRootScopeName(diagnostics: vscode.Diagnostic[], rootNode: webTreeSitter.Node, document: vscode.TextDocument) {
841841
// vscode.window.showInformationMessage(JSON.stringify("diagnostics scopeName"));
842842
// const start = performance.now();
843843

‎src/Onigmo/moveOnigmo.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as fs from 'fs';
22
import * as path from 'path';
33

4+
45
copyFile('../../src/Onigmo/Onigmo.js', 'Onigmo.js');
56
copyFile('../../src/Onigmo/Onigmo.wasm', 'Onigmo.wasm');
67

‎src/Oniguruma.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as vscode from 'vscode';
22
import * as vscodeOniguruma from 'vscode-oniguruma';
33
import * as textmateOnigmo from "./Onigmo/Onigmo";
44

5+
56
export async function initOniguruma(context: vscode.ExtensionContext): Promise<void> {
67
// https://github.com/microsoft/vscode
78
// https://github.com/microsoft/vscode-textmate/tree/v9.2.0

‎src/Providers/CodeActionsProvider.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import * as vscode from 'vscode';
2-
import { Node, Tree } from 'web-tree-sitter';
3-
import { getTrees, queryNode, toRange, trees } from "../TreeSitter";
4-
import { unicodeproperties, UNICODE_PROPERTIES } from "../UNICODE_PROPERTIES";
2+
import * as webTreeSitter from 'web-tree-sitter';
3+
import * as optimizer from 'oniguruma-parser-cjs/optimizer';
54
import { closeEnoughQuestionMark, stringify, wagnerFischer } from "../extension";
5+
import { getTrees, queryNode, toRange } from "../TreeSitter";
66
import { debouncedDiagnostics } from "../DiagnosticCollection";
7+
import { unicodeproperties, UNICODE_PROPERTIES } from "../UNICODE_PROPERTIES";
78

8-
import { optimize } from 'oniguruma-parser-cjs/optimizer';
99

1010
export const metadata: vscode.CodeActionProviderMetadata = {
1111
providedCodeActionKinds: [
@@ -18,8 +18,8 @@ export const metadata: vscode.CodeActionProviderMetadata = {
1818
};
1919

2020
type CodeAction = vscode.CodeAction & {
21-
document: vscode.TextDocument,
22-
node?: Node;
21+
document: vscode.TextDocument;
22+
node?: webTreeSitter.Node;
2323
};
2424

2525
export let ignoreDiagnosticsUnusedRepos: boolean = false;
@@ -219,13 +219,13 @@ const minifyQuery = `;scm
219219
(character_class (backslash) @backslash_class)
220220
`;
221221

222-
async function optimizeRegex(edit: vscode.WorkspaceEdit, regexNode: Node, uri: vscode.Uri) {
222+
async function optimizeRegex(edit: vscode.WorkspaceEdit, regexNode: webTreeSitter.Node, uri: vscode.Uri) {
223223
const range = toRange(regexNode);
224224

225225
try {
226226
const text: string = JSON.parse(`"${regexNode.text}"`);
227227

228-
const optimized = optimize(text, {
228+
const optimized = optimizer.optimize(text, {
229229
rules: {
230230
// Follow `vscode-oniguruma` which enables this Oniguruma option by default
231231
captureGroup: true,
@@ -414,7 +414,7 @@ function replaceStringAt(string: string, replacement: string, startIndex: number
414414
return string.substring(0, startIndex) + replacement + string.substring(endIndex ?? startIndex + replacement.length);
415415
}
416416

417-
function sortJSON(edit: vscode.WorkspaceEdit, jsonTree: Tree, uri: vscode.Uri) {
417+
function sortJSON(edit: vscode.WorkspaceEdit, jsonTree: webTreeSitter.Tree, uri: vscode.Uri) {
418418
const rootNode = jsonTree.rootNode;
419419
let newRootText = rootNode.text;
420420

@@ -460,7 +460,7 @@ function sortJSON(edit: vscode.WorkspaceEdit, jsonTree: Tree, uri: vscode.Uri) {
460460
// vscode.window.showInformationMessage(`node\n${JSON.stringify(node.toString())}`);
461461

462462
const keys: {
463-
keyNode: Node;
463+
keyNode: webTreeSitter.Node;
464464
nodeText: string;
465465
}[] = [];
466466
for (const child of node.namedChildren) {

‎src/Providers/CodeLensProvider.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import * as vscode from 'vscode';
2-
import { QueryCapture } from 'web-tree-sitter';
2+
import * as webTreeSitter from 'web-tree-sitter';
3+
import { IRelaxedExtensionManifest } from "../extensions";
34
import { getTrees, queryNode, toRange } from "../TreeSitter";
45
import { grammarLanguages } from "../TextMate";
5-
import { IRelaxedExtensionManifest } from "../extensions";
6+
67

78
type CodeLens = vscode.CodeLens & {
8-
capture: QueryCapture;
9+
capture: webTreeSitter.QueryCapture;
910
document: vscode.TextDocument;
1011
};
1112

‎src/Providers/CompletionItemProvider.ts‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import * as vscode from 'vscode';
2-
import { Node, QueryCapture, Tree } from 'web-tree-sitter';
3-
import { getTrees, toRange, toPoint, queryNode, getLastNode, trees, toPosition } from "../TreeSitter";
2+
import * as webTreeSitter from 'web-tree-sitter';
3+
import { getPackageJSON } from '../extension';
44
import { ITextMateThemingRule } from "../extensions";
5+
import { getTrees, toRange, toPoint, queryNode, getLastNode, trees, toPosition } from "../TreeSitter";
56
import { getScopes } from "../themeScopeColors";
67
import { UNICODE_PROPERTIES } from "../UNICODE_PROPERTIES";
78
import { unicode_property_data } from "../unicode_property_data";
8-
import { getPackageJSON, sleep } from '../extension';
9+
910

1011
type CompletionItem = vscode.CompletionItem & { type?: string; };
1112

@@ -52,7 +53,7 @@ const defaultThemeColors: { [baseTheme: string]: ITextMateThemingRule[]; } = {
5253
]
5354
};
5455

55-
function comma(cursorNode: Node, position: vscode.Position) {
56+
function comma(cursorNode: webTreeSitter.Node, position: vscode.Position) {
5657
return toPosition(cursorNode.lastNamedChild!.endPosition).isBefore(position) ? '' : ',';
5758
}
5859

@@ -671,7 +672,7 @@ export const CompletionItemProvider: vscode.CompletionItemProvider = {
671672
};
672673

673674

674-
function repoCompletionItems(completionItems: CompletionItem[], tree: Tree, cursorRange: vscode.Range, scopeName?: string): void {
675+
function repoCompletionItems(completionItems: CompletionItem[], tree: webTreeSitter.Tree, cursorRange: vscode.Range, scopeName?: string): void {
675676
const rootNode = tree.rootNode;
676677

677678
const repoQuery =
@@ -733,7 +734,7 @@ function repoCompletionItems(completionItems: CompletionItem[], tree: Tree, curs
733734
}
734735
}
735736

736-
function locateRegex(trees: trees, nameNode: Node): QueryCapture[] {
737+
function locateRegex(trees: trees, nameNode: webTreeSitter.Node): webTreeSitter.QueryCapture[] {
737738
const parent = nameNode.parent!;
738739
if (nameNode.type == 'name' && parent.childForFieldName('match')) {
739740
return getCaptureGroups(trees, parent, 'match');
@@ -756,7 +757,7 @@ function locateRegex(trees: trees, nameNode: Node): QueryCapture[] {
756757
if (!tripleParent.childForFieldName('begin')) {
757758
return [];
758759
}
759-
let beginCaptures: QueryCapture[] = [];
760+
let beginCaptures: webTreeSitter.QueryCapture[] = [];
760761
if (!getLastNode(tripleParent, 'beginCaptures')) {
761762
beginCaptures = getCaptureGroups(trees, tripleParent, 'begin');
762763
}
@@ -796,7 +797,7 @@ function locateRegex(trees: trees, nameNode: Node): QueryCapture[] {
796797
return [];
797798
}
798799

799-
function getCaptureGroups(trees: trees, parentNode: Node, type: string): QueryCapture[] {
800+
function getCaptureGroups(trees: trees, parentNode: webTreeSitter.Node, type: string): webTreeSitter.QueryCapture[] {
800801
const node = getLastNode(parentNode, type);
801802
if (!node) {
802803
return [];

‎src/Providers/DefinitionProvider.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import * as vscode from 'vscode';
2-
import { Point, Node } from 'web-tree-sitter';
3-
import { getTrees, toRange, toPoint, queryNode, trees, getLastNode } from "../TreeSitter";
2+
import * as webTreeSitter from 'web-tree-sitter';
43
import { DocumentSelector, stringify } from "../extension";
4+
import { getTrees, toRange, toPoint, queryNode, trees, getLastNode } from "../TreeSitter";
5+
56

67
let previous: {
78
position: vscode.Position;
@@ -376,7 +377,7 @@ export const DefinitionProvider: vscode.DefinitionProvider = {
376377
}
377378
};
378379

379-
function pushDefinitionLink(definitions: vscode.LocationLink[], node: Node | null | undefined, originSelectionRange: vscode.Range, uri: vscode.Uri) {
380+
function pushDefinitionLink(definitions: vscode.LocationLink[], node: webTreeSitter.Node | null | undefined, originSelectionRange: vscode.Range, uri: vscode.Uri) {
380381
if (!node) {
381382
return false;
382383
}
@@ -391,7 +392,7 @@ function pushDefinitionLink(definitions: vscode.LocationLink[], node: Node | nul
391392
return true;
392393
}
393394

394-
function getCaptureRefs(trees: trees, node: Node, position: vscode.Position) {
395+
function getCaptureRefs(trees: trees, node: webTreeSitter.Node, position: vscode.Position) {
395396
const regexTrees = trees.regexTrees;
396397
const regexNode = regexTrees.get(node.id)?.rootNode;
397398
if (!regexNode) {
@@ -430,9 +431,9 @@ function getCaptureRefs(trees: trees, node: Node, position: vscode.Position) {
430431
(name) @name
431432
`;
432433
// const startPoint = toPoint(new vscode.Position(position.line, position.character - 1));
433-
const startPoint: Point = { row: position.line, column: position.character - 1 };
434+
const startPoint: webTreeSitter.Point = { row: position.line, column: position.character - 1 };
434435
// const endPoint = toPoint(new vscode.Position(position.line, position.character + 1));
435-
const endPoint: Point = { row: position.line, column: position.character + 1 };
436+
const endPoint: webTreeSitter.Point = { row: position.line, column: position.character + 1 };
436437
const groupSyntaxNode = queryNode(groupNode, groupSyntaxQuery, startPoint, endPoint).pop()?.node;
437438

438439
if (!groupSyntaxNode) {
@@ -451,7 +452,7 @@ function getCaptureRefs(trees: trees, node: Node, position: vscode.Position) {
451452
return { range: toRange(groupNode), captures: targetCaptures };
452453
}
453454

454-
function getRegexGroup(trees: trees, parentNode: Node, captureNode: Node, type: string): Node | undefined {
455+
function getRegexGroup(trees: trees, parentNode: webTreeSitter.Node, captureNode: webTreeSitter.Node, type: string): webTreeSitter.Node | undefined {
455456
const node = getLastNode(parentNode, type);
456457
if (!node) {
457458
return;

‎src/Providers/DocumentDropEditProvider.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as vscode from 'vscode';
22
import { DocumentSelector } from "../extension";
33
import { getTrees, queryNode, toPoint, toPosition } from "../TreeSitter";
44

5+
56
export const DocumentDropEditProvider: vscode.DocumentDropEditProvider = {
67
async provideDocumentDropEdits(document: vscode.TextDocument, position: vscode.Position, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise<vscode.DocumentDropEdit | undefined> {
78
// vscode.window.showInformationMessage(JSON.stringify("DocumentDrop"));

‎src/Providers/DocumentFormattingEditProvider.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as vscode from 'vscode';
2-
import * as TreeSitter from 'web-tree-sitter';
2+
import * as webTreeSitter from 'web-tree-sitter';
33
import { getTrees, toRange, toPoint, queryNode } from "../TreeSitter";
4-
import { sleep } from "../extension";
54

65

76
type formattingStyle = {
@@ -55,7 +54,7 @@ export const DocumentRangeFormattingEditProvider: vscode.DocumentRangeFormatting
5554
const nestedCaptures = queryNode(jsonTree.rootNode, queryString, startPoint, endPoint);
5655

5756
let level = -1;
58-
let node!: TreeSitter.Node;
57+
let node!: webTreeSitter.Node;
5958
for (const nestedCapture of nestedCaptures) {
6059
const nestedNode = nestedCapture.node;
6160
if (!toRange(nestedNode).contains(range)) {
@@ -92,7 +91,7 @@ export const OnTypeFormattingEditProvider: vscode.OnTypeFormattingEditProvider =
9291
return;
9392
}
9493
const cursorNode = capture.node;
95-
let node: TreeSitter.Node | null;
94+
let node: webTreeSitter.Node | null;
9695

9796
switch (ch) {
9897
case ',':
@@ -130,7 +129,7 @@ export const OnTypeFormattingEditProvider: vscode.OnTypeFormattingEditProvider =
130129
};
131130

132131

133-
function formatChildren(parentNode: TreeSitter.Node, textEdits: vscode.TextEdit[], indent: number, style: formattingStyle): boolean {
132+
function formatChildren(parentNode: webTreeSitter.Node, textEdits: vscode.TextEdit[], indent: number, style: formattingStyle): boolean {
134133
let expand: boolean = false;
135134

136135
for (const node of parentNode.namedChildren) {

‎src/Providers/DocumentHighlightProvider.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as vscode from 'vscode';
22
import { getTrees, queryNode, toPoint, toRange } from "../TreeSitter";
33

4+
45
export const DocumentHighlightProvider: vscode.DocumentHighlightProvider = {
56
provideDocumentHighlights(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): vscode.DocumentHighlight[] | undefined {
67
// vscode.window.showInformationMessage(`DocumentHighlights ${JSON.stringify(position)}\n${JSON.stringify(document)}`);

0 commit comments

Comments
 (0)