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.

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

Add hover to namespace functions #606

Merged
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
4 changes: 3 additions & 1 deletion src/Scope.ts
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,9 @@ export class Scope {
let lowerName = name.toLowerCase();
let callables = this.getAllCallables();
for (let callable of callables) {
if (callable.callable.getName(ParseMode.BrighterScript).toLowerCase() === lowerName) {
const callableName = callable.callable.getName(ParseMode.BrighterScript);
// Split by `.` and check the last term to consider namespaces.
if (callableName.toLowerCase() === lowerName || callableName.split('.').pop()?.toLowerCase() === lowerName) {
return callable.callable;
}
}
Expand Down
75 changes: 75 additions & 0 deletions src/files/BrsFile.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1715,6 +1715,28 @@ describe('BrsFile', () => {
].join('\n'));
});

it('finds declared namespace function', () => {
let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
namespace mySpace
function Main(count = 1)
firstName = "bob"
age = 21
shoeSize = 10
end function
end namespace
`);

let hover = file.getHover(Position.create(2, 28));
expect(hover).to.exist;

expect(hover.range).to.eql(Range.create(2, 25, 2, 29));
expect(hover.contents).to.equal([
'```brightscript',
'function Main(count? as dynamic) as dynamic',
'```'
].join('\n'));
});

it('finds variable function hover in same scope', () => {
let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
sub Main()
Expand Down Expand Up @@ -1789,6 +1811,29 @@ describe('BrsFile', () => {
].join('\n'));
});

it('finds namespace function hover in file scope', () => {
let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
namespace mySpace
sub Main()
sayMyName()
end sub

sub sayMyName()

end sub
end namespace
`);

let hover = file.getHover(Position.create(3, 25));

expect(hover.range).to.eql(Range.create(3, 20, 3, 29));
expect(hover.contents).to.equal([
'```brightscript',
'sub sayMyName() as void',
'```'
].join('\n'));
});

it('finds function hover in scope', () => {
let rootDir = process.cwd();
program = new Program({
Expand Down Expand Up @@ -1818,6 +1863,36 @@ describe('BrsFile', () => {
].join('\n'));
});

it('finds namespace function hover in scope', () => {
let rootDir = process.cwd();
program = new Program({
rootDir: rootDir
});

let mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
sub Main()
mySpace.sayMyName()
end sub
`);

program.setFile({ src: `${rootDir}/source/lib.brs`, dest: 'source/lib.brs' }, `
namespace mySpace
sub sayMyName(name as string)
end sub
end namespace
`);

let hover = mainFile.getHover(Position.create(2, 34));
expect(hover).to.exist;

expect(hover.range).to.eql(Range.create(2, 28, 2, 37));
expect(hover.contents).to.equal([
'```brightscript',
'sub sayMyName(name as string) as void',
'```'
].join('\n'));
});

it('includes markdown comments in hover.', async () => {
let rootDir = process.cwd();
program = new Program({
Expand Down