Reorder methods to include core after other classes.

castwide · Jan 19, 2020 · 5b469f9 · 5b469f9
1 parent 3535802
commit 5b469f9
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
@@ -573,22 +573,27 @@ def inner_get_methods fqns, scope, visibility, deep, skip, no_core = false
             fqim = qualify(im, fqns)
             result.concat inner_get_methods(fqim, scope, visibility, deep, skip, true) unless fqim.nil?
           end
+          sc = store.get_superclass(fqns)
+          unless sc.nil?
+            fqsc = qualify(sc, fqns.split('::')[0..-2].join('::'))
+            result.concat inner_get_methods(fqsc, scope, visibility, true, skip, no_core) unless fqsc.nil?
+          end
         else
           store.get_extends(fqns).reverse.each do |em|
             fqem = qualify(em, fqns)
             result.concat inner_get_methods(fqem, :instance, visibility, deep, skip, true) unless fqem.nil?
           end
+          sc = store.get_superclass(fqns)
+          unless sc.nil?
+            fqsc = qualify(sc, fqns.split('::')[0..-2].join('::'))
+            result.concat inner_get_methods(fqsc, scope, visibility, true, skip, true) unless fqsc.nil?
+          end
           unless no_core || fqns.empty?
             type = get_namespace_type(fqns)
             result.concat inner_get_methods('Class', :instance, visibility, deep, skip, no_core) if type == :class
             result.concat inner_get_methods('Module', :instance, visibility, deep, skip, no_core)
           end
         end
-        sc = store.get_superclass(fqns)
-        unless sc.nil?
-          fqsc = qualify(sc, fqns.split('::')[0..-2].join('::'))
-          result.concat inner_get_methods(fqsc, scope, visibility, true, skip, no_core) unless fqsc.nil?
-        end
         store.domains(fqns).each do |d|
           dt = ComplexType.try_parse(d)
           result.concat inner_get_methods(dt.namespace, dt.scope, [:public], deep, skip)