Allow XML documentation predefined types to be used with parameters for methods

diff --git a/mcs/mcs/cs-tokenizer.cs b/mcs/mcs/cs-tokenizer.cs
index eccbddd4fadcd9faf858ec36f843c27adbfd774a..9791f6c3251195debb7045dbfb6af487f1596d6c 100644 (file)
--- a/mcs/mcs/cs-tokenizer.cs
+++ b/mcs/mcs/cs-tokenizer.cs
@@ -3089,7 +3089,8 @@ namespace Mono.CSharp
                                                                                WarningMisplacedComment (Location - 3);
                                                                }
                                                        } else {
-                                                               check_incorrect_doc_comment ();
+                                                               if (xml_comment_buffer.Length > 0)
+                                                                       doc_state = XmlCommentState.NotAllowed;
                                                        }
                                                }
 

diff --git a/mcs/mcs/doc.cs b/mcs/mcs/doc.cs
index fd4e394b75b1286fda8ea715ff91bc7e5053a20c..c9e414d86842d14724622740ccb7ba399c34ae8e 100644 (file)
--- a/mcs/mcs/doc.cs
+++ b/mcs/mcs/doc.cs
@@ -302,7 +302,7 @@ namespace Mono.CSharp
                        // Try built-in type first because we are using ParsedName as identifier of
                        // member names on built-in types
                        //
-                       if (ParsedBuiltinType != null && ParsedParameters == null) {
+                       if (ParsedBuiltinType != null && (ParsedParameters == null || ParsedName != null)) {
                                member = ParsedBuiltinType.Type;
                        } else {
                                member = null;

diff --git a/mcs/tests/known-issues-net_4_0 b/mcs/tests/known-issues-net_4_0
index 47f97bea1076a121a51380e9746ba41986c8a131..05ff2071ba225390dab0c3de1a4ccf9d4a9e66c2 100644 (file)
--- a/mcs/tests/known-issues-net_4_0
+++ b/mcs/tests/known-issues-net_4_0
@@ -8,5 +8,3 @@ gtest-230.cs
 gtest-437.cs
 
 test-106.cs bug #628662
-
-test-xml-030.cs