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
7 changes: 6 additions & 1 deletion src/DiagnosticMessages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ export let DiagnosticMessages = {
severity: DiagnosticSeverity.Error
}),
detectedTooDeepFileSource: (numberOfParentDirectories: number) => ({
message: `Expected directory depth no larger than 7, but found ${numberOfParentDirectories}.`,
message: `Expected directory depth no larger than 7, but found ${numberOfParentDirectories}`,
code: 1134,
severity: DiagnosticSeverity.Error
}),
Expand All @@ -709,6 +709,11 @@ export let DiagnosticMessages = {
message: `${keyword} must be declared at the root level or within a namespace`,
code: 1136,
severity: DiagnosticSeverity.Error
}),
namespaceCannotBeReferencedDirectly: () => ({
message: `Namespace cannot be referenced directly`,
code: 1137,
severity: DiagnosticSeverity.Error
})
};

Expand Down
3 changes: 2 additions & 1 deletion src/Scope.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ describe('Scope', () => {
program.validate();
expectDiagnostics(program, [
DiagnosticMessages.variableMayNotHaveSameNameAsNamespace('namea'),
DiagnosticMessages.variableMayNotHaveSameNameAsNamespace('NAMEA')
DiagnosticMessages.variableMayNotHaveSameNameAsNamespace('NAMEA'),
DiagnosticMessages.namespaceCannotBeReferencedDirectly()
]);
});

Expand Down
16 changes: 12 additions & 4 deletions src/bscPlugin/validation/ScopeValidator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ export class ScopeValidator {
continue;
}
//catch unknown namespace items
const processedNames: string[] = [firstNamespacePart];
let entityName = firstNamespacePart;
let entityNameLower = firstNamespacePart.toLowerCase();
for (let i = 1; i < info.parts.length; i++) {
const part = info.parts[i];
processedNames.push(part.name.text);
const entityName = processedNames.join('.');
const entityNameLower = entityName.toLowerCase();
entityName += '.' + part.name.text;
entityNameLower += '.' + part.name.text.toLowerCase();

//if this is an enum member, stop validating here to prevent errors further down the chain
if (scope.getEnumMemberMap().has(entityNameLower)) {
Expand Down Expand Up @@ -153,6 +153,14 @@ export class ScopeValidator {
continue outer;
}
}
//if the full expression is a namespace path, this is an illegal statement because namespaces don't exist at runtme
if (scope.namespaceLookup.has(entityNameLower)) {
this.addMultiScopeDiagnostic({
...DiagnosticMessages.namespaceCannotBeReferencedDirectly(),
range: info.expression.range,
file: file
}, 'When used in scope');
}
}
}

Expand Down
31 changes: 31 additions & 0 deletions src/files/BrsFile.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,37 @@ describe('BrsFile', () => {
});
});

it('flags namespaces used as variables', () => {
program.setFile('source/main.bs', `
sub main()
alpha.beta.charlie.test()
print alpha
print alpha.beta
print alpha.beta.charlie
end sub

namespace alpha
namespace beta
namespace charlie
sub test()
end sub
end namespace
end namespace
end namespace
`);
program.validate();
expectDiagnostics(program, [{
...DiagnosticMessages.namespaceCannotBeReferencedDirectly(),
range: util.createRange(3, 22, 3, 27)
}, {
...DiagnosticMessages.namespaceCannotBeReferencedDirectly(),
range: util.createRange(4, 22, 4, 32)
}, {
...DiagnosticMessages.namespaceCannotBeReferencedDirectly(),
range: util.createRange(5, 22, 5, 40)
}]);
});

it('supports the third parameter in CreateObject', () => {
program.setFile('source/main.brs', `
sub main()
Expand Down