Parse unchecked gracefully in operators
#61309
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
FYI @AlekseyTs |
AlekseyTs
approved these changes
May 14, 2022
|
@dotnet/roslyn-compiler for a second review. Thanks |
1 similar comment
|
@dotnet/roslyn-compiler for a second review. Thanks |
333fred
reviewed
May 18, 2022
| @@ -3510,14 +3510,27 @@ ExplicitInterfaceSpecifierSyntax tryParseExplicitInterfaceSpecifier() | |||
| } | |||
| } | |||
|
|
|||
| private SyntaxToken TryEatCheckedOrHandleUnchecked(ref SyntaxToken operatorKeyword) | |||
| { | |||
| if (CurrentToken.Kind == SyntaxKind.UncheckedKeyword) | |||
There was a problem hiding this comment.
@CyrusNajmabadi, is this an example of an error you'd prefer to see done in binding, or is parsing ok for a misplaced token error?
There was a problem hiding this comment.
Or maybe we can use the existing ERR_SyntaxError error?
There was a problem hiding this comment.
Unfortunately, this needs to be in the parser in the current form. The reason for that is that the syntax model itself is restrictive here. e.g. it requires a SyntaxToken CheckedKeyword. As such, we cannot fit the user code into the syntax model, and we have to make a correction at the parsing level, which means having a diagnostic at the parser level.
My overall preference (if we had time/motivation) would be to relax the syntax model so that both of checked/unchecked were legal from the model's perspective, and then have it be the binder that checks and states taht 'unchecked' is not actually allowed semantically.
But this is also not a big deal for me (given how rare these will be) so keeping the status quo (and taking this PR) seems totally reasonable to me.
There was a problem hiding this comment.
I tried relaxing the syntax model to allow either checked or unchecked keywords, but ran into an unfortunate issue with public APIs...
The syntax.xml change updates the API OperatorMemberCref(SyntaxToken operatorToken, CrefParameterListSyntax? parameters) to OperatorMemberCrefSyntax OperatorMemberCref(SyntaxToken checkedKeyword, SyntaxToken operatorToken, CrefParameterListSyntax? parameters).
But that conflicts with existing manually defined public API: OperatorMemberCref(SyntaxToken operatorKeyword, SyntaxToken operatorToken, CrefParameterListSyntax? parameters).
@333fred Given that, I think we should keep the parser-level handling.
There was a problem hiding this comment.
Yeah, we could likely only do this if we haven't publicly shipped the 'checked operator' work yet. if it isn't shipped, then we can revise. otehrwise, we're locked in.
There was a problem hiding this comment.
The checked operator feature is still in preview. But the public API that is causing a conflict predates that (doesn't involved checked at all). So I think we're stuck.
333fred
approved these changes
May 18, 2022
ghost
added this to the 
333fred
added a commit
that referenced
this pull request
May 23, 2022
…ures/required-members * upstream/main: (73 commits) Allow source link, embedded or decompiled source in Peek Definition (#61427) More instrumentation for ReferenceCachingCS (#61402) Fix build Fix binding for checkbox text in rename dialogs (#61430) Address feedback from numeric IntPtr feature review (#61418) [LSP] Small cleanup for pull diagnostics logging (#61417) Avoid logging work when no logger is specified Wait for async operations to complete before proceeding Fix function id (#61400) More correctly respect background analysis scope (#61392) Add new collapsing option for metadata files that contain source (#61205) Fix typo (#61380) Use AspNetCoreKey to external access assembly Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs Parse `unchecked` gracefully in operators (#61309) Add lambda parameters in scope in nameof using proper binder (#61382) Verify classification on var pattern (#61376) Verifying interpolation escaping of curlies in content (#61387) Fix ...
333fred
added a commit
to 333fred/roslyn
that referenced
this pull request
May 23, 2022
…o prototypes * upstream/features/required-members: (73 commits) Allow source link, embedded or decompiled source in Peek Definition (dotnet#61427) More instrumentation for ReferenceCachingCS (dotnet#61402) Fix build Fix binding for checkbox text in rename dialogs (dotnet#61430) Address feedback from numeric IntPtr feature review (dotnet#61418) [LSP] Small cleanup for pull diagnostics logging (dotnet#61417) Avoid logging work when no logger is specified Wait for async operations to complete before proceeding Fix function id (dotnet#61400) More correctly respect background analysis scope (dotnet#61392) Add new collapsing option for metadata files that contain source (dotnet#61205) Fix typo (dotnet#61380) Use AspNetCoreKey to external access assembly Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs Parse `unchecked` gracefully in operators (dotnet#61309) Add lambda parameters in scope in nameof using proper binder (dotnet#61382) Verify classification on var pattern (dotnet#61376) Verifying interpolation escaping of curlies in content (dotnet#61387) Fix ...
Cosifne
added a commit
that referenced
this pull request
Jun 1, 2022
* Avoid caching RelativeIndentationData.effectiveBaseToken * Relax assertion in SyntheticBoundNodeFactory.Convert (#61287) * Add missing node state transition It's valid for an input to be modified causing a downstream input to be removed (for example a syntax tree can change what is in it, leading to the downstream node not generating something). //cc @jkoritzinsky in case I'm missing something obvious. * Simplify logic, more tests, rework tests * Fix several LSP completion kind mappings (#61243) * Fix several LSP completion kind mappings * Extension method * Fix issue where we were getting a raw-string in a skipped token, causing a crash * Add test * Add an UWP OptProf test for IDE * Disable smart copy/paste when line-copy is involved. * Update src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteCommandHandler.cs * Add additional sanity check * Fix * Add pointer for `AnalysisLevel` to warning waves doc (#61196) * Remove parameter null-checking from the Language Feature Status list (#61302) * Switch to GetRequiredService * Simpler approach * [EE] Implement IDkmClrFullNameProvider2 in Roslyn's ResultProvider Formatter. (#60522) * Implement IDkmClrFullNameProvider2 in Roslyn's ResultProvider Formatter. Issue: - Debugger added IDkmClrFullNameProvider2 API with https://devdiv.visualstudio.com/DevDiv/_git/Concord/pullrequest/301518 - It is currently temporarily implement in Concord, needs to be implemented in Roslyn so implementation can be removed from Concord. Changes: 1. Formatter: - Implement IDkmClrFullNameProvider2. It has 2 methods, one to format local names and the other given field metadata. - Currently only implemented for C#. I'm not that familiar with VB and the GeneratedNames stuff in VB needs some splitting and moving around to get working. 2. Unit tests: - Add unit tests for the common cases of hoisted locals, synthesized locals, etc. 3. Versions.props: Update MicrosoftVSSDKVSDConfigToolVersion to a newer version which recognizes IDkmClrFullNameProvider2. * PR feedback - fix casing of MetadataImport * PR feedback - move GetOriginalLocalVariableName, GetOriginalFieldName back to CSharpFormatter Co-authored-by: Ramkumar Ramesh <ramram@microsoft.com> * PR feedback * Fix and/or completion after parenthesized pattern * [LSP] Disable GoToDef/GoToImpl integration tests (#61190) * Added syntax context flag * Keywords c# * Keep leadin trivia inside Main method if it is more likely to be a statement comment rather than a file header when converting to 'Program.Main' style program * Symbols * Snippets C# * Remove set accessor of new SyntaxContext property * Remove PROTOTYPE comments (#61322) * Added assertions, comments, and refactored for clarity * Change VB language version Roslyn.sln uses to "latest" (#61313) To allow us to use the latest VB features, such as setting init-only properties. * PR feedback * Remove document options provider (#61228) * Remove IDocumentOptionsProvider * Fold DocumentSpecificOptionSet into DocumentOptionSet * Use an explicit option to control frozen-partial semantics in inheritance margin * Break into separate methods * Fix null ref (#61342) * Simplify internal types search * Removed unintentional WorkItem's * Make static * PR feedback * [LSP] Support LSP services associated with LSP server instances (with lifetimes that match). (#61266) * Add support for exporting services that are created for each server instance. * Use the correct span to rename after invoking extract-method manually. * Move Spellcheck capabilities to be activated in all scenarios (#61366) * move spellcheck capability to always activated server * Rename type * rename fields * [LSP] Add JSON semantic token classifications (#61231) * Make async * Test fallout * Unify nint and IntPtr (#60913) * restore file * Minor simplification to rename code * Remaining fallback options (#60888) * Add missing fallbacks * Fallback options from ILegacyGlobalOptionsWorkspaceService * Pass options to CodeCleaner APIs. * Fallback options from ILegacyGlobalOptionsWorkspaceService 2 * Fallback in tests * CodeModel * Remove CodeActionOptions.Default * Remove dependency on IGlobalOptionService from inline hints service * Remove obsolete VS UnitTesting APIs. * Remote dependency on IGlobalOption service from RemoteProcessTelemetryService * Remove ExportGlobalOptionProviderAttribute * Remove PythiaOptions * Remove DiagnosticOptions from solution snapshot * Access options via AnalyzerOptionsProvider * Split ISyntaxFormatting.cs * Simplify initializers * Fix * Move AddImportPlacementOptions to a separate file in compiler extensions * Move option providers to workspace extensions * Move CodeCleanupOptions and IdeAnalyzerOptions to workspace extensions * Layering * Replace legacy GetOptions with AnalyzerOptionsProvider; add missing options * Parameter rename, comment * Add LineFormattingOptionsProviders * CodeFixOptionsProvider, include CodeStyleOptions in CodeActionOptions, include LineFormattingOptions in ExtractMethodGenerationOptions * DocumentFormattingOptions * Move a couple of options from IdeCodeStyle to SyntaxFormatting to make them available to new document formatter * Generalize using placement option in AddImportPlacementOptions * Move PreferParameterNullChecking and AllowEmbeddedStatementsOnSameLine to CSharpSimplifierOptions * Move CodeGen options to compiler extensions * UseExpressionBody * Eliminate more calls to Document.GetOptionsAsync * Cleanup DocumentationCommentOptions * Line formatting options * DefaultConditionalExpressionWrappingLength * insert_final_newline * Add PreferThrowExpression to simplifier options * Add AddNullChecksToConstructorsGeneratedFromMembers to CodeGenOptions * GenerateEqualsAndGetHashCodeFromMembersOptions * IImplementInterfaceService * AddParameterCheckCodeRefactoringProvider * ReplaceMethodWithPropertyService * NamingStylePreferences * Eliminate legacy option helpers * Fix up ExtractMethod options * Remove SyntaxFormattingOptions ctors * Replace extra helpers with CodeFixOptionsProvider * PreferUtf8StringLiterals * RazorLineFormattingOptionsStorage * Remove usage of Document.GetOptionsAsync - 1 * Remove internal usage of DocumentOptionSet and Document.GetOptionsAsync * Simplify and unify option definition patterns * Fixes and pattern unification * Serialization and equality * Simplify * Rename * Fixes * CompletionOption fixes * Feedback * Single switch * Add frozen delegate tests * Add extract method test * Add workitem * Fix * Add support for CompilerFeatureRequiredAttribute (#61113) Adds support for decoding and reporting errors when `CompilerFeatureRequiredAttribute` is encountered on metadata type symbols. We also block applying the attribute by hand in both C# and VB. * Delegate keyword tests * Verifying interpolation escaping of curlies in content (#61387) * Verify classification on var pattern (#61376) * Add lambda parameters in scope in nameof using proper binder (#61382) * Parse `unchecked` gracefully in operators (#61309) * Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs * Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs * Use AspNetCoreKey to external access assembly * Fix typo (#61380) * Add new collapsing option for metadata files that contain source (#61205) * More correctly respect background analysis scope (#61392) * Fix function id (#61400) * Wait for async operations to complete before proceeding * Update SDK to .NET 7 Preview 4 * Avoid logging work when no logger is specified * Emit CompilerFeatureRequired for ref structs when present. * Support emitting CompilerFeatureRequiredAttribute for contructors of types with required members. * [LSP] Small cleanup for pull diagnostics logging (#61417) * Small logging cleanup on pull diagnostics code * Update tests to account for lsp diagnostics throwing when mismatch in diagnostic mode * Address feedback from numeric IntPtr feature review (#61418) * Fix binding for checkbox text in rename dialogs (#61430) Previously text was bound to properties on the control type using x:Name. This restores that * Fix build * Restrict IsGenericConstraintContext for C# * More instrumentation for ReferenceCachingCS (#61402) * Do not filter snippets * Reverted delegate completion * Allow source link, embedded or decompiled source in Peek Definition (#61427) * Update status for DIM and numeric IntPtr (#61464) * Lazily produce semantic models in source generators * Remove unnecessary finalizer state handling from MethodToStateMachineRewriter (#61409) * Update src/Tools/IdeCoreBenchmarks/IncrementalSourceGeneratorBenchmarks.cs * Update src/Tools/IdeCoreBenchmarks/IncrementalSourceGeneratorBenchmarks.cs * Update src/Tools/IdeCoreBenchmarks/IncrementalSourceGeneratorBenchmarks.cs * lint * Address prototype comments (#61436) * Give a warning when obsolete is applied to a required member and the containing context is not obsolete, or all constructors are not obsolete/setsrequiredmembers. * Restore nullable constructor warnings for constructors with `SetsRequiredMembersAttribute`. * Remove prototype comments. * Add tests and extra state * Extract checking for generic constraint context to extension method & minor refactoring * Update test comment * Generate single OptProf config for compiler vsix Currently OptProf can't support profiling for multiple flavors of vsix, and Optprof test only runs on X64. Multiple configs with same profiling binary are causing the tests to fail. * Reduce release/64 limit for EndToEndTests.Constraints (#61480) * Reduce release/64 limit for EndToEndTests.Constraints * Lower bar more * Lower bar more * Remove parameter nullchecking feature (#61397) * Fix null ref for JS files (#61472) * Add file paths to interactive buffers and documents to support LSP requests (#61441) * Add file paths to interactive buffers and documents to support LSP requests * Switch to false returning predicate * more feedback * mroe feedback * Reword comment * Log additional information from CopyRefAssembly (#61384) * update versioning to use languageserver.client.implementation * Require VS 17.0 in signed build. * Bump LSP protocol version (#61494) * Bump protocol version * React to breaking changes in foldingrangekind * Disable inheritance margin for interactive documents (#61476) * fix * Improvements to the background compiler component * add docs * Simplify * docs * Check token * Simplify * Simplify * Rename enum field * Lifted relational operator implies operands non-null when true (#61403) * Use ImmutableArray instead of IEnumerable parameters * Use assignabiilty instead of subclass test in extension loader * Fix test * Fix test * Simplify rename implementation * Rename * Unify all end operations that rename performs * restore code * Remove unnecessary code' * Unify error handling in rename * Add comment * message severities * Restore * Simplify * Bring main-vs-deps back (#61514) * Add main-vs-deps back * Update eng/config/PublishData.json Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com> Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com> * Simplify LSP reference update * Adjust conversion from nuint to float/double (#61345) * Add embedded classification for field initializers * Add support for properties * Update src/EditorFeatures/Core/InlineRename/InlineRenameSession.cs * Update src/EditorFeatures/Core/RenameTracking/RenameTrackingTaggerProvider.RenameTrackingCommitter.cs * Update src/EditorFeatures/Core/RenameTracking/RenameTrackingTaggerProvider.RenameTrackingCommitter.cs * Fix setup authoring bug (#61508) * Expose VirtualChars to asp.net (through EA) to facilitate route classification * add docs * Add member * NRT * Make async * Make async * Pull token out * Use feature attribute * Remove Utf8StringLiteral conversion (#61481) https://github.com/dotnet/csharplang/blob/main/meetings/2022/LDM-2022-04-18.md#target-typing-a-regular-string-literal-to-utf8-types * Fix AbstractLanguageService constructor (#61513) * Fix AbstractLanguageService constructor * Fix formatting * Don't throw in logging when the document path contains curly braces (#61524) * Update unit tests * Improve normalization to match idiomatic patterns for nested usings and fixed statements. (#61533) * Better syntax normalization for fixed/using statements * Add tests * Prepare VB iterators for EnC support (#61488) * Remove unused parameters * Separate iterator finalizer states from resumable states. * Remove unused * Skip timing test (#61222) * Skip test * Add some APIs on AspNetCoreVirtualCharSequence * Add IsDefault * Final prototype comments and top level statements local adjustments (#61551) Clean up the last of the prototype comments and adjust the parsing of locals named required in top level statements. * IDE Support for Required Members (#61440) * Add required keyword recommender. * Add SyntaxNormalizer test. * Code generation support. * Add SymbolDisplay * F1 help service and test fix. * Add order modifier tests and update. * Change natural type of UTF-8 string literals to `ReadOnlySpan<byte>` and null terminate the underlying blob. (#61532) https://github.com/dotnet/csharplang/blob/main/meetings/2022/LDM-2022-04-18.md#natural-type-of-utf8-literals https://github.com/dotnet/csharplang/blob/main/meetings/2022/LDM-2022-04-18.md#should-utf8-literals-be-null-terminated Related to #61517 Closes #60644 * fix assumption of length * Bind native integers in cref (#61431) * Use VS2022 for PR Validation builds * PR feedback * Add unit test project IVT to ExternalAccess.AspNetCore * Fix generation location when generating across files * Add test * Relax check * EnC: Allow adding/removing await expressions and yield statements (#61356) * Implements support for adding and removing await/yield return in C# async, iterator and async iterator methods. * Fix syntax node associated with BoundTryStatement created from using syntax * Update required members status (#61602) * Implements support for adding and removing await/yield return in C# in the IDE (#61521) Co-authored-by: Sam Harwell <Sam.Harwell@microsoft.com> Co-authored-by: Julien Couvreur <jcouv@users.noreply.github.com> Co-authored-by: Chris Sienkiewicz <chsienki@microsoft.com> Co-authored-by: DoctorKrolic <mapmyp03@gmail.com> Co-authored-by: Gen Lu <genlu@users.noreply.github.com> Co-authored-by: DoctorKrolic <70431552+DoctorKrolic@users.noreply.github.com> Co-authored-by: Cyrus Najmabadi <cyrusn@microsoft.com> Co-authored-by: gel@microsoft.com <gel@microsoft.com> Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com> Co-authored-by: dotnet bot <dotnet-bot@dotnetfoundation.org> Co-authored-by: AlFas <AlFasGD@users.noreply.github.com> Co-authored-by: Ramkumar Ramesh <ramkumar.ramesh.8@live.com> Co-authored-by: Ramkumar Ramesh <ramram@microsoft.com> Co-authored-by: AlekseyTs <AlekseyTs@users.noreply.github.com> Co-authored-by: Allison Chou <allichou@microsoft.com> Co-authored-by: Tomáš Matoušek <tmat@users.noreply.github.com> Co-authored-by: David Wengier <david.wengier@microsoft.com> Co-authored-by: David Barbet <dabarbet@microsoft.com> Co-authored-by: Fred Silberberg <frsilb@microsoft.com> Co-authored-by: James Newton-King <james@newtonking.com> Co-authored-by: Weihan Li <weihanli@outlook.com> Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com> Co-authored-by: Julien Couvreur <julien.couvreur@gmail.com> Co-authored-by: Andrew Hall <ryzngard@live.com> Co-authored-by: Manish Vasani <mavasani@microsoft.com> Co-authored-by: Jared Parsons <jaredpparsons@gmail.com> Co-authored-by: Joey Robichaud <jorobich@microsoft.com> Co-authored-by: Rikki Gibson <rigibson@microsoft.com> Co-authored-by: akhera99 <ankitakhera@microsoft.com> Co-authored-by: Ankita Khera <40616383+akhera99@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #60394
Relates to test plan #59458