Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic show syntax tree #68

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@
"command": "cairo.viewAnalyzedCrates",
"title": "View currently analyzed crates",
"category": "Cairo"
},
{
"command": "cairo.viewSyntaxTree",
"title": "View syntax tree of the current file content",
"category": "Cairo"
}
],
"configuration": [
Expand Down
2 changes: 2 additions & 0 deletions src/cairols.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Context } from "./context";
import { Scarb } from "./scarb";
import {
registerMacroExpandProvider,
registerViewSyntaxTreeProvider,
registerVfsProvider,
registerViewAnalyzedCratesProvider,
} from "./textDocumentProviders";
Expand Down Expand Up @@ -71,6 +72,7 @@ export async function setupLanguageServer(ctx: Context): Promise<SetupResult | u
registerVfsProvider(client, ctx);
registerMacroExpandProvider(client, ctx);
registerViewAnalyzedCratesProvider(client, ctx);
registerViewSyntaxTreeProvider(client, ctx);

client.onNotification("scarb/could-not-find-scarb-executable", () => notifyScarbMissing(ctx));

Expand Down
12 changes: 12 additions & 0 deletions src/lspRequests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,15 @@ export interface ToolchainInfoResponse {
export const toolchainInfo = new lc.RequestType0<ToolchainInfoResponse, void>(
"cairo/toolchainInfo",
);

export interface ViewSyntaxTreeRequest {
uri: string;
}

export type ViewSyntaxTreeRequestResponse = string | null;

export const viewSyntaxTree = new lc.RequestType<
ViewSyntaxTreeRequest,
ViewSyntaxTreeRequestResponse,
void
>("cairo/viewSyntaxTree");
37 changes: 36 additions & 1 deletion src/textDocumentProviders.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as lc from "vscode-languageclient/node";
import * as vscode from "vscode";
import { Context } from "./context";
import { expandMacro, vfsProvide, viewAnalyzedCrates } from "./lspRequests";
import { expandMacro, viewSyntaxTree, vfsProvide, viewAnalyzedCrates } from "./lspRequests";

export const registerVfsProvider = (client: lc.LanguageClient, ctx: Context) => {
const vfsProvider: vscode.TextDocumentContentProvider = {
Expand Down Expand Up @@ -94,3 +94,38 @@ export const registerViewAnalyzedCratesProvider = (client: lc.LanguageClient, ct
}),
);
};

export const registerViewSyntaxTreeProvider = (client: lc.LanguageClient, ctx: Context) => {
const uri = vscode.Uri.parse("cairo-view-syntax-tree://viewSyntaxTree/[SYNTAX_TREE].txt");
const eventEmitter = new vscode.EventEmitter<vscode.Uri>();

const tdcp: vscode.TextDocumentContentProvider = {
async provideTextDocumentContent(): Promise<string> {
const editor = vscode.window.activeTextEditor;
if (!editor) return "No file selected, please click on a file";
piotmag769 marked this conversation as resolved.
Show resolved Hide resolved

const syntaxTree = await client.sendRequest(viewSyntaxTree, {
uri: client.code2ProtocolConverter.asUri(editor.document.uri),
});

return syntaxTree ?? "Not available";
piotmag769 marked this conversation as resolved.
Show resolved Hide resolved
},
onDidChange: eventEmitter.event,
};

ctx.extension.subscriptions.push(
vscode.workspace.registerTextDocumentContentProvider("cairo-view-syntax-tree", tdcp),
);

ctx.extension.subscriptions.push(
vscode.commands.registerCommand("cairo.viewSyntaxTree", async () => {
const document = await vscode.workspace.openTextDocument(uri);

eventEmitter.fire(uri);

return vscode.window.showTextDocument(document, vscode.ViewColumn.Two, true);
}),
);

// TODO: re-request on file change
Draggu marked this conversation as resolved.
Show resolved Hide resolved
};
Loading