Skip to content
Merged
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- Enable cross-workspace Go to Definition via `objectscript.export.searchOtherWorkspaceFolders` (prefer local files across sibling workspace folders). (#4)
- Add ObjectScript enter rules for semicolon (`;`) continuation on line break. (#5)
- Auto-indent dot syntax on Enter for `objectscript`/`objectscript-int` (replicates leading dots). (#6)
- Added `resolveContextExpression` command: posts current line/routine to API, inserts returned code on success, shows error otherwise. (#7)

## [3.0.6] 09-Sep-2025

Expand Down
11 changes: 11 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,11 @@
"command": "vscode-objectscript.export",
"title": "Export Code from Server"
},
{
"category": "ObjectScript",
"command": "vscode-objectscript.resolveContextExpression",
"title": "Resolve Context Expression"
},
{
"category": "ObjectScript",
"command": "vscode-objectscript.compile",
Expand Down Expand Up @@ -1209,6 +1214,12 @@
"mac": "Cmd+Shift+F7",
"when": "editorLangId =~ /^objectscript/"
},
{
"command": "vscode-objectscript.resolveContextExpression",
"key": "Ctrl+Alt+Space",
"mac": "Cmd+Alt+Space",
"when": "editorTextFocus && editorLangId =~ /^objectscript/"
},
{
"command": "vscode-objectscript.viewOthers",
"key": "Ctrl+Shift+V",
Expand Down
87 changes: 87 additions & 0 deletions src/commands/contextHelp.ts
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;

Comment on lines +31 to +34

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 routine with path.basename(document.fileName), so any package/class directory information (e.g. MyApp/Utils/Helper.cls) is reduced to just Helper.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 👍 / 👎.

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.");
}
}
5 changes: 5 additions & 0 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ import {
import { WorkspaceNode, NodeBase } from "./explorer/nodes";
import { showPlanWebview } from "./commands/showPlanPanel";
import { isfsConfig } from "./utils/FileProviderUtil";
import { resolveContextExpression } from "./commands/contextHelp";

const packageJson = vscode.extensions.getExtension(extensionId).packageJSON;
const extensionVersion = packageJson.version;
Expand Down Expand Up @@ -1256,6 +1257,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
sendCommandTelemetryEvent("copyToClipboard");
vscode.env.clipboard.writeText(command);
}),
vscode.commands.registerCommand("vscode-objectscript.resolveContextExpression", () => {
sendCommandTelemetryEvent("resolveContextExpression");
void resolveContextExpression();
}),
vscode.commands.registerCommand("vscode-objectscript.debug", (program: string, askArgs: boolean) => {
sendCommandTelemetryEvent("debug");
const startDebugging = (args) => {
Expand Down