forked from intersystems-community/vscode-objectscript
-
Notifications
You must be signed in to change notification settings - Fork 0
Added resolveContextExpression command: posts current line/routine to API, inserts returned code on success, shows error otherwise.
#7
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| import axios from "axios"; | ||
| import * as https from "https"; | ||
| import * as path from "path"; | ||
| import * as vscode from "vscode"; | ||
|
|
||
| import { AtelierAPI } from "../api"; | ||
| import { handleError } from "../utils"; | ||
|
|
||
| interface ResolveContextExpressionResponse { | ||
| status?: string; | ||
| textExpression?: string; | ||
| message?: string; | ||
| } | ||
|
|
||
| export async function resolveContextExpression(): Promise<void> { | ||
| const editor = vscode.window.activeTextEditor; | ||
| if (!editor) { | ||
| return; | ||
| } | ||
|
|
||
| const { document, selection } = editor; | ||
| const contextExpression = selection.isEmpty | ||
| ? document.lineAt(selection.active.line).text.trim() | ||
| : document.getText(selection).trim(); | ||
|
|
||
| if (!contextExpression) { | ||
| void vscode.window.showErrorMessage("Context expression is empty."); | ||
| return; | ||
| } | ||
|
|
||
| const routine = path.basename(document.fileName); | ||
| const api = new AtelierAPI(document.uri); | ||
| const { host, port, username, password, https: useHttps, pathPrefix } = api.config; | ||
|
|
||
| if (!host || !port) { | ||
| void vscode.window.showErrorMessage("No active InterSystems server connection for this file."); | ||
| return; | ||
| } | ||
|
|
||
| const normalizedPrefix = pathPrefix ? (pathPrefix.startsWith("/") ? pathPrefix : `/${pathPrefix}`) : ""; | ||
|
|
||
| const baseUrl = `${useHttps ? "https" : "http"}://${host}:${port}${encodeURI(normalizedPrefix)}`; | ||
| const url = `${baseUrl}/api/sourcecontrol/vscode/resolveContextExpression`; | ||
|
|
||
| const httpsAgent = new https.Agent({ | ||
| rejectUnauthorized: vscode.workspace.getConfiguration("http").get("proxyStrictSSL"), | ||
| }); | ||
|
|
||
| try { | ||
| const response = await axios.post<ResolveContextExpressionResponse>( | ||
| url, | ||
| { | ||
| routine, | ||
| contextExpression, | ||
| }, | ||
| { | ||
| headers: { | ||
| "Content-Type": "application/json", | ||
| }, | ||
| auth: | ||
| typeof username === "string" && typeof password === "string" | ||
| ? { | ||
| username, | ||
| password, | ||
| } | ||
| : undefined, | ||
| httpsAgent, | ||
| } | ||
| ); | ||
|
|
||
| const data = response.data ?? {}; | ||
| if (typeof data.status === "string" && data.status.toLowerCase() === "success" && data.textExpression) { | ||
| const eol = document.eol === vscode.EndOfLine.CRLF ? "\r\n" : "\n"; | ||
| const textExpression = data.textExpression.replace(/\r?\n/g, eol); | ||
| const formattedTextExpression = textExpression.replace(/^/, "\t"); | ||
| const lineRange = document.lineAt(selection.active.line).range; | ||
| await editor.edit((editBuilder) => { | ||
| editBuilder.replace(lineRange, formattedTextExpression); | ||
| }); | ||
| } else { | ||
| const errorMessage = data.message || "Failed to resolve context expression."; | ||
| void vscode.window.showErrorMessage(errorMessage); | ||
| } | ||
| } catch (error) { | ||
| handleError(error, "Failed to resolve context expression."); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[P1] Send fully qualified routine name to context resolver
The payload builds
routinewithpath.basename(document.fileName), so any package/class directory information (e.g.MyApp/Utils/Helper.cls) is reduced to justHelper.cls. The backend needs the fully qualified routine/class name to locate the source when resolving the expression, so the command will fail for the majority of ObjectScript files that live inside packages and always show an error. Derive the routine name the same way other commands do (convert the relative path to dotted class/routine name or reuse existing helpers) before calling the API.Useful? React with 👍 / 👎.