Merge pull request dotnet#69329 from DoctorKrolic/forbid-void-parameter

Forbid declaring parameters of `void` type in 'Change Signature'->"Add parameter" dialog
dibarbet · Aug 4, 2023 · fdf726c · fdf726c
2 parents 0602129 + 454478c
commit fdf726c
Show file tree

Hide file tree

Showing 17 changed files with 129 additions and 19 deletions.
diff --git a/src/VisualStudio/Core/Def/ChangeSignature/AddParameterDialog.xaml b/src/VisualStudio/Core/Def/ChangeSignature/AddParameterDialog.xaml
@@ -49,7 +49,7 @@
                      AutomationProperties.LabeledBy="{Binding ElementName=TypeNameLabelName}"/>
                     <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,5,0,5">
                         <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.StatusInformation}" Visibility="{Binding TypeIsEmptyImage, Mode=OneWay}"/>
-                        <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.StatusError}" Visibility="{Binding TypeDoesNotParseImage, Mode=OneWay}"/>
+                        <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.StatusError}" Visibility="{Binding TypeDoesNotParseOrInvalidTypeImage, Mode=OneWay}"/>
                         <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.StatusOK}" Visibility="{Binding TypeBindsImage, Mode=OneWay}"/>
                         <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.StatusWarning}" Visibility="{Binding TypeDoesNotBindImage, Mode=OneWay}"/>
                         <vs:LiveTextBlock Padding="5 0 0 0" Grid.Row="2" x:Name="TypeBindsTextBlock"

diff --git a/src/VisualStudio/Core/Def/ChangeSignature/AddParameterDialogViewModel.cs b/src/VisualStudio/Core/Def/ChangeSignature/AddParameterDialogViewModel.cs
@@ -30,7 +30,7 @@ public AddParameterDialogViewModel(Document document, int positionForTypeBinding
 
             TypeIsEmptyImage = Visibility.Visible;
             TypeBindsImage = Visibility.Collapsed;
-            TypeDoesNotParseImage = Visibility.Collapsed;
+            TypeDoesNotParseOrInvalidTypeImage = Visibility.Collapsed;
             TypeDoesNotBindImage = Visibility.Collapsed;
             TypeBindsDynamicStatus = ServicesVSResources.Please_enter_a_type_name;
 
@@ -104,7 +104,7 @@ public bool IsOptional
         public string TypeBindsDynamicStatus { get; set; }
         public Visibility TypeBindsImage { get; set; }
         public Visibility TypeDoesNotBindImage { get; set; }
-        public Visibility TypeDoesNotParseImage { get; set; }
+        public Visibility TypeDoesNotParseOrInvalidTypeImage { get; set; }
         public Visibility TypeIsEmptyImage { get; set; }
 
         private string _verbatimTypeName = string.Empty;
@@ -120,6 +120,8 @@ public string VerbatimTypeName
             }
         }
 
+        private bool _isVoidParameterType;
+
         internal bool CanSubmit([NotNullWhen(false)] out string? message)
         {
             if (string.IsNullOrEmpty(VerbatimTypeName) || string.IsNullOrEmpty(ParameterName))
@@ -128,6 +130,12 @@ internal bool CanSubmit([NotNullWhen(false)] out string? message)
                 return false;
             }
 
+            if (_isVoidParameterType)
+            {
+                message = ServicesVSResources.SystemVoid_is_not_a_valid_type_for_a_parameter;
+                return false;
+            }
+
             if (TypeSymbol == null || !IsParameterTypeSyntacticallyValid(VerbatimTypeName))
             {
                 message = ServicesVSResources.Parameter_type_contains_invalid_characters;
@@ -175,11 +183,12 @@ private void SendFailureNotification(string message)
         private void SetCurrentTypeTextAndUpdateBindingStatus(string typeName)
         {
             VerbatimTypeName = typeName;
+            _isVoidParameterType = false;
 
             if (string.IsNullOrWhiteSpace(typeName))
             {
                 TypeIsEmptyImage = Visibility.Visible;
-                TypeDoesNotParseImage = Visibility.Collapsed;
+                TypeDoesNotParseOrInvalidTypeImage = Visibility.Collapsed;
                 TypeDoesNotBindImage = Visibility.Collapsed;
                 TypeBindsImage = Visibility.Collapsed;
                 TypeBindsDynamicStatus = ServicesVSResources.Please_enter_a_type_name;
@@ -193,18 +202,25 @@ private void SetCurrentTypeTextAndUpdateBindingStatus(string typeName)
                 var languageService = Document.GetRequiredLanguageService<IChangeSignatureViewModelFactoryService>();
                 TypeSymbol = _semanticModel.GetSpeculativeTypeInfo(PositionForTypeBinding, languageService.GetTypeNode(typeName), SpeculativeBindingOption.BindAsTypeOrNamespace).Type;
 
-                var typeParses = IsParameterTypeSyntacticallyValid(typeName);
-                if (!typeParses || TypeSymbol == null)
+                if (TypeSymbol is { SpecialType: SpecialType.System_Void })
+                {
+                    _isVoidParameterType = true;
+                    TypeDoesNotParseOrInvalidTypeImage = Visibility.Visible;
+                    TypeDoesNotBindImage = Visibility.Collapsed;
+                    TypeBindsImage = Visibility.Collapsed;
+                    TypeBindsDynamicStatus = ServicesVSResources.SystemVoid_is_not_a_valid_type_for_a_parameter;
+                }
+                else if (!IsParameterTypeSyntacticallyValid(typeName) || TypeSymbol == null)
                 {
-                    TypeDoesNotParseImage = Visibility.Visible;
+                    TypeDoesNotParseOrInvalidTypeImage = Visibility.Visible;
                     TypeDoesNotBindImage = Visibility.Collapsed;
                     TypeBindsImage = Visibility.Collapsed;
                     TypeBindsDynamicStatus = ServicesVSResources.Type_name_has_a_syntax_error;
                 }
                 else
                 {
                     var parameterTypeBinds = DoesTypeFullyBind(TypeSymbol);
-                    TypeDoesNotParseImage = Visibility.Collapsed;
+                    TypeDoesNotParseOrInvalidTypeImage = Visibility.Collapsed;
 
                     TypeBindsImage = parameterTypeBinds ? Visibility.Visible : Visibility.Collapsed;
                     TypeDoesNotBindImage = !parameterTypeBinds ? Visibility.Visible : Visibility.Collapsed;
@@ -217,7 +233,7 @@ private void SetCurrentTypeTextAndUpdateBindingStatus(string typeName)
             NotifyPropertyChanged(nameof(TypeBindsDynamicStatus));
             NotifyPropertyChanged(nameof(TypeBindsImage));
             NotifyPropertyChanged(nameof(TypeDoesNotBindImage));
-            NotifyPropertyChanged(nameof(TypeDoesNotParseImage));
+            NotifyPropertyChanged(nameof(TypeDoesNotParseOrInvalidTypeImage));
             NotifyPropertyChanged(nameof(TypeIsEmptyImage));
         }
 

diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -2025,4 +2025,8 @@ Additional information: {1}</value>
   <data name="Prefer_collection_expression" xml:space="preserve">
     <value>Prefer collection expression</value>
   </data>
+  <data name="SystemVoid_is_not_a_valid_type_for_a_parameter" xml:space="preserve">
+    <value>'System.Void' is not a valid type for a parameter</value>
+    <comment>{Locked="System.Void"} "System.Void" represents CLR's type and should not be localized</comment>
+  </data>
 </root>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf