Add more using-alias-to-type tests #66889

CyrusNajmabadi · 2023-02-14T23:52:17Z

Fallout from test-plan review.

Relates to test plan #56323

CyrusNajmabadi · 2023-02-17T01:14:06Z

@jcouv this is ready for review.

CyrusNajmabadi · 2023-02-17T17:34:06Z

@cston @333fred ptal.

CyrusNajmabadi · 2023-02-17T17:34:35Z

...alyzers/CSharp/CodeFixes/MisplacedUsingDirectives/MisplacedUsingDirectivesCodeFixProvider.cs

-            var newType = await Simplifier.ExpandAsync(usingDirective.Type, document, cancellationToken: cancellationToken).ConfigureAwait(false);
-            return usingDirective.WithType(newType);
+            var newType = await Simplifier.ExpandAsync(usingDirective.NamespaceOrType, document, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return usingDirective.WithNamespaceOrType(newType);


fallout of API review meeting. We decided to rename 'Type' to 'NamespaceOrType' (to match INamespaceOrTypeSymbol)

src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs

CyrusNajmabadi · 2023-02-17T17:43:27Z

src/Compilers/CSharp/Test/Semantic/Semantics/UnsafeTests.cs

+}
+";
+            var comp = CreateCompilation(csharp, options: TestOptions.UnsafeDebugDll);
+            comp.VerifyDiagnostics();


test validates taht even though the using is unsafe, it binds to a normal safe type. So you should be able to use that alias at a site that itself is not marked unsafe without error.

CyrusNajmabadi · 2023-02-17T17:44:22Z

src/Features/CSharp/Portable/Completion/KeywordRecommenders/GlobalKeywordRecommender.cs

-                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
-                syntaxTree.IsAfterKeyword(position, SyntaxKind.RefKeyword, cancellationToken) ||
-                syntaxTree.IsAfterKeyword(position, SyntaxKind.ReadOnlyKeyword, cancellationToken) ||
-                syntaxTree.IsUsingAliasContext(position, cancellationToken);


these other cases are subsumed by IsTypeCOntext.

CyrusNajmabadi · 2023-02-17T17:48:06Z

src/Features/CSharp/Portable/EditAndContinue/SyntaxComparer.cs

-                    var leftUsing = (UsingStatementSyntax)leftNode;
-                    var rightUsing = (UsingStatementSyntax)rightNode;
-
-                    if (leftUsing.Declaration != null && rightUsing.Declaration != null)
                    {


view with whitespace off. This was just put in a block so that it and the next case section coudl both use leftUsing/rightUsing.

AlekseyTs · 2023-02-17T21:32:07Z

src/Compilers/CSharp/Portable/Syntax/SyntaxNormalizer.cs

-            if (token.IsKind(SyntaxKind.GreaterThanToken) && token.Parent.IsKind(SyntaxKind.FunctionPointerParameterList))
+            if (token.IsKind(SyntaxKind.GreaterThanToken) &&
+                token.Parent.IsKind(SyntaxKind.FunctionPointerParameterList) &&
+                token.Parent.Parent?.Parent is not UsingDirectiveSyntax)


token.Parent.Parent?.Parent

Is it enough to look only two levels up. What if the function pointer is nested deeper. For example, into an array type or into a type argument?

Then that won't matter as it won't be followed by the semicolon. e.g. delegate*<int,int>[]; will be a question about how >[ is normalized (which is a present issue, unrelated to my pr), and how ]; is normalized (which is covered by another test).

Then that won't matter as it won't be followed by the semicolon.

Where do we check for the fact? Specifically: "followed by the semicolon."

implied by: token.Parent.Parent?.Parent is not UsingDirectiveSyntax). we know (from line above) that token.Parent is FuncPointerParameterList, to token.Parent.Parent is FuncPointerSYntax. So if token.Parent.Parent.Parent is a UsingDirectiveSyntax, then the func-pointer showed up as the NamespaceOrType of that using directive. So, in that case, we do not want a whitespace separator between it and the next token (which would be the semicolon of the using directive).

So, in that case, we do not want a whitespace separator between it and the next token (which would be the semicolon of the using directive)

That is understood. The question however is why the same logic should not be applied to a case when we are in the "using" type, but not at the top level?

In other words, are there more scenarios that we are missing?

those scenarios would also arise for function-pointer prior to my PR/feature. So i view it as out of the scope of what this PR is trying to accomplish. IN other words, say there is an issue with an array of function pointers, where you get it as delegate*<int, int> [] instead of delegate*<int, int>[]. That issue would exist regardless of the type being in a using directive or not. It's possible there is some issue, but it doesn't seem related/relevant to the feature i'm doing, so it's not something i'm looking into improving.

src/Compilers/CSharp/Portable/Syntax/SyntaxNormalizer.cs

AlekseyTs

Compiler changes LGTM (commit 132). I didn't review tests.

AlekseyTs · 2023-02-21T18:59:04Z

@CyrusNajmabadi Please squash commits during merging

CyrusNajmabadi · 2023-02-21T19:01:41Z

@AlekseyTs will do.

CyrusNajmabadi · 2023-02-21T22:15:18Z

oh, @cston too

