Skip to content

fixes signature help resolution for callexpressions #707

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
TwitchBronBron merged 13 commits into from
Oct 7, 2022
Merged

fixes signature help resolution for callexpressions #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e632bb5
fixes signature help resolution for callexpressions
georgejecook Oct 1, 2022
bb967b6
Merge branch 'master' into goto-definition/improvements
georgejecook Oct 2, 2022
7582430
minor fixes
georgejecook Oct 2, 2022
b6aaca1
Merge branch 'goto-definition/improvements' of github.com:rokucommuni…
georgejecook Oct 2, 2022
0a9da30
Merge branch 'master' into goto-definition/improvements
georgejecook Oct 3, 2022
84726f1
refactor tests
TwitchBronBron Oct 6, 2022
22c3b52
addresses comments by TwitchBronBron
georgejecook Oct 6, 2022
74ec270
Merge branch 'goto-definition/improvements' of github.com:rokucommuni…
georgejecook Oct 6, 2022
116f8ea
fixes broken test
georgejecook Oct 6, 2022
854cef7
Merge branch 'master' into goto-definition/improvements
TwitchBronBron Oct 7, 2022
d132710
fix merge issues
TwitchBronBron Oct 7, 2022
ac45704
fix bad merge
TwitchBronBron Oct 7, 2022
5ba8f17
fix lint issues
TwitchBronBron Oct 7, 2022
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,006 changes: 606 additions & 400 deletions src/Program.spec.ts
View file
Open in desktop

Large diffs are not rendered by default.

238 changes: 7 additions & 231 deletions src/Program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ import { globalFile } from './globalCallables';
import { parseManifest } from './preprocessor/Manifest';
import { URI } from 'vscode-uri';
import PluginInterface from './PluginInterface';
import { isBrsFile, isXmlFile, isMethodStatement, isXmlScope, isNamespaceStatement } from './astUtils/reflection';
import { isBrsFile, isXmlFile, isXmlScope, isNamespaceStatement } from './astUtils/reflection';
import type { FunctionStatement, NamespaceStatement } from './parser/Statement';
import { ParseMode } from './parser/Parser';
import { TokenKind } from './lexer/TokenKind';
import { BscPlugin } from './bscPlugin/BscPlugin';
import { AstEditor } from './astUtils/AstEditor';
import type { SourceMapGenerator } from 'source-map';
import { rokuDeploy } from 'roku-deploy';
import type { Statement } from './parser/AstNode';
import { CallExpressionInfo } from './bscPlugin/CallExpressionInfo';
import { SignatureHelpUtil } from './bscPlugin/SignatureHelpUtil';

const startOfSourcePkgPath = `source${path.sep}`;
const bslibNonAliasedRokuModulesPkgPath = s`source/roku_modules/rokucommunity_bslib/bslib.brs`;
Expand All @@ -54,13 +54,6 @@ export interface SignatureInfoObj {
signature: SignatureInformation;
}

interface PartialStatementInfo {
commaCount: number;
statementType: string;
name: string;
dotPart: string;
}

