revert some optimizations

Author: rmosolgo

lib/graphql/analysis.rb

@@ -40,9 +40,9 @@ def analyze_multiplex(multiplex, analyzers)
           end
         end
 
+
         multiplex_analyzers.map!(&:result)
         multiplex_errors = analysis_errors(EmptyObjects::EMPTY_ARRAY, multiplex_analyzers)
-
         multiplex.queries.each_with_index do |query, idx|
           query.analysis_errors = analysis_errors(multiplex_errors, query_results[idx])
         end
@@ -56,13 +56,10 @@ def analyze_multiplex(multiplex, analyzers)
     def analyze_query(query, analyzers, multiplex_analyzers: [])
       query.current_trace.analyze_query(query: query) do
         query_analyzers = analyzers.map { |analyzer| analyzer.new(query) }
-
         query_analyzers.select!(&:analyze?)
-
-        analyzers_to_run = multiplex_analyzers.empty? ? query_analyzers : query_analyzers + multiplex_analyzers
+        analyzers_to_run = query_analyzers + multiplex_analyzers
 
         if !analyzers_to_run.empty?
-
           analyzers_to_run.select!(&:visit?)
           if !analyzers_to_run.empty?
             visitor = GraphQL::Analysis::Visitor.new(
@@ -92,7 +89,7 @@ def analyze_query(query, analyzers, multiplex_analyzers: [])
 
     def analysis_errors(parent_errors, results)
       if !results.empty?
-        results.flatten!
+        results = results.flatten
         results.select! { |r| r.is_a?(GraphQL::AnalysisError) }
       end
 

lib/graphql/schema.rb

@@ -1562,7 +1562,7 @@ def query_analyzer(new_analyzer)
 
       def query_analyzers
         inherited_qa = find_inherited_value(:query_analyzers, EMPTY_ARRAY)
-        inherited_qa.length > 0 ? (inherited_qa + own_query_analyzers) : own_query_analyzers
+        inherited_qa.empty? ? own_query_analyzers : (inherited_qa + own_query_analyzers)
       end
 
       # @param new_analyzer [Class<GraphQL::Analysis::Analyzer>] An analyzer to run on multiplexes to this schema

spec/graphql/schema/directive_spec.rb

@@ -187,7 +187,7 @@ module HasThings
       field :thing, Thing, null: false, extras: [:ast_node], resolve_static: true
 
       def thing(ast_node:)
-        self.class.thing(ast_node: ast_node)
+        self.class.thing(context, ast_node: ast_node)
       end
 
       resolver_methods do