Merge branch 'master' into condensed_fields

Author: MichaelHatherly

src/abbreviations.jl

@@ -388,7 +388,7 @@ function format(::TypedMethodSignatures, buf, doc)
                 end
             end
 
-            if Sys.iswindows()
+            @static if Sys.iswindows() && VERSION < v"1.8"
                 t = tuples[findlast(f, tuples)]
             else
                 t = tuples[findfirst(f, tuples)]

src/utilities.jl

@@ -419,7 +419,7 @@ function keywords(func, m::Method)
     # table is a MethodTable object. For some reason, the :kwsorter field is not always
     # defined. An undefined kwsorter seems to imply that there are no methods in the
     # MethodTable with keyword arguments.
-    if isdefined(table, :kwsorter)
+    if  !(Base.fieldindex(Core.MethodTable, :kwsorter, false) > 0) || isdefined(table, :kwsorter)
         # Fetching method keywords stolen from base/replutil.jl:572-576 (commit 3b45cdc9aab0):
         kwargs = VERSION < v"1.4.0-DEV.215" ? Base.kwarg_decl(m, typeof(table.kwsorter)) : Base.kwarg_decl(m)
         if isa(kwargs, Vector) && length(kwargs) > 0
@@ -463,7 +463,7 @@ function arguments(m::Method)
         local args = map(argnames[1:nargs(m)]) do arg
             arg === Symbol("#unused#") ? "_" : arg
         end
-        return filter(arg -> arg !== Symbol("#self#"), args)
+        return filter(arg -> arg !== Symbol("#self#") && arg !== Symbol("#ctor-self#"), args)
     end
     return Symbol[]
 end

test/tests.jl

@@ -42,7 +42,9 @@ end
         @test isdefined(methods(M.j_1), :mt)
         local mt = methods(M.j_1).mt
         @test isa(mt, Core.MethodTable)
-        @test isdefined(mt, :kwsorter)
+        if Base.fieldindex(Core.MethodTable, :kwsorter, false) > 0
+            @test isdefined(mt, :kwsorter)
+        end
         # .kwsorter is not always defined -- namely, it seems when none of the methods
         # have keyword arguments:
         @test isdefined(methods(M.f).mt, :kwsorter) === false
@@ -200,10 +202,8 @@ end
             @test occursin("\n```julia\n", str)
             f = str -> replace(str, " " => "")
             str = f(str)
-
-            if VERSION < v"1.1" && Sys.iswindows()
-                # on Windows, Julia 1.0 sorts Array{T,n} within Union in reverse order
-                @test_broken occursin(f("h_1(\nx::Union{Array{T,3}, Array{T,4}} where T\n) -> Union{Array{T,3}, Array{T,4}} where T"), str)
+            if Sys.iswindows() && VERSION < v"1.8"
+                @test occursin(f("h_1(\nx::Union{Array{T,4}, Array{T,3}} where T\n) -> Union{Array{T,4}, Array{T,3}} where T"), str)
             else
                 @test occursin(f("h_1(\nx::Union{Array{T,3}, Array{T,4}} where T\n) -> Union{Array{T,3}, Array{T,4}} where T"), str)
             end