Merge pull request #4710 from Unity-Technologies/additional-config-checks

[mono.git] / mcs / mcs / doc.cs

diff --git a/mcs/mcs/doc.cs b/mcs/mcs/doc.cs
index 541480b3d920a6cbb25c04c4cbe82c2923a3644e..0e5ec2265670238c72227b86387cc80a61613da6 100644 (file)
--- a/mcs/mcs/doc.cs
+++ b/mcs/mcs/doc.cs
@@ -92,22 +92,9 @@ namespace Mono.CSharp
                                el.SetAttribute ("name", name);
                                string normalized = mc.DocComment;
                                el.InnerXml = normalized;
-                               // csc keeps lines as written in the sources
-                               // and inserts formatting indentation (which 
-                               // is different from XmlTextWriter.Formatting
-                               // one), but when a start tag contains an 
-                               // endline, it joins the next line. We don't
-                               // have to follow such a hacky behavior.
-                               string [] split =
-                                       normalized.Split ('\n');
-                               int j = 0;
-                               for (int i = 0; i < split.Length; i++) {
-                                       string s = split [i].TrimEnd ();
-                                       if (s.Length > 0)
-                                               split [j++] = s;
-                               }
-                               el.InnerXml = line_head + String.Join (
-                                       line_head, split, 0, j);
+
+                               string [] split = normalized.Split ('\n');
+                               el.InnerXml = line_head + String.Join (line_head, split);
                                return el;
                        } catch (Exception ex) {
                                Report.Warning (1570, 1, mc.Location, "XML documentation comment on `{0}' is not well-formed XML markup ({1})",
@@ -303,7 +290,7 @@ namespace Mono.CSharp
 
                        TypeExpr texpr = left as TypeExpr;
                        if (texpr != null) {
-                               var found = MemberCache.FindNestedType (texpr.Type, mn.Name, mn.Arity);
+                               var found = MemberCache.FindNestedType (texpr.Type, mn.Name, mn.Arity, false);
                                if (found != null)
                                        return new TypeExpression (found, Location.Null);
 
@@ -438,10 +425,7 @@ namespace Mono.CSharp
 
                                        int parameters_match = -1;
                                        do {
-                                               //
-                                               // Include base type search only for interface types
-                                               //
-                                               var members = MemberCache.FindMembers (type, member_name, !(type.IsInterface && ParsedName.Left == null));
+                                               var members = MemberCache.FindMembers (type, member_name, true);
                                                if (members != null) {
                                                        foreach (var m in members) {
                                                                if (ParsedName != null && m.Arity != ParsedName.Arity)
@@ -698,7 +682,7 @@ namespace Mono.CSharp
                        return host.GetSignatureForError ();
                }
 
-               public ExtensionMethodCandidates LookupExtensionMethod (TypeSpec extensionType, string name, int arity)
+               public ExtensionMethodCandidates LookupExtensionMethod (string name, int arity)
                {
                        return null;
                }