Skip to content

Commit

Permalink
Merge pull request #693 from amcasey/Spelling
Browse files Browse the repository at this point in the history
Fix spelling: supress -> suppress
  • Loading branch information
amcasey committed Feb 19, 2015
2 parents d461d3f + a9aa553 commit 22329d0
Show file tree
Hide file tree
Showing 16 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Portable/Binder/Binder_Symbols.cs
Expand Up @@ -556,7 +556,7 @@ private void ReportUseSiteDiagnosticForDynamic(DiagnosticBag diagnostics, Identi
{
// CONSIDER: Native compiler reports error CS1980 for each syntax node which binds to dynamic type, we do the same by reporting a diagnostic here.
// However, this means we generate multiple duplicate diagnostics, when a single one would suffice.
// We may want to consider adding an "Unreported" flag to the DynamicTypeSymbol to supress duplicate CS1980.
// We may want to consider adding an "Unreported" flag to the DynamicTypeSymbol to suppress duplicate CS1980.

// CS1980: Cannot define a class or member that utilizes 'dynamic' because the compiler required type '{0}' cannot be found. Are you missing a reference?
var info = new CSDiagnosticInfo(ErrorCode.ERR_DynamicAttributeMissing, AttributeDescription.DynamicAttribute.FullName);
Expand Down
Expand Up @@ -128,7 +128,7 @@
<Compile Include="Semantics\SemanticAnalyzerTests.cs" />
<Compile Include="Semantics\SemanticErrorTests.cs" />
<Compile Include="Semantics\StructsTests.cs" />
<Compile Include="Semantics\SupressAccessibilityChecksTests.cs" />
<Compile Include="Semantics\SuppressAccessibilityChecksTests.cs" />
<Compile Include="Semantics\SwitchTests.cs" />
<Compile Include="Semantics\SyntaxTreeRootTests.cs" />
<Compile Include="Semantics\SynthesizedStaticConstructorTests.cs" />
Expand Down Expand Up @@ -161,4 +161,4 @@
<Import Project="..\..\..\..\..\build\Roslyn.Toolsets.Xunit.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</ImportGroup>
</Project>
</Project>
Expand Up @@ -7,7 +7,7 @@

namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Semantics
{
public class SupressAccessibilityChecksTests : CSharpTestBase
public class SuppressAccessibilityChecksTests : CSharpTestBase
{
private static SemanticModel GetSemanticModelWithSuppressAccessChecks()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/Core/Desktop/CommandLine/CommonCompiler.cs
Expand Up @@ -605,7 +605,7 @@ private void GenerateSqmData(CompilationOptions compilationOptions, ImmutableArr
switch (options)
{
case ReportDiagnostic.Suppress:
sqm.AddItemToStream(sqmSession, SqmServiceProvider.DATAID_SQM_ROSLYN_SUPPRESSWARNINGNUMBERS, code); // Supress warning
sqm.AddItemToStream(sqmSession, SqmServiceProvider.DATAID_SQM_ROSLYN_SUPPRESSWARNINGNUMBERS, code); // Suppress warning
break;

case ReportDiagnostic.Error:
Expand Down
Expand Up @@ -250,7 +250,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
' they enable us to clearly document a discarded return value from a method invocation, e.g. var
' discardedValue = F(); >shrug<
' Note, this rule only applies to local variables and not to const locals, i.e. we always report unused
' const locals. In addition, if the value has errors then supress these diagnostics in all cases.
' const locals. In addition, if the value has errors then suppress these diagnostics in all cases.
_unusedVariables.Remove(local)
End If
End If
Expand Down
Expand Up @@ -11,15 +11,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Friend NotInheritable Class AttributeSemanticModel
Inherits MemberSemanticModel

Private Sub New(root As VisualBasicSyntaxNode, binder As Binder, Optional parentSemanticModelOpt As SyntaxTreeSemanticModel = Nothing, Optional speculatedPosition As Integer = 0, Optional isSupressingAccessChecks As Boolean = False)
MyBase.New(root, binder, parentSemanticModelOpt, speculatedPosition, isSupressingAccessChecks)
Private Sub New(root As VisualBasicSyntaxNode, binder As Binder, Optional parentSemanticModelOpt As SyntaxTreeSemanticModel = Nothing, Optional speculatedPosition As Integer = 0, Optional isSuppressingAccessChecks As Boolean = False)
MyBase.New(root, binder, parentSemanticModelOpt, speculatedPosition, isSuppressingAccessChecks)
End Sub

''' <summary>
''' Creates an AttributeSemanticModel that allows asking semantic questions about an attribute node.
''' </summary>
Friend Shared Function Create(binder As AttributeBinder, Optional isSupressingAccessChecks As Boolean = False) As AttributeSemanticModel
Return New AttributeSemanticModel(binder.Root, binder, isSupressingAccessChecks:=isSupressingAccessChecks)
Friend Shared Function Create(binder As AttributeBinder, Optional isSuppressingAccessChecks As Boolean = False) As AttributeSemanticModel
Return New AttributeSemanticModel(binder.Root, binder, isSuppressingAccessChecks:=isSuppressingAccessChecks)
End Function

''' <summary>
Expand Down
Expand Up @@ -10,15 +10,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Friend NotInheritable Class InitializerSemanticModel
Inherits MemberSemanticModel

Private Sub New(root As VisualBasicSyntaxNode, binder As Binder, Optional parentSemanticModelOpt As SyntaxTreeSemanticModel = Nothing, Optional speculatedPosition As Integer = 0, Optional isSupressingAccessChecks As Boolean = False)
MyBase.New(root, binder, parentSemanticModelOpt, speculatedPosition, isSupressingAccessChecks)
Private Sub New(root As VisualBasicSyntaxNode, binder As Binder, Optional parentSemanticModelOpt As SyntaxTreeSemanticModel = Nothing, Optional speculatedPosition As Integer = 0, Optional isSuppressingAccessChecks As Boolean = False)
MyBase.New(root, binder, parentSemanticModelOpt, speculatedPosition, isSuppressingAccessChecks)
End Sub

''' <summary>
''' Creates an InitializerSemanticModel that allows asking semantic questions about an initializer node.
''' </summary>
Friend Shared Function Create(binder As DeclarationInitializerBinder, Optional isSupressingAccessChecks As Boolean = False) As InitializerSemanticModel
Return New InitializerSemanticModel(binder.Root, binder, isSupressingAccessChecks:=isSupressingAccessChecks)
Friend Shared Function Create(binder As DeclarationInitializerBinder, Optional isSuppressingAccessChecks As Boolean = False) As InitializerSemanticModel
Return New InitializerSemanticModel(binder.Root, binder, isSuppressingAccessChecks:=isSuppressingAccessChecks)
End Function

''' <summary>
Expand Down
Expand Up @@ -24,12 +24,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Private ReadOnly m_speculatedPosition As Integer
Private ReadOnly m_hasAccessChecksSuppressed As Boolean

Friend Sub New(root As VisualBasicSyntaxNode, rootBinder As Binder, parentSemanticModelOpt As SyntaxTreeSemanticModel, speculatedPosition As Integer, Optional isSupressingAccessChecks As Boolean = False)
Friend Sub New(root As VisualBasicSyntaxNode, rootBinder As Binder, parentSemanticModelOpt As SyntaxTreeSemanticModel, speculatedPosition As Integer, Optional isSuppressingAccessChecks As Boolean = False)
Debug.Assert(parentSemanticModelOpt Is Nothing OrElse Not parentSemanticModelOpt.IsSpeculativeSemanticModel, VBResources.ChainingSpeculativeModelIsNotSupported)

m_Root = root
m_hasAccessChecksSuppressed = isSupressingAccessChecks
m_RootBinder = SemanticModelBinder.Mark(rootBinder, isSupressingAccessChecks)
m_hasAccessChecksSuppressed = isSuppressingAccessChecks
m_RootBinder = SemanticModelBinder.Mark(rootBinder, isSuppressingAccessChecks)
m_parentSemanticModelOpt = parentSemanticModelOpt
m_speculatedPosition = speculatedPosition
End Sub
Expand Down
Expand Up @@ -9,15 +9,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Friend NotInheritable Class MethodBodySemanticModel
Inherits MemberSemanticModel

Private Sub New(root As VisualBasicSyntaxNode, binder As Binder, Optional parentSemanticModelOpt As SyntaxTreeSemanticModel = Nothing, Optional speculatedPosition As Integer = 0, Optional isSupressingAccessChecks As Boolean = False)
MyBase.New(root, binder, parentSemanticModelOpt, speculatedPosition, isSupressingAccessChecks:=isSupressingAccessChecks)
Private Sub New(root As VisualBasicSyntaxNode, binder As Binder, Optional parentSemanticModelOpt As SyntaxTreeSemanticModel = Nothing, Optional speculatedPosition As Integer = 0, Optional isSuppressingAccessChecks As Boolean = False)
MyBase.New(root, binder, parentSemanticModelOpt, speculatedPosition, isSuppressingAccessChecks:=isSuppressingAccessChecks)
End Sub

''' <summary>
''' Creates an MethodBodySemanticModel that allows asking semantic questions about an attribute node.
''' </summary>
Friend Shared Function Create(binder As MethodBodyBinder, Optional isSupressingAccessChecks As Boolean = False) As MethodBodySemanticModel
Return New MethodBodySemanticModel(binder.Root, binder, isSupressingAccessChecks:=isSupressingAccessChecks)
Friend Shared Function Create(binder As MethodBodyBinder, Optional isSuppressingAccessChecks As Boolean = False) As MethodBodySemanticModel
Return New MethodBodySemanticModel(binder.Root, binder, isSuppressingAccessChecks:=isSuppressingAccessChecks)
End Function

''' <summary>
Expand Down Expand Up @@ -91,8 +91,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Friend NotInheritable Class TopLevelCodeSemanticModel
Inherits MemberSemanticModel

Public Sub New(binder As TopLevelCodeBinder, Optional isSupressingAccessChecks As Boolean = False)
MyBase.New(binder.Root, binder, parentSemanticModelOpt:=Nothing, speculatedPosition:=0, isSupressingAccessChecks:=isSupressingAccessChecks)
Public Sub New(binder As TopLevelCodeBinder, Optional isSuppressingAccessChecks As Boolean = False)
MyBase.New(binder.Root, binder, parentSemanticModelOpt:=Nothing, speculatedPosition:=0, isSuppressingAccessChecks:=isSuppressingAccessChecks)
End Sub

Friend Overrides Function TryGetSpeculativeSemanticModelForMethodBodyCore(parentModel As SyntaxTreeSemanticModel, position As Integer, method As MethodBlockBaseSyntax, <Out> ByRef speculativeModel As SemanticModel) As Boolean
Expand Down
Expand Up @@ -6196,14 +6196,14 @@ C:\*.vb(100) : error BC30451: 'Foo' is not declared. It may be inaccessible due
Assert.Contains("warning BC42376", output)

' TEST: Verify /nowarn doesn't override /warnaserror: in the case of custom hidden diagnostics.
' Although the compiler normally supresses printing of hidden diagnostics in the compiler output, they are never really suppressed
' Although the compiler normally suppresses printing of hidden diagnostics in the compiler output, they are never really suppressed
' because in the IDE features that rely on hidden diagnostics to display light bulb need to continue to work even when users have global
' suppression (/nowarn) specified in their project. In other words, /nowarn flag is a no-op for hidden diagnostics.
output = VerifyOutput(dir, file, additionalFlags:={"/nowarn", "/warnaserror:Hidden01"}, expectedErrorCount:=1)
Assert.Contains("a.vb(2) : error Hidden01: Throwing a diagnostic for #ExternalSource", output)

' TEST: Verify /nowarn doesn't override /warnaserror: in the case of custom hidden diagnostics.
' Although the compiler normally supresses printing of hidden diagnostics in the compiler output, they are never really suppressed
' Although the compiler normally suppresses printing of hidden diagnostics in the compiler output, they are never really suppressed
' because in the IDE features that rely on hidden diagnostics to display light bulb need to continue to work even when users have global
' suppression (/nowarn) specified in their project. In other words, /nowarn flag is a no-op for hidden diagnostics.
output = VerifyOutput(dir, file, additionalFlags:={"/warnaserror:HIDDen01", "/nowarn"}, expectedErrorCount:=1)
Expand Down
Expand Up @@ -120,7 +120,7 @@
<Compile Include="Binding\MethodBodyBindingTests.vb" />
<Compile Include="Binding\SyncLockTests.vb" />
<Compile Include="Binding\UsingTests.vb" />
<Compile Include="Compilation\SupressAccessibilityChecksTests.vb" />
<Compile Include="Compilation\SuppressAccessibilityChecksTests.vb" />
<Compile Include="Compilation\CompilationAPITests.vb" />
<Compile Include="Compilation\GetSemanticInfoBrokenCodeTests.vb" />
<Compile Include="Compilation\MyTemplateTests.vb" />
Expand Down Expand Up @@ -251,4 +251,4 @@
<Import Project="..\..\..\..\..\build\Roslyn.Toolsets.Xunit.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</ImportGroup>
</Project>
</Project>
Expand Up @@ -7,7 +7,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.UnitTests
Imports Xunit

Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests
Public Class SupressAccessibilityChecksTests
Public Class SuppressAccessibilityChecksTests
Inherits BasicTestBase

Private Function GetSemanticModelWithSuppressAccessChecks() As SemanticModel
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/Test2/Rename/RenameEngineResult.vb
Expand Up @@ -224,7 +224,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
_workspace.Dispose()

' If we failed some other assert, we know we're going to have things left
' over. So let's just supress these so we don't lose the root cause
' over. So let's just suppress these so we don't lose the root cause
If Not _failedAssert Then
If _unassertedRelatedLocations.Count > 0 Then
AssertEx.Fail("There were additional related locations than were unasserted.")
Expand Down
Expand Up @@ -126,7 +126,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit
Dim oldCaretPoint = args.TextView.GetCaretPoint(args.SubjectBuffer)

' When we call nextHandler(), it's possible that some other feature might try to move the caret
' or something similar. We want this "outer" commit to be the real one, so start supressing any
' or something similar. We want this "outer" commit to be the real one, so start suppressing any
' re-entrant commits.
Dim suppressionHandle = bufferManager.BeginSuppressingCommits()

Expand Down
4 changes: 2 additions & 2 deletions src/Features/Core/CodeFixes/CodeFixService.cs
Expand Up @@ -54,7 +54,7 @@ internal partial class CodeFixService : ICodeFixService
var suppressionProvidersPerLanguageMap = suppressionProviders.ToPerLanguageMapWithMultipleLanguages();

_workspaceFixersMap = GetFixerPerLanguageMap(fixersPerLanguageMap);
_suppressionProvidersMap = GetSupressionProvidersPerLanguageMap(suppressionProvidersPerLanguageMap);
_suppressionProvidersMap = GetSuppressionProvidersPerLanguageMap(suppressionProvidersPerLanguageMap);

// REVIEW: currently, fixer's priority is statically defined by the fixer itself. might considering making it more dynamic or configurable.
_fixerPriorityMap = GetFixerPriorityPerLanguageMap(fixersPerLanguageMap);
Expand Down Expand Up @@ -432,7 +432,7 @@ private ImmutableArray<DiagnosticId> GetFixableDiagnosticIds(CodeFixProvider fix
return fixerMap;
}

private static ImmutableDictionary<LanguageKind, Lazy<ISuppressionFixProvider>> GetSupressionProvidersPerLanguageMap(
private static ImmutableDictionary<LanguageKind, Lazy<ISuppressionFixProvider>> GetSuppressionProvidersPerLanguageMap(
Dictionary<LanguageKind, List<Lazy<ISuppressionFixProvider, CodeChangeProviderMetadata>>> suppressionProvidersPerLanguage)
{
var suppressionFixerMap = ImmutableDictionary.Create<LanguageKind, Lazy<ISuppressionFixProvider>>();
Expand Down
Expand Up @@ -111,8 +111,8 @@ protected override CSharpCompilationOptions CreateCompilationOptions()
UpdateWarning(warningOptions, CompilerOptions.OPTID_WARNASERRORLIST, ReportDiagnostic.Error);
UpdateWarning(warningOptions, CompilerOptions.OPTID_WARNNOTASERRORLIST, ReportDiagnostic.Warn);

// Add the warning supressions second, since the if a warning appears in both lists the
// supression takes priority
// Add the warning suppressions second, since the if a warning appears in both lists the
// suppression takes priority
UpdateWarning(warningOptions, CompilerOptions.OPTID_NOWARNLIST, ReportDiagnostic.Suppress);

Platform platform;
Expand Down

0 comments on commit 22329d0

Please sign in to comment.