Skip to content

Fix: Scalar template parameter scope conflict #1807

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
timotheeguerin merged 5 commits into from
Apr 11, 2023
Merged

Fix: Scalar template parameter scope conflict #1807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e5091d
Fix scalar template params scope
timotheeguerin Apr 10, 2023
f2216ec
Changelog
timotheeguerin Apr 10, 2023
2114e92
Fix test syntax
timotheeguerin Apr 10, 2023
e077f53
.
timotheeguerin Apr 10, 2023
966bbbc
Merge branch 'main' into fix/scalar-template-param-scope
timotheeguerin Apr 11, 2023
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
10 changes: 10 additions & 0 deletions common/changes/@typespec/compiler/fix-scalar-template-param-scope_2023-04-10-16-19.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@typespec/compiler",
"comment": "Fix: `scalar` template parameter name conflict with each other",
"type": "none"
}
],
"packageName": "@typespec/compiler"
}
1 change: 1 addition & 0 deletions packages/compiler/core/binder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@ export function createBinder(program: Program): Binder {
function hasScope(node: Node): node is ScopeNode {
switch (node.kind) {
case SyntaxKind.ModelStatement:
case SyntaxKind.ScalarStatement:
case SyntaxKind.AliasStatement:
case SyntaxKind.TypeSpecScript:
case SyntaxKind.InterfaceStatement:
Expand Down
14 changes: 14 additions & 0 deletions packages/compiler/test/checker/scalar.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,20 @@ describe("compiler: scalars", () => {
strictEqual(A.name, "A");
});

// https://github.com/microsoft/typespec/issues/1764
it("template parameter are scoped to the scalar", async () => {
const { A, B } = await runner.compile(`
@test @doc(T) scalar A<T extends string>;
@test @doc(T) scalar B<T extends string>;

alias AIns = A<"">;
alias BIns = B<"">;
`);

strictEqual(A.kind, "Scalar" as const);
strictEqual(B.kind, "Scalar" as const);
});

describe("custom scalars and default values", () => {
it("allows custom numeric scalar to have a default value", async () => {
const { S, M } = await runner.compile(`
Expand Down