Skip to content

Commit c0f0162

Browse files
author
msftbot[bot]
authored
Merge pull request #50966 from dotnet/merges/master-to-master-vs-deps
Merge master to master-vs-deps
2 parents 0bed9aa + b9025e4 commit c0f0162

File tree

92 files changed

+2433
-2537
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2433
-2537
lines changed

‎src/Compilers/Core/Portable/DiagnosticAnalyzer/IAnalyzerAssemblyLoader.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
#nullable disable
6+
#pragma warning disable RS0041 // uses oblivious reference types
67

78
using System;
89
using System.Reflection;

‎src/Compilers/Core/Portable/PublicAPI.Shipped.txt

Lines changed: 1943 additions & 1942 deletions
Large diffs are not rendered by default.

‎src/Compilers/Core/Portable/PublicAPI.Unshipped.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
Microsoft.CodeAnalysis.GeneratorAttribute.GeneratorAttribute(string firstLanguage, params string[] additionalLanguages) -> void
2-
Microsoft.CodeAnalysis.GeneratorAttribute.Languages.get -> string[]
3-
Microsoft.CodeAnalysis.GeneratorExecutionContext.SyntaxContextReceiver.get -> Microsoft.CodeAnalysis.ISyntaxContextReceiver
4-
Microsoft.CodeAnalysis.GeneratorInitializationContext.RegisterForSyntaxNotifications(Microsoft.CodeAnalysis.SyntaxContextReceiverCreator receiverCreator) -> void
1+
Microsoft.CodeAnalysis.GeneratorAttribute.GeneratorAttribute(string! firstLanguage, params string![]! additionalLanguages) -> void
2+
Microsoft.CodeAnalysis.GeneratorAttribute.Languages.get -> string![]!
3+
Microsoft.CodeAnalysis.GeneratorExecutionContext.SyntaxContextReceiver.get -> Microsoft.CodeAnalysis.ISyntaxContextReceiver?
4+
Microsoft.CodeAnalysis.GeneratorInitializationContext.RegisterForSyntaxNotifications(Microsoft.CodeAnalysis.SyntaxContextReceiverCreator! receiverCreator) -> void
55
Microsoft.CodeAnalysis.GeneratorSyntaxContext
66
Microsoft.CodeAnalysis.GeneratorSyntaxContext.GeneratorSyntaxContext() -> void
7-
Microsoft.CodeAnalysis.GeneratorSyntaxContext.Node.get -> Microsoft.CodeAnalysis.SyntaxNode
8-
Microsoft.CodeAnalysis.GeneratorSyntaxContext.SemanticModel.get -> Microsoft.CodeAnalysis.SemanticModel
7+
Microsoft.CodeAnalysis.GeneratorSyntaxContext.Node.get -> Microsoft.CodeAnalysis.SyntaxNode!
8+
Microsoft.CodeAnalysis.GeneratorSyntaxContext.SemanticModel.get -> Microsoft.CodeAnalysis.SemanticModel!
99
Microsoft.CodeAnalysis.ISyntaxContextReceiver
1010
Microsoft.CodeAnalysis.ISyntaxContextReceiver.OnVisitSyntaxNode(Microsoft.CodeAnalysis.GeneratorSyntaxContext context) -> void
11-
Microsoft.CodeAnalysis.GeneratorInitializationContext.RegisterForPostInitialization(System.Action<Microsoft.CodeAnalysis.GeneratorPostInitializationContext> callback) -> void
11+
Microsoft.CodeAnalysis.GeneratorInitializationContext.RegisterForPostInitialization(System.Action<Microsoft.CodeAnalysis.GeneratorPostInitializationContext>! callback) -> void
1212
Microsoft.CodeAnalysis.GeneratorPostInitializationContext
13-
Microsoft.CodeAnalysis.GeneratorPostInitializationContext.AddSource(string hintName, Microsoft.CodeAnalysis.Text.SourceText sourceText) -> void
14-
Microsoft.CodeAnalysis.GeneratorPostInitializationContext.AddSource(string hintName, string source) -> void
13+
Microsoft.CodeAnalysis.GeneratorPostInitializationContext.AddSource(string! hintName, Microsoft.CodeAnalysis.Text.SourceText! sourceText) -> void
14+
Microsoft.CodeAnalysis.GeneratorPostInitializationContext.AddSource(string! hintName, string! source) -> void
1515
Microsoft.CodeAnalysis.GeneratorPostInitializationContext.CancellationToken.get -> System.Threading.CancellationToken
1616
Microsoft.CodeAnalysis.GeneratorPostInitializationContext.GeneratorPostInitializationContext() -> void
1717
Microsoft.CodeAnalysis.ITypeSymbol.IsRecord.get -> bool
1818
Microsoft.CodeAnalysis.Operations.OperationWalker<TArgument>
1919
Microsoft.CodeAnalysis.Operations.OperationWalker<TArgument>.OperationWalker() -> void
2020
Microsoft.CodeAnalysis.SymbolDisplayPartKind.RecordClassName = 31 -> Microsoft.CodeAnalysis.SymbolDisplayPartKind
21-
const Microsoft.CodeAnalysis.WellKnownDiagnosticTags.CompilationEnd = "CompilationEnd" -> string
21+
const Microsoft.CodeAnalysis.WellKnownDiagnosticTags.CompilationEnd = "CompilationEnd" -> string!
2222
Microsoft.CodeAnalysis.SyntaxContextReceiverCreator
2323
static Microsoft.CodeAnalysis.CaseInsensitiveComparison.Compare(System.ReadOnlySpan<char> left, System.ReadOnlySpan<char> right) -> int
2424
static Microsoft.CodeAnalysis.CaseInsensitiveComparison.Equals(System.ReadOnlySpan<char> left, System.ReadOnlySpan<char> right) -> bool
25-
override Microsoft.CodeAnalysis.Diagnostics.AnalyzerFileReference.GetGenerators(string language) -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISourceGenerator>
26-
override Microsoft.CodeAnalysis.Diagnostics.AnalyzerFileReference.GetGeneratorsForAllLanguages() -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISourceGenerator>
27-
override Microsoft.CodeAnalysis.Operations.OperationWalker<TArgument>.DefaultVisit(Microsoft.CodeAnalysis.IOperation operation, TArgument argument) -> object
28-
override Microsoft.CodeAnalysis.Operations.OperationWalker<TArgument>.Visit(Microsoft.CodeAnalysis.IOperation operation, TArgument argument) -> object
29-
virtual Microsoft.CodeAnalysis.Diagnostics.AnalyzerReference.GetGenerators(string language) -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISourceGenerator>
30-
virtual Microsoft.CodeAnalysis.Diagnostics.AnalyzerReference.GetGeneratorsForAllLanguages() -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISourceGenerator>
25+
override Microsoft.CodeAnalysis.Diagnostics.AnalyzerFileReference.GetGenerators(string! language) -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISourceGenerator!>
26+
override Microsoft.CodeAnalysis.Diagnostics.AnalyzerFileReference.GetGeneratorsForAllLanguages() -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISourceGenerator!>
27+
override Microsoft.CodeAnalysis.Operations.OperationWalker<TArgument>.DefaultVisit(Microsoft.CodeAnalysis.IOperation! operation, TArgument argument) -> object?
28+
override Microsoft.CodeAnalysis.Operations.OperationWalker<TArgument>.Visit(Microsoft.CodeAnalysis.IOperation? operation, TArgument argument) -> object?
29+
virtual Microsoft.CodeAnalysis.Diagnostics.AnalyzerReference.GetGenerators(string! language) -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISourceGenerator!>
30+
virtual Microsoft.CodeAnalysis.Diagnostics.AnalyzerReference.GetGeneratorsForAllLanguages() -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ISourceGenerator!>

