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.

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

Jump to bottom

onSignatureHelp stability fix #358

Merged
merged 2 commits into from
Mar 16, 2021
Merged

onSignatureHelp stability fix #358

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8791733
Support when previousToken is missing.
TwitchBronBron Mar 12, 2021
5829813
Merge branch 'master' into onSignatureHelp-safer-access
TwitchBronBron Mar 16, 2021
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
11 changes: 11 additions & 0 deletions src/Program.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import { EmptyStatement } from './parser/Statement';
import { expectZeroDiagnostics, trim, trimMap } from './testHelpers.spec';
import { doesNotThrow } from 'assert';
import { Logger } from './Logger';
import { createToken } from './astUtils';
import { TokenKind } from './lexer';

let sinon = sinonImport.createSandbox();
let tmpPath = s`${process.cwd()}/.tmp`;
Expand Down Expand Up @@ -1802,6 +1804,15 @@ describe('Program', () => {
});

describe('getSignatureHelp', () => {
it('does not crash when second previousToken is undefined', () => {
const file = program.addOrReplaceFile<BrsFile>('source/main.brs', ` `);
sinon.stub(file, 'getPreviousToken').returns(undefined);
//should not crash
expect(
file['getClassFromMReference'](util.createPosition(2, 3), createToken(TokenKind.Dot, '.'), null)
).to.be.undefined;
});

it('works with no leading whitespace when the cursor is after the open paren', () => {
program.addOrReplaceFile('source/main.brs', `sub main()\nsayHello()\nend sub\nsub sayHello(name)\nend sub`);
let signatureHelp = program.getSignatureHelp(
Expand Down
2 changes: 1 addition & 1 deletion src/files/BrsFile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ export class BrsFile {
if (previousToken?.kind === TokenKind.Dot) {
previousToken = this.getPreviousToken(previousToken);
}
if (previousToken.kind === TokenKind.Identifier && previousToken.text.toLowerCase() === 'm' && isClassMethodStatement(functionScope.func.functionStatement)) {
if (previousToken?.kind === TokenKind.Identifier && previousToken?.text.toLowerCase() === 'm' && isClassMethodStatement(functionScope.func.functionStatement)) {
return { item: this.parser.references.classStatements.find((cs) => util.rangeContains(cs.range, position)), file: this };
}
return undefined;
Expand Down