Skip to content

Improve #1503 #1517

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.

Sign up for GitHub

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 2 commits into from
Mar 19, 2025
Merged

Improve #1503 #1517

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50a5b57
Improve #1503
isc-bsaviano Mar 18, 2025
76dfba6
npm run lint-fix
isc-bsaviano Mar 18, 2025
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
40 changes: 22 additions & 18 deletions src/providers/ObjectScriptCodeLensProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ const poundImportRegex = /^\s*#import\s+(.+)$/i;
const poundIncludeRegex = /^\s*#include\s+(\S+)\s*$/i;
const sqlSelectRegex = /^\s*#sqlcompile\s+select\s*=\s*(\S+)\s*$/i;
const commentRegex = /(?:^|(?:[^"]*"[^"]*")*)(\/\/|;|\/\*)/;
const rtnProcedureRegex = /^\(([^)]*)\)\s*(?:\[[^\]]*\])?\s*public/i;
const rtnIsDebuggableRegex = /^\(([^)]*)\)(?:(?:(?:\[[^\]]*\])?public{)|(?!private|methodimpl|{|\[]))/i;
const whitespaceAndCCommentsRegex = /\/\*[\s\S]*?\*\/|\s+/g;

/**
* Extract the text of the Embedded SQL query starting at `[startLine,StartChar]`.
Expand Down Expand Up @@ -335,13 +336,6 @@ export class ObjectScriptCodeLensProvider implements vscode.CodeLensProvider {
}

const displayName = quoteClassMemberName(symbol.name);
if (
!isPrivate &&
copyToClipboard &&
(type == "classmethod" || (type == "query" && displayName[0] != '"'))
) {
result.push(this.addCopyToClipboard(symbolLine, [`##class(${className}).${displayName}()`]));
}
if (
!isPrivate &&
debugThisMethod &&
Expand All @@ -356,6 +350,13 @@ export class ObjectScriptCodeLensProvider implements vscode.CodeLensProvider {
])
);
}
if (
!isPrivate &&
copyToClipboard &&
(type == "classmethod" || (type == "query" && displayName[0] != '"'))
) {
result.push(this.addCopyToClipboard(symbolLine, [`##class(${className}).${displayName}()`]));
}
}
}
});
Expand All @@ -366,24 +367,27 @@ export class ObjectScriptCodeLensProvider implements vscode.CodeLensProvider {
if (symbols && (debugThisMethod || copyToClipboard)) {
symbols.forEach((symbol) => {
const line = symbol.selectionRange.start.line;
const restOfLine = document.lineAt(line).text.slice(symbol.name.length);
const restOfSymbol = document.getText(symbol.range).slice(symbol.name.length);
let hasArgs = false,
isProc = false;
if (restOfLine[0] == "(") {
// Make sure this is a public procedure, and extract the argument list
const procMatch = restOfLine.match(rtnProcedureRegex);
if (procMatch) {
isProc = true;
hasArgs = procMatch[1].length > 0;
hasArgList = false;
if (restOfSymbol[0] == "(") {
const rtnDebuggableMatch = restOfSymbol
// Replace all whitespace and C-Style comments
.replace(whitespaceAndCCommentsRegex, "")
.match(rtnIsDebuggableRegex);
// Extract the argument list
if (rtnDebuggableMatch) {
hasArgList = true;
hasArgs = rtnDebuggableMatch[1].length > 0;
} else {
// This is not a syntactically valid public procedure
// This is not a syntactically valid public procedure or subroutine
return;
}
}
if (line == 1) labeledLine1 = true;
if (debugThisMethod) result.push(this.addDebugThisMethod(line, [`${symbol.name}^${routineName}`, hasArgs]));
if (copyToClipboard) {
result.push(this.addCopyToClipboard(line, [`${symbol.name}^${routineName}${isProc ? "()" : ""}`]));
result.push(this.addCopyToClipboard(line, [`${symbol.name}^${routineName}${hasArgList ? "()" : ""}`]));
}
});
}
Expand Down