未验证 提交 698ad55e 编写于 作者: F Fred Silberberg 提交者: GitHub

Merge pull request #41189 from 333fred/unnecessary-suppressions

Remove unnecessary CS8717 suppressions.
......@@ -31,145 +31,109 @@ public virtual TResult DefaultVisit(ISymbol symbol)
[return: MaybeNull]
public virtual TResult VisitAlias(IAliasSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitArrayType(IArrayTypeSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitAssembly(IAssemblySymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitDiscard(IDiscardSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitDynamicType(IDynamicTypeSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitEvent(IEventSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitField(IFieldSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitLabel(ILabelSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitLocal(ILocalSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitMethod(IMethodSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitModule(IModuleSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitNamedType(INamedTypeSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitNamespace(INamespaceSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitParameter(IParameterSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitPointerType(IPointerTypeSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitProperty(IPropertySymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitRangeVariable(IRangeVariableSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
[return: MaybeNull]
public virtual TResult VisitTypeParameter(ITypeParameterSymbol symbol)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
return DefaultVisit(symbol);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TResult' is a non-nullable reference type.
}
}
}
......@@ -131,9 +131,7 @@ public ImmutableArray<TypedConstant> Values
[return: MaybeNull]
internal T DecodeValue<T>(SpecialType specialType)
{
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'T' is a non-nullable reference type.
TryDecodeValue(specialType, out T value);
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'T' is a non-nullable reference type.
return value;
}
......
......@@ -38,12 +38,7 @@ public abstract class HostLanguageServices
[return: NotNull]
public TLanguageService GetRequiredService<TLanguageService>() where TLanguageService : ILanguageService
{
// Producing a [MaybeNull]T value results in a warning like default(T).
// We are investigating a more complex design for nullable analysis to solve this. See:
// https://github.com/dotnet/roslyn/issues/38638
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TLanguageService' is a non-nullable reference type.
var service = GetService<TLanguageService>();
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TLanguageService' is a non-nullable reference type.
if (service == null)
{
throw new InvalidOperationException(string.Format(WorkspacesResources.Service_of_type_0_is_required_to_accomplish_the_task_but_is_not_available_from_the_workspace, typeof(TLanguageService)));
......
......@@ -43,12 +43,7 @@ public abstract class HostWorkspaceServices
[return: NotNull]
public TWorkspaceService GetRequiredService<TWorkspaceService>() where TWorkspaceService : IWorkspaceService
{
// Producing a [MaybeNull]T value results in a warning like default(T).
// We are investigating a more complex design for nullable analysis to solve this. See:
// https://github.com/dotnet/roslyn/issues/38638
#pragma warning disable CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TWorkspaceService' is a non-nullable reference type.
var service = GetService<TWorkspaceService>();
#pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value when 'TWorkspaceService' is a non-nullable reference type.
if (service == null)
{
throw new InvalidOperationException(string.Format(WorkspacesResources.Service_of_type_0_is_required_to_accomplish_the_task_but_is_not_available_from_the_workspace, typeof(TWorkspaceService).FullName));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册