-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
#66116 Long switch expression is duplicated in InferTypesWorker_DoNot… #71412
Conversation
…_DoNotCallDirectly fixed
Due to the holidays, we likely won't be able to get to this for a couple of days/weeks. Thanks for your patience! |
@dotnet-policy-service agree
…On Mon, 25 Dec 2023 at 18:27, dotnet-policy-service[bot] < ***@***.***> wrote:
@vibeeshan025 <https://github.com/vibeeshan025> please read the following
Contributor License Agreement(CLA). If you agree with the CLA, please reply
with the following information.
@dotnet-policy-service agree [company="{your company}"]
Options:
- (default - no company specified) I have sole ownership of
intellectual property rights to my Submissions and I am not making
Submissions in the course of work for my employer.
@dotnet-policy-service agree
- (when company given) I am making Submissions in the course of work
for my employer (or my employer has intellectual property rights in my
Submissions by contract or applicable law). I have permission from my
employer to make Submissions and enter into this Agreement on behalf of my
employer. By signing below, the defined term “You” includes me and my
employer.
@dotnet-policy-service agree company="Microsoft"
Contributor License Agreement Contribution License Agreement
This Contribution License Agreement ( *“Agreement”* ) is agreed to by the
party signing below ( *“You”* ),
and conveys certain license rights to the .NET Foundation ( *“.NET
Foundation”* ) for Your contributions to
.NET Foundation open source projects. This Agreement is effective as of
the latest signature date below.
*1. Definitions.*
*“Code”* means the computer software code, whether in human-readable or
machine-executable form,
that is delivered by You to .NET Foundation under this Agreement.
*“Project”* means any of the projects owned or managed by .NET Foundation
and offered under a license
approved by the Open Source Initiative (www.opensource.org).
*“Submit”* is the act of uploading, submitting, transmitting, or
distributing code or other content to any
Project, including but not limited to communication on electronic mailing
lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of,
the Project for the purpose of
discussing and improving that Project, but excluding communication that is
conspicuously marked or
otherwise designated in writing by You as “Not a Submission.”
*“Submission”* means the Code and any other copyrightable material
Submitted by You, including any
associated comments and documentation.
*2. Your Submission.* You must agree to the terms of this Agreement
before making a Submission to any
Project. This Agreement covers any and all Submissions that You, now or in
the future (except as
described in Section 4 below), Submit to any Project.
*3. Originality of Work.* You represent that each of Your Submissions is
entirely Your
original work. Should You wish to Submit materials that are not Your
original work,
You may Submit them separately to the Project if You (a) retain all
copyright and
license information that was in the materials as you received them, (b) in
the
description accompanying your Submission, include the phrase "Submission
containing materials of a third party:" followed by the names of the third
party and any
licenses or other restrictions of which You are aware, and (c) follow any
other
instructions in the Project's written guidelines concerning Submissions.
*4. Your Employer.* References to “employer” in this Agreement include
Your employer or anyone else
for whom You are acting in making Your Submission, e.g. as a contractor,
vendor, or agent. If Your
Submission is made in the course of Your work for an employer or Your
employer has intellectual
property rights in Your Submission by contract or applicable law, You must
secure permission from Your
employer to make the Submission before signing this Agreement. In that
case, the term “You” in this
Agreement will refer to You and the employer collectively. If You change
employers in the future and
desire to Submit additional Submissions for the new employer, then You
agree to sign a new Agreement
and secure permission from the new employer before Submitting those
Submissions.
*5. Licenses.*
*a. Copyright License.* You grant .NET Foundation, and those who receive
the Submission directly
or indirectly from .NET Foundation, a perpetual, worldwide, non-exclusive,
royalty-free, irrevocable
license in the Submission to reproduce, prepare derivative works of,
publicly display, publicly perform,
and distribute the Submission and such derivative works, and to sublicense
any or all of the foregoing
rights to third parties.
*b. Patent License.* You grant .NET Foundation, and those who receive the
Submission directly or
indirectly from .NET Foundation, a perpetual, worldwide, non-exclusive,
royalty-free, irrevocable license
under Your patent claims that are necessarily infringed by the Submission
or the combination of the
Submission with the Project to which it was Submitted to make, have made,
use, offer to sell, sell and
import or otherwise dispose of the Submission alone or with the Project.
*c. Other Rights Reserved.* Each party reserves all rights not expressly
granted in this Agreement.
No additional licenses or rights whatsoever (including, without
limitation, any implied licenses) are
granted by implication, exhaustion, estoppel or otherwise.
*6. Representations and Warranties.* You represent that You are legally
entitled to grant the above
licenses. You represent that each of Your Submissions is entirely Your
original work (except as You may
have disclosed under Section 3 ). You represent that You have secured
permission from Your employer to
make the Submission in cases where Your Submission is made in the course
of Your work for Your
employer or Your employer has intellectual property rights in Your
Submission by contract or applicable
law. If You are signing this Agreement on behalf of Your employer, You
represent and warrant that You
have the necessary authority to bind the listed employer to the
obligations contained in this Agreement.
You are not expected to provide support for Your Submission, unless You
choose to do so. UNLESS
REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE
WARRANTIES
EXPRESSLY STATED IN SECTIONS 3, 4, AND 6 , THE SUBMISSION PROVIDED UNDER
THIS AGREEMENT IS
PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY
WARRANTY OF
NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
*7. Notice to .NET Foundation.* You agree to notify .NET Foundation in
writing of any facts or
circumstances of which You later become aware that would make Your
representations in this
Agreement inaccurate in any respect.
*8. Information about Submissions.* You agree that contributions to
Projects and information about
contributions may be maintained indefinitely and disclosed publicly,
including Your name and other
information that You submit with Your Submission.
*9. Governing Law/Jurisdiction.* This Agreement is governed by the laws
of the State of Washington, and
the parties consent to exclusive jurisdiction and venue in the federal
courts sitting in King County,
Washington, unless no federal subject matter jurisdiction exists, in which
case the parties consent to
exclusive jurisdiction and venue in the Superior Court of King County,
Washington. The parties waive all
defenses of lack of personal jurisdiction and forum non-conveniens.
*10. Entire Agreement/Assignment.* This Agreement is the entire agreement
between the parties, and
supersedes any and all prior agreements, understandings or communications,
written or oral, between
the parties relating to the subject matter hereof. This Agreement may be
assigned by .NET Foundation.
*.NET Foundation dedicates this Contribution License Agreement to the
public domain according to the Creative Commons CC0 1.*
—
Reply to this email directly, view it on GitHub
<#71412 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ACQ6AXKTKBF2Z4X2WRALPADYLHARZAVCNFSM6AAAAABBCRGOLOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNRZGA3TQMJRGQ>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
--
Best Regards,
Vibeeshan M
|
Fixed failing test cases |
@@ -395,6 +287,89 @@ private IEnumerable<TypeInferenceInfo> InferTypeInConstructorInitializer(Constru | |||
return InferTypeInArgument(index, methods, argument, parentInvocationExpressionToTypeInfer: null); | |||
} | |||
|
|||
private IEnumerable<TypeInferenceInfo> InferTypesWorkerFromParent(SyntaxNode parent, SyntaxToken? token = null, SyntaxNode node = null, ExpressionSyntax expression = null) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you make all the parameters non-optional plz.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
parent, node, expression, token
for the order please. thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, will make the change.
@@ -1684,35 +1659,28 @@ private IEnumerable<TypeInferenceInfo> InferTypeInMemberDeclarator(AnonymousObje | |||
return SpecializedCollections.EmptyEnumerable<TypeInferenceInfo>(); | |||
} | |||
|
|||
private IEnumerable<TypeInferenceInfo> InferTypeInNameColon(NameColonSyntax nameColon, SyntaxToken previousToken) | |||
private IEnumerable<TypeInferenceInfo> InferTypeInExpressionColon(ExpressionColonSyntax expressionColon, SyntaxToken? previousToken = null) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please don't use optional parameters.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, let me change them
@@ -1883,19 +1851,24 @@ private IEnumerable<TypeInferenceInfo> InferTypeInExpressionColon(ExpressionColo | |||
return null; | |||
} | |||
|
|||
private IEnumerable<TypeInferenceInfo> InferTypeInNameColon(NameColonSyntax nameColon) | |||
private IEnumerable<TypeInferenceInfo> InferTypeInNameColon(NameColonSyntax nameColon, SyntaxToken? previousToken = null) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no optional parameters.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, let me change them
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
protected override IEnumerable<TypeInferenceInfo> InferTypesWorker_DoNotCallDirectly(
SyntaxNode node)
{
var expression = node as ExpressionSyntax;
if (expression != null)
{
expression = expression.WalkUpParentheses();
node = expression;
}
var parent = node.Parent;
return InferTypesWorkerFromParent(parent, node, expression, node.GetFirstToken());
}
Am I allowed to use like in the last line node.GetFristToken()
as I believe a Node cannot be directly translated to a token.
Same as in other method I have to get the Node from token which is possible.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Am I allowed to use like in the last line node.GetFristToken() as I believe a Node cannot be directly translated to a token.
No. The apis are distinctly different. The token version is when we're inferring a type for a particular caret location (so the token represents what is immediately before the caret.
The node version is for when we're inferring what the type should be for an invalid node that we're generating a new symbol for. A toke should not be provided for this case.
Note: my feedback above was simply that the parameter not be optional. It can certainly be nullable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the explanation
LGTM with the removal of optional parameters. We prefer to avoid those in internal apis as it is both too easy to forget to pass something important, and it makes it unclear on the callsite what the semantics are. THanks! |
@CyrusNajmabadi All done. |
...esAndExtensions/Workspace/CSharp/LanguageServices/CSharpTypeInferenceService.TypeInferrer.cs
Outdated
Show resolved
Hide resolved
...esAndExtensions/Workspace/CSharp/LanguageServices/CSharpTypeInferenceService.TypeInferrer.cs
Outdated
Show resolved
Hide resolved
{ | ||
return parent switch | ||
{ | ||
// Path from SyntaxNode, node is never null |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if you're interested, you can remove #nullable disable
in another PR, and then fix all this up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i will work on this as another PR.
Thanks for the input.
thanks! |
Thanks! |
I'm getting these crashes now in the latest vs bits:
we may have to roll this back, unless you want to take a look and fix asap @vibeeshan025 |
Let me start working on this tomorrow |
looks like a null ref. likely one of the token.Value calls. the code is pretty unsafe in its current form. |
Let me work on the tomorrow. I believe I can finish it tomorrow. |
Thanks! |
Crash has made it into VS. Backporting the reversion as well. |
Revert "Merge pull request #71412 from vibeeshan025/main
Fixes #66116.
Both InferTypesWorker_DoNotCallDirectly Methods will call another common method called
InferTypesWorkerFromParent
.@microsoft-github-policy-service agree