‎src/Compilers/Core/Portable/Symbols/ISymbol.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public interface ISymbol : IEquatable<ISymbol?>
5959
string MetadataName { get; }
6060

6161
#nullable disable // Skipped for now https://github.com/dotnet/roslyn/issues/39166
62+
#pragma warning disable RS0041 // uses oblivious reference types
6263
/// <summary>
6364
/// Gets the <see cref="ISymbol"/> for the immediately containing symbol.
6465
/// </summary>
@@ -88,6 +89,7 @@ public interface ISymbol : IEquatable<ISymbol?>
8889
/// </summary>
8990
INamespaceSymbol ContainingNamespace { get; }
9091
#nullable enable
92+
#pragma warning restore RS0041 // uses oblivious reference types
9193

9294
/// <summary>
9395
/// Gets a value indicating whether the symbol is the original definition. Returns false

‎src/Compilers/Core/Portable/Syntax/SeparatedSyntaxList.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,9 @@ private SyntaxNodeOrToken[] NodesWithSeparators
566566
get { return _list.ToArray(); }
567567
}
568568

569+
#pragma warning disable RS0041 // uses oblivious reference types
569570
public Enumerator GetEnumerator()
571+
#pragma warning restore RS0041 // uses oblivious reference types
570572
{
571573
return new Enumerator(this);
572574
}