export class Program {
constructor(
/**
Expand Down Expand Up @@ -843,7 +836,7 @@ export class Program {

for (const statement of [...file.parser.references.functionStatements, ...file.parser.references.classStatements.flatMap((cs) => cs.methods)]) {
let parentNamespaceName = statement.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(originFile.parseMode)?.toLowerCase();
if (statement.name.text.toLowerCase() === lowerName && (!parentNamespaceName || parentNamespaceName === lowerNamespaceName)) {
if (statement.name.text.toLowerCase() === lowerName && (!lowerNamespaceName || parentNamespaceName === lowerNamespaceName)) {
if (!results.has(statement)) {
results.set(statement, { item: statement, file: file });
}
Expand Down Expand Up @@ -1032,225 +1025,9 @@ export class Program {
if (!file || !isBrsFile(file)) {
return [];
}

const results = new Map<string, SignatureInfoObj>();

let functionScope = file.getFunctionScopeAtPosition(position);
let identifierInfo = this.getPartialStatementInfo(file, position);
if (identifierInfo.statementType === '') {
// just general function calls
let statements = file.program.getStatementsByName(identifierInfo.name, file);
for (let statement of statements) {
//TODO better handling of collisions - if it's a namespace, then don't show any other overrides
//if we're on m - then limit scope to the current class, if present
let sigHelp = statement.file.getSignatureHelpForStatement(statement.item);
if (sigHelp && !results.has[sigHelp.key]) {
sigHelp.index = identifierInfo.commaCount;
results.set(sigHelp.key, sigHelp);
}
}
} else if (identifierInfo.statementType === '.') {
//if m class reference.. then
//only get statements from the class I am in..
if (functionScope) {
let myClass = file.getClassFromMReference(position, file.getTokenAt(position), functionScope);
if (myClass) {
for (let scope of this.getScopesForFile(myClass.file)) {
let classes = scope.getClassHierarchy(myClass.item.getName(ParseMode.BrighterScript).toLowerCase());
//and anything from any class in scope to a non m class
for (let statement of [...classes].filter((i) => isMethodStatement(i.item))) {
let sigHelp = statement.file.getSignatureHelpForStatement(statement.item);
if (sigHelp && !results.has[sigHelp.key]) {

results.set(sigHelp.key, sigHelp);
return;
}
}
}
}
}

if (identifierInfo.dotPart) {
//potential namespaces
let statements = file.program.getStatementsByName(identifierInfo.name, file, identifierInfo.dotPart);
if (statements.length === 0) {
//was not a namespaced function, it could be any method on any class now
statements = file.program.getStatementsByName(identifierInfo.name, file);
}
for (let statement of statements) {
//TODO better handling of collisions - if it's a namespace, then don't show any other overrides
//if we're on m - then limit scope to the current class, if present
let sigHelp = statement.file.getSignatureHelpForStatement(statement.item);
if (sigHelp && !results.has[sigHelp.key]) {
sigHelp.index = identifierInfo.commaCount;
results.set(sigHelp.key, sigHelp);
}
}
}


} else if (identifierInfo.statementType === '@.') {
for (const scope of this.getScopes().filter((s) => isXmlScope(s))) {
let fileLinks = this.getStatementsForXmlFile(scope as XmlScope, identifierInfo.name);
for (let fileLink of fileLinks) {

let sigHelp = fileLink.file.getSignatureHelpForStatement(fileLink.item);
if (sigHelp && !results.has[sigHelp.key]) {
sigHelp.index = identifierInfo.commaCount;
results.set(sigHelp.key, sigHelp);
}
}
}
} else if (identifierInfo.statementType === 'new') {
let classItem = file.getClassFileLink(identifierInfo.dotPart ? `${identifierInfo.dotPart}.${identifierInfo.name}` : identifierInfo.name);
let sigHelp = classItem?.file?.getClassSignatureHelp(classItem?.item);
if (sigHelp && !results.has(sigHelp.key)) {
sigHelp.index = identifierInfo.commaCount;
results.set(sigHelp.key, sigHelp);
}
}

return [...results.values()];
}

private getPartialStatementInfo(file: BrsFile, position: Position): PartialStatementInfo {
let lines = util.splitIntoLines(file.fileContents);
let line = lines[position.line];
let index = position.character;
let itemCounts = this.getPartialItemCounts(line, index);
if (!itemCounts.isArgStartFound && line.charAt(index) === ')') {
//try previous char, in case we were on a close bracket..
index--;
itemCounts = this.getPartialItemCounts(line, index);
}
let argStartIndex = itemCounts.argStartIndex;
index = itemCounts.argStartIndex - 1;
let statementType = '';
let name;
let dotPart;

if (!itemCounts.isArgStartFound) {
//try to get sig help based on the name
index = position.character;
let currentToken = file.getTokenAt(position);
if (currentToken && currentToken.kind !== TokenKind.Comment) {
name = file.getPartialVariableName(currentToken, [TokenKind.New]);
if (!name) {
//try the previous token, incase we're on a bracket
currentToken = file.getPreviousToken(currentToken);
name = file.getPartialVariableName(currentToken, [TokenKind.New]);
}
if (name?.indexOf('.')) {
let parts = name.split('.');
name = parts[parts.length - 1];
}

index = currentToken.range.start.character;
argStartIndex = index;
} else {
// invalid location
index = 0;
itemCounts.comma = 0;
}
}
//this loop is quirky. walk to -1 (which will result in the last char being '' thus satisfying the situation where there is no leading whitespace).
while (index >= -1) {
if (!(/[a-z0-9_\.\@]/i).test(line.charAt(index))) {
if (!name) {
name = line.substring(index + 1, argStartIndex);
} else {
dotPart = line.substring(index + 1, argStartIndex);
if (dotPart.endsWith('.')) {
dotPart = dotPart.substr(0, dotPart.length - 1);
}
}
break;
}
if (line.substr(index - 2, 2) === '@.') {
statementType = '@.';
name = name || line.substring(index, argStartIndex);
break;
} else if (line.charAt(index - 1) === '.' && statementType === '') {
statementType = '.';
name = name || line.substring(index, argStartIndex);
argStartIndex = index;
}
index--;
}

if (line.substring(0, index).trim().endsWith('new')) {
statementType = 'new';
}

return {
commaCount: itemCounts.comma,
statementType: statementType,
name: name,
dotPart: dotPart
};
}

private getPartialItemCounts(line: string, index: number) {
let isArgStartFound = false;
let itemCounts = {
normal: 0,
square: 0,
curly: 0,
comma: 0,
endIndex: 0,
argStartIndex: index,
isArgStartFound: false
};
while (index >= 0) {
const currentChar = line.charAt(index);

if (currentChar === '\'') { //found comment, invalid index
itemCounts.isArgStartFound = false;
break;
}

if (isArgStartFound) {
if (currentChar !== ' ') {
break;
}
} else {
if (currentChar === ')') {
itemCounts.normal++;
}

if (currentChar === ']') {
itemCounts.square++;
}

if (currentChar === '}') {
itemCounts.curly++;
}

if (currentChar === ',' && itemCounts.normal <= 0 && itemCounts.curly <= 0 && itemCounts.square <= 0) {
itemCounts.comma++;
}

if (currentChar === '(') {
if (itemCounts.normal === 0) {
itemCounts.isArgStartFound = true;
itemCounts.argStartIndex = index;
} else {
itemCounts.normal--;
}
}

if (currentChar === '[') {
itemCounts.square--;
}

if (currentChar === '{') {
itemCounts.curly--;
}
}
index--;
}
return itemCounts;

let callExpressionInfo = new CallExpressionInfo(file, position);
let signatureHelpUtil = new SignatureHelpUtil();
return signatureHelpUtil.getSignatureHelpItems(callExpressionInfo);
}

public getReferences(srcPath: string, position: Position) {
Expand All @@ -1267,7 +1044,6 @@ export class Program {
* Get a list of all script imports, relative to the specified pkgPath
* @param sourcePkgPath - the pkgPath of the source that wants to resolve script imports.
*/

public getScriptImportCompletions(sourcePkgPath: string, scriptImport: FileReference) {
let lowerSourcePkgPath = sourcePkgPath.toLowerCase();

Expand Down
Loading