jcouv

Compiler changes look good (iteration 132), but if we don't think there's a circularity issue then we should remove the comment in BaseTypeAnalysis.

CyrusNajmabadi · 2023-02-21T22:25:36Z

but if we don't think there's a circularity issue then we should remove the comment in BaseTypeAnalysis.

Sure, i can do that.

jcouv

Compiler changes LGTM Thanks (iteration 133)

CyrusNajmabadi and others added 30 commits December 29, 2020 15:19

Add parsing of using aliases that point to types.

cdf67db

Update API surface.

7acfeba

Fix tests

ba290a2

Add parsing tests

4f970f5

Add binding support

538637f

Update IDE side.

b7adad3

Add semantic tests

b64aeac

Support functptr types

984bf0f

Disallow ref types

b492649

Merge remote-tracking branch 'upstream/main' into usingAliasType

523de61

Merge

28c54b4

Merge remote-tracking branch 'upstream/main' into usingAliasType

eb37ef3

Fix

dda5b30

Fix

a314010

move more cases to type

c67a9a1

Move error

aa49836

Add unsafe modifier

27c0fcd

Bind with unsafe

af583bb

No nullable reference types

e2a1d78

Update apis

f90faaa

Add apis

0185eac

Add api

e6a3b1f

Add api

bc8ba4d

Add api

313b69c

Fix

6aeac08

NRT

308acb0

NRT

288b7c9

NRT

0f12baa

Fix

6e7cee3

Move

f81f89f

Dynamic completion

17fd660

CyrusNajmabadi requested a review from jcouv February 17, 2023 01:20

CyrusNajmabadi added 4 commits February 16, 2023 17:33

Fixup

2babffb

Fix

210a06f

Fix

926ca86

Fix tests

b35b7fe

CyrusNajmabadi requested a review from cston February 17, 2023 17:33

CyrusNajmabadi commented Feb 17, 2023

View reviewed changes

src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberFieldSymbol.cs Show resolved Hide resolved

CyrusNajmabadi commented Feb 17, 2023

View reviewed changes

Add docs

83880eb

jcouv requested a review from AlekseyTs February 17, 2023 20:04

AlekseyTs reviewed Feb 17, 2023

View reviewed changes

src/Compilers/CSharp/Portable/Syntax/SyntaxNormalizer.cs Show resolved Hide resolved

AlekseyTs approved these changes Feb 21, 2023

View reviewed changes

jcouv reviewed Feb 21, 2023

View reviewed changes

Remove comment

89b9ac9

CyrusNajmabadi requested a review from jcouv February 22, 2023 01:24

jcouv approved these changes Feb 22, 2023

View reviewed changes

CyrusNajmabadi merged commit 1e66155 into dotnet:features/UsingAliasesTypes Feb 22, 2023

CyrusNajmabadi deleted the usingAliastests branch February 22, 2023 20:10

allisonchou mentioned this pull request Mar 9, 2023

[Automated] PRs inserted in VS build main-33509.191 #67248

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add more using-alias-to-type tests #66889

Add more using-alias-to-type tests #66889

CyrusNajmabadi commented Feb 14, 2023 •

edited by jcouv

Loading

CyrusNajmabadi commented Feb 17, 2023

CyrusNajmabadi commented Feb 17, 2023

CyrusNajmabadi Feb 17, 2023

CyrusNajmabadi Feb 17, 2023

CyrusNajmabadi Feb 17, 2023

CyrusNajmabadi Feb 17, 2023

AlekseyTs Feb 17, 2023

CyrusNajmabadi Feb 17, 2023

AlekseyTs Feb 17, 2023

CyrusNajmabadi Feb 17, 2023

AlekseyTs Feb 17, 2023 •

edited

Loading

AlekseyTs Feb 17, 2023

CyrusNajmabadi Feb 18, 2023

AlekseyTs left a comment

AlekseyTs commented Feb 21, 2023

CyrusNajmabadi commented Feb 21, 2023 •

edited

Loading

CyrusNajmabadi commented Feb 21, 2023

jcouv left a comment •

edited

Loading

CyrusNajmabadi commented Feb 21, 2023

jcouv left a comment

Add more using-alias-to-type tests #66889

Add more using-alias-to-type tests #66889

Conversation

CyrusNajmabadi commented Feb 14, 2023 • edited by jcouv Loading

CyrusNajmabadi commented Feb 17, 2023

CyrusNajmabadi commented Feb 17, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AlekseyTs Feb 17, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AlekseyTs left a comment

Choose a reason for hiding this comment

AlekseyTs commented Feb 21, 2023

CyrusNajmabadi commented Feb 21, 2023 • edited Loading

CyrusNajmabadi commented Feb 21, 2023

jcouv left a comment • edited Loading

Choose a reason for hiding this comment

CyrusNajmabadi commented Feb 21, 2023

jcouv left a comment

Choose a reason for hiding this comment

CyrusNajmabadi commented Feb 14, 2023 •

edited by jcouv

Loading

AlekseyTs Feb 17, 2023 •

edited

Loading

CyrusNajmabadi commented Feb 21, 2023 •

edited

Loading

jcouv left a comment •

edited

Loading