‎src/Compilers/Core/Portable/Syntax/SyntaxList`1.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,9 @@ private TNode[] Nodes
396396
/// <summary>
397397
/// Get's the enumerator for this list.
398398
/// </summary>
399+
#pragma warning disable RS0041 // uses oblivious reference types
399400
public Enumerator GetEnumerator()
401+
#pragma warning restore RS0041 // uses oblivious reference types
400402
{
401403
return new Enumerator(this);
402404
}

‎src/EditorFeatures/CSharpTest/SignatureHelp/InvocationExpressionSignatureHelpProviderTests.cs

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2225,7 +2225,7 @@ void Shared()
22252225
</Project>
22262226
</Workspace>";
22272227

2228-
var expectedDescription = new SignatureHelpTestItem($"void C.Do(int x)", currentParameterIndex: 0);
2228+
var expectedDescription = new SignatureHelpTestItem($"void C.Do(int x)\r\n\r\n{string.Format(FeaturesResources._0_1, "Proj1", FeaturesResources.Available)}\r\n{string.Format(FeaturesResources._0_1, "Proj2", FeaturesResources.Not_Available)}\r\n\r\n{FeaturesResources.You_can_use_the_navigation_bar_to_switch_context}", currentParameterIndex: 0);
22292229
await VerifyItemWithReferenceWorkerAsync(markup, new[] { expectedDescription }, false);
22302230
}
22312231

@@ -2485,5 +2485,46 @@ unsafe static void M()
24852485

24862486
await TestAsync(markup, expectedOrderedItems);
24872487
}
2488+
2489+
[Theory, CombinatorialData, Trait(Traits.Feature, Traits.Features.SignatureHelp)]
2490+
public async Task ShowWarningForOverloadUnavailableInRelatedDocument(bool typeParameterProvided)
2491+
{
2492+
var markup = $@"<Workspace>
2493+
<Project Language=""C#"" CommonReferences=""true"" AssemblyName=""Proj1"" PreprocessorSymbols=""TFM"">
2494+
<Document FilePath=""SourceDocument""><![CDATA[
2495+
class C
2496+
{{
2497+
public void M(object o) => false;
2498+
#if TFM
2499+
public void M<T>(Action<T> arg1, T arg2, bool flag) => false;
2500+
#endif
2501+
2502+
void goo()
2503+
{{
2504+
M{(typeParameterProvided ? "<object>" : string.Empty)}($$
2505+
}}
2506+
}}
2507+
]]>
2508+
</Document>
2509+
</Project>
2510+
<Project Language=""C#"" CommonReferences=""true"" AssemblyName=""Proj2"">
2511+
<Document IsLinkFile=""true"" LinkAssemblyName=""Proj1"" LinkFilePath=""SourceDocument"" />
2512+
</Project>
2513+
</Workspace>";
2514+
2515+
var expectedItems = new List<SignatureHelpTestItem>();
2516+
2517+
if (typeParameterProvided)
2518+
{
2519+
// If generic method is instantiated, non-generic overloads would be excluded (desciption would be instantiated as well, i.e. object instead of T)
2520+
expectedItems.Add(new SignatureHelpTestItem($"void C.M<object>(Action<object> arg1, object arg2, bool flag)\r\n\r\n{string.Format(FeaturesResources._0_1, "Proj1", FeaturesResources.Available)}\r\n{string.Format(FeaturesResources._0_1, "Proj2", FeaturesResources.Not_Available)}\r\n\r\n{FeaturesResources.You_can_use_the_navigation_bar_to_switch_context}", currentParameterIndex: 0));
2521+
}
2522+
else
2523+
{
2524+
expectedItems.Add(new SignatureHelpTestItem($"void C.M(object o)", currentParameterIndex: 0));
2525+
expectedItems.Add(new SignatureHelpTestItem($"void C.M<T>(Action<T> arg1, T arg2, bool flag)\r\n\r\n{string.Format(FeaturesResources._0_1, "Proj1", FeaturesResources.Available)}\r\n{string.Format(FeaturesResources._0_1, "Proj2", FeaturesResources.Not_Available)}\r\n\r\n{FeaturesResources.You_can_use_the_navigation_bar_to_switch_context}", currentParameterIndex: 0));
2526+
}
2527+
await VerifyItemWithReferenceWorkerAsync(markup, expectedItems, hideAdvancedMembers: false);
2528+
}
24882529
}
24892530
}

‎src/EditorFeatures/Core.Cocoa/Microsoft.CodeAnalysis.EditorFeatures.Cocoa.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)"/>
29+
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
3030
<PackageReference Include="Microsoft.VisualStudio.Imaging" Version="$(MicrosoftVisualStudioImagingVersion)" />
31-
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="$(MicrosoftVisualStudioTextDataVersion)"/>
31+
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="$(MicrosoftVisualStudioTextDataVersion)" />
3232
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="$(MicrosoftVisualStudioTextUIVersion)" />
3333
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Cocoa" Version="$(MicrosoftVisualStudioTextUICocoaVersion)" />
3434
<PackageReference Include="Microsoft.VisualStudio.Language" Version="$(MicrosoftVisualStudioLanguageVersion)" />

‎src/EditorFeatures/Core.Cocoa/Preview/ICocoaDifferenceViewerExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
using Microsoft.VisualStudio.Text.Editor;
1414
using Roslyn.Utilities;
1515

16-
namespace Microsoft.CodeAnalysis.Editor.Shared.Extensions
16+
namespace Microsoft.CodeAnalysis.Editor.Implementation.Preview
1717
{
1818
internal static class ICocoaDifferenceViewerExtensions
1919
{

‎src/EditorFeatures/Core.Cocoa/PreviewPane/PreviewFactoryService.cs renamed to ‎src/EditorFeatures/Core.Cocoa/Preview/PreviewFactoryService.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Composition;
77
using System.Threading;
88
using System.Threading.Tasks;
9-
using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
109
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
1110
using Microsoft.CodeAnalysis.Host.Mef;
1211
using Microsoft.VisualStudio.Text;

‎src/EditorFeatures/Core.Cocoa/PreviewPane/PreviewPane.cs renamed to ‎src/EditorFeatures/Core.Cocoa/Preview/PreviewPane.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
using System.Collections.Generic;
99
using AppKit;
1010
using Foundation;
11-
using Microsoft.CodeAnalysis.Editor.Implementation.Preview;
1211
using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
1312
using Microsoft.VisualStudio.Text.Differencing;
1413

1514
#pragma warning disable IDE0060 //Remove unused parameter
1615

17-
namespace Microsoft.VisualStudio.LanguageServices.Implementation.PreviewPane
16+
namespace Microsoft.CodeAnalysis.Editor.Implementation.Preview
1817
{
1918
internal class PreviewPane : NSView
2019
{
@@ -97,7 +96,7 @@ public PreviewPane(NSImage severityIcon, string id, string title, string descrip
9796
NSLayoutConstraint.ActivateConstraints(constraints);
9897

9998
_differenceViewerPreview.Viewer.InlineView.TryMoveCaretToAndEnsureVisible(
100-
new Text.SnapshotPoint(_differenceViewerPreview.Viewer.InlineView.TextSnapshot, 0));
99+
new Microsoft.VisualStudio.Text.SnapshotPoint(_differenceViewerPreview.Viewer.InlineView.TextSnapshot, 0));
101100
}
102101

103102
public PreviewPane(IntPtr ptr)

‎src/EditorFeatures/Core.Cocoa/PreviewPane/PreviewPaneService.cs renamed to ‎src/EditorFeatures/Core.Cocoa/Preview/PreviewPaneService.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@
99
using System.Composition;
1010
using System.Globalization;
1111
using AppKit;
12-
using Microsoft.CodeAnalysis;
1312
using Microsoft.CodeAnalysis.Diagnostics;
1413
using Microsoft.CodeAnalysis.Editor.Host;
14+
using Microsoft.CodeAnalysis.Editor.Shared;
1515
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
1616
using Microsoft.CodeAnalysis.Host;
1717
using Microsoft.CodeAnalysis.Host.Mef;
1818
using Microsoft.VisualStudio.Core.Imaging;
1919
using Microsoft.VisualStudio.Imaging;
20-
using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
2120

22-
namespace Microsoft.VisualStudio.LanguageServices.Implementation.PreviewPane
21+
namespace Microsoft.CodeAnalysis.Editor.Implementation.Preview
2322
{
2423
[ExportWorkspaceServiceFactory(typeof(IPreviewPaneService), ServiceLayer.Host), Shared]
2524
internal class PreviewPaneService : ForegroundThreadAffinitizedObject, IPreviewPaneService, IWorkspaceServiceFactory

‎src/EditorFeatures/Core.Cocoa/PreviewPane/BrowserHelper.cs

Lines changed: 0 additions & 109 deletions
This file was deleted.

‎src/EditorFeatures/Core/EditorFeaturesResources.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,4 +939,10 @@ Do you want to proceed?</value>
939939
<data name="User_Types_Records" xml:space="preserve">
940940
<value>User Types - Records</value>
941941
</data>
942+
<data name="Get_help_for_0" xml:space="preserve">
943+
<value>Get help for '{0}'</value>
944+
</data>
945+
<data name="Get_help_for_0_from_Bing" xml:space="preserve">
946+
<value>Get help for '{0}' from Bing</value>
947+
</data>
942948
</root>

‎src/VisualStudio/Core/Def/Implementation/Utilities/BrowserHelper.cs renamed to ‎src/EditorFeatures/Core/Shared/BrowserHelper.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44

55
using System;
66
using System.Diagnostics.CodeAnalysis;
7-
using Microsoft.CodeAnalysis;
87
using Microsoft.CodeAnalysis.Diagnostics;
9-
using Microsoft.VisualStudio.Shell;
108

11-
namespace Microsoft.VisualStudio.LanguageServices.Implementation.Utilities
9+
namespace Microsoft.CodeAnalysis.Editor.Shared
1210
{
1311
internal static class BrowserHelper
1412
{
@@ -100,16 +98,10 @@ public static string GetHelpLinkToolTip(string diagnosticId, Uri uri)
10098
var strUri = uri.ToString();
10199

102100
var resourceName = strUri.StartsWith(BingGetApiUrl, StringComparison.Ordinal) ?
103-
ServicesVSResources.Get_help_for_0_from_Bing : ServicesVSResources.Get_help_for_0;
101+
EditorFeaturesResources.Get_help_for_0_from_Bing : EditorFeaturesResources.Get_help_for_0;
104102

105103
// We make sure not to use Uri.AbsoluteUri for the url displayed in the tooltip so that the url displayed in the tooltip stays human readable.
106104
return string.Format(resourceName, diagnosticId) + "\r\n" + strUri;
107105
}
108-
109-
public static void StartBrowser(string uri)
110-
=> VsShellUtilities.OpenSystemBrowser(uri);
111-
112-
public static void StartBrowser(Uri uri)
113-
=> VsShellUtilities.OpenSystemBrowser(uri.AbsoluteUri);
114106
}
115107
}

0 commit comments

Comments
 (0)