Merge pull request #3 from allisonchou/AddParameterOptionalDavid

Fix crash bug when entering name before type and clicking OK
dotnet · Feb 13, 2020 · 548c943 · 548c943
2 parents f065ad3 + 482738a
commit 548c943
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/VisualStudio/Core/Def/Implementation/ChangeSignature/AddParameterDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/ChangeSignature/AddParameterDialogViewModel.cs
@@ -42,11 +42,11 @@ public AddParameterDialogViewModel(Document document, int insertPosition)
 
         public ITypeSymbol? TypeSymbol { get; set; }
 
-        public string TypeName
+        public string? TypeName
         {
             get
             {
-                return TypeSymbol!.ToDisplayString(_symbolDisplayFormat);
+                return TypeSymbol?.ToDisplayString(_symbolDisplayFormat);
             }
         }
 
@@ -67,13 +67,13 @@ internal void UpdateTypeSymbol(string typeName)
 
         internal bool TrySubmit(Document document)
         {
-            if (string.IsNullOrEmpty(ParameterName) || string.IsNullOrEmpty(TypeName))
+            if (string.IsNullOrEmpty(TypeName) || string.IsNullOrEmpty(ParameterName))
             {
                 SendFailureNotification(ServicesVSResources.A_type_and_name_must_be_provided);
                 return false;
             }
 
-            if (!IsParameterTypeValid(TypeName, document))
+            if (!IsParameterTypeValid(TypeName!, document))
             {
                 SendFailureNotification(ServicesVSResources.Parameter_type_contains_invalid_characters);
                 return false;