From d3a45cffd606507e76341285150e4484202cb625 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 20 Feb 2026 23:06:41 -0600 Subject: [PATCH 1/2] Update config, fix lints for ruff 0.15.2 --- pyproject.toml | 4 ++++ sumpy/__init__.py | 1 - sumpy/codegen.py | 16 +++++++++---- sumpy/distributed.py | 15 +++++------- sumpy/e2e.py | 44 +++++++++++------------------------- sumpy/e2p.py | 21 +++++------------ sumpy/expansion/__init__.py | 6 ++--- sumpy/expansion/m2l.py | 40 +++++++++----------------------- sumpy/fmm.py | 10 ++++---- sumpy/kernel.py | 28 +++++++++++------------ sumpy/p2e.py | 20 +++++----------- sumpy/p2p.py | 12 ++++------ sumpy/point_calculus.py | 3 +-- sumpy/qbx.py | 13 ++++------- sumpy/symbolic.py | 1 - sumpy/test/curve.py | 2 +- sumpy/test/geometries.py | 2 +- sumpy/test/test_fmm.py | 2 +- sumpy/test/test_kernels.py | 2 +- sumpy/test/test_matrixgen.py | 2 +- sumpy/test/test_misc.py | 3 +-- sumpy/tools.py | 9 ++++---- sumpy/toys.py | 3 +-- 23 files changed, 96 insertions(+), 163 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a0a255c4..3233fc0e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,6 +102,8 @@ extend-ignore = [ "E226", # missing whitespace around arithmetic operator "E402", # module-level import not at top of file "RUF067", # non-empty-init-module + "TRY004", + "TRY300", ] [tool.ruff.lint.flake8-quotes] @@ -127,6 +129,8 @@ required-imports = ["from __future__ import annotations"] [tool.ruff.lint.per-file-ignores] "doc/**/*.py" = ["I002"] "examples/**/*.py" = ["I002"] +"sumpy/test/test_*.py" = ["S102"] +"doc/conf.py" = ["S102"] [tool.typos.default] extend-ignore-re = [ diff --git a/sumpy/__init__.py b/sumpy/__init__.py index 3acd93aa..f2dc45ab 100644 --- a/sumpy/__init__.py +++ b/sumpy/__init__.py @@ -114,7 +114,6 @@ def __init__(self, new_flag, new_no_cache_kernels=()): self.new_no_cache_kernels = new_no_cache_kernels def __enter__(self): - global CACHING_ENABLED, NO_CACHE_KERNELS self.previous_flag = CACHING_ENABLED self.previous_kernels = NO_CACHE_KERNELS set_caching_enabled(self.new_flag, self.new_no_cache_kernels) diff --git a/sumpy/codegen.py b/sumpy/codegen.py index 25e829f2..15743627 100644 --- a/sumpy/codegen.py +++ b/sumpy/codegen.py @@ -44,7 +44,14 @@ if TYPE_CHECKING: - from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence, Set + from collections.abc import ( + Callable, + Iterable, + Iterator, + Mapping, + Sequence, + Set as AbstractSet, + ) from numpy.typing import DTypeLike @@ -730,10 +737,10 @@ def map_common_subexpression_uncached( def to_loopy_insns( assignments: Iterable[tuple[str, sym.Expr]], - vector_names: Set[str] | None = None, + vector_names: AbstractSet[str] | None = None, pymbolic_expr_maps: Sequence[Callable[[Expression], Expression]] = (), complex_dtype: DTypeLike | None = None, - retain_names: Set[str] | None = None, + retain_names: AbstractSet[str] | None = None, ) -> Sequence[Assignment | CallInstruction]: if vector_names is None: vector_names = frozenset() @@ -771,8 +778,7 @@ def cmb_mapper(expr: Expression, /) -> Expression: expr = ssg(expr) expr = bik(expr) expr = cmr(expr) - expr = btog(expr) - return expr + return btog(expr) def convert_expr(name: str, expr: Expression) -> Expression: logger.debug("generate expression for: %s", name) diff --git a/sumpy/distributed.py b/sumpy/distributed.py index a7a5e194..b6f6e110 100644 --- a/sumpy/distributed.py +++ b/sumpy/distributed.py @@ -27,7 +27,7 @@ from boxtree.distributed.calculation import DistributedExpansionWranglerMixin -import pytools.obj_array as obj_array +from pytools import obj_array from sumpy.fmm import SumpyExpansionWrangler @@ -61,23 +61,20 @@ def distribute_source_weights(self, local_src_weight_vecs_host = super().distribute_source_weights( actx, src_weight_vecs_host, src_idx_all_ranks) - local_src_weight_vecs_device = [ + return [ actx.from_numpy(local_src_weight) for local_src_weight in local_src_weight_vecs_host] - return local_src_weight_vecs_device - def gather_potential_results(self, actx: ArrayContext, potentials, tgt_idx_all_ranks): potentials_host_vec = [ actx.to_numpy(potentials_dev) for potentials_dev in potentials ] - gathered_potentials_host_vec = [] - for potentials_host in potentials_host_vec: - gathered_potentials_host_vec.append( - super().gather_potential_results( - actx, potentials_host, tgt_idx_all_ranks)) + gathered_potentials_host_vec = [ + super().gather_potential_results( + actx, potentials_host, tgt_idx_all_ranks) + for potentials_host in potentials_host_vec] if self.is_mpi_root: return obj_array.new_1d([ diff --git a/sumpy/e2e.py b/sumpy/e2e.py index 34b888de..10445272 100644 --- a/sumpy/e2e.py +++ b/sumpy/e2e.py @@ -135,15 +135,15 @@ def get_cache_key(self): return (type(self).__name__, self.src_expansion, self.tgt_expansion) @abstractmethod - def get_kernel(self): + @override + def get_kernel(self) -> lp.TranslationUnit: pass def get_optimized_kernel(self): # FIXME knl = self.get_kernel() - knl = lp.split_iname(knl, "itgt_box", 64, outer_tag="g.0", inner_tag="l.0") + return lp.split_iname(knl, "itgt_box", 64, outer_tag="g.0", inner_tag="l.0") - return knl # }}} @@ -259,18 +259,14 @@ def get_kernel(self): loopy_knl = knl.prepare_loopy_kernel(loopy_knl) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") - loopy_knl = lp.set_options(loopy_knl, + return lp.set_options(loopy_knl, enforce_variable_access_ordered="no_check") - return loopy_knl - @override def get_optimized_kernel(self): # FIXME knl = self.get_kernel() - knl = lp.split_iname(knl, "itgt_box", 64, outer_tag="g.0", inner_tag="l.0") - - return knl + return lp.split_iname(knl, "itgt_box", 64, outer_tag="g.0", inner_tag="l.0") def __call__(self, actx: ArrayContext, **kwargs): """ @@ -511,11 +507,9 @@ def get_kernel(self, result_dtype): def get_optimized_kernel(self, result_dtype): knl = self.get_kernel(result_dtype) - knl = self.tgt_expansion.m2l_translation.optimize_loopy_kernel( + return self.tgt_expansion.m2l_translation.optimize_loopy_kernel( knl, self.tgt_expansion, self.src_expansion) - return knl - def __call__(self, actx: ArrayContext, **kwargs): """ :arg src_expansions: @@ -612,22 +606,18 @@ def get_kernel(self, result_dtype): loopy_knl = lp.merge([loopy_knl, translation_classes_data_knl]) loopy_knl = lp.inline_callable_kernel(loopy_knl, "m2l_data") - loopy_knl = lp.set_options(loopy_knl, + return lp.set_options(loopy_knl, enforce_variable_access_ordered="no_check", # FIXME: Without this, Loopy spends an eternity checking # scattered writes to global variables to see whether barriers # need to be inserted. disable_global_barriers=True) - return loopy_knl - def get_optimized_kernel(self, result_dtype): # FIXME knl = self.get_kernel(result_dtype) knl = lp.tag_inames(knl, "idim*:unr") - knl = lp.tag_inames(knl, {"itr_class": "g.0"}) - - return knl + return lp.tag_inames(knl, {"itr_class": "g.0"}) def __call__(self, actx: ArrayContext, **kwargs): """ @@ -722,9 +712,7 @@ def get_kernel(self, result_dtype): loopy_knl = expn.prepare_loopy_kernel(loopy_knl) loopy_knl = lp.merge([loopy_knl, single_box_preprocess_knl]) - loopy_knl = lp.inline_callable_kernel(loopy_knl, "m2l_preprocess_inner") - - return loopy_knl + return lp.inline_callable_kernel(loopy_knl, "m2l_preprocess_inner") def get_optimized_kernel(self, result_dtype): knl = self.get_kernel(result_dtype) @@ -822,9 +810,8 @@ def get_kernel(self, result_dtype): loopy_knl = lp.merge([loopy_knl, single_box_postprocess_knl]) loopy_knl = lp.inline_callable_kernel(loopy_knl, "m2l_postprocess_inner") - loopy_knl = lp.set_options(loopy_knl, + return lp.set_options(loopy_knl, enforce_variable_access_ordered="no_check") - return loopy_knl def get_optimized_kernel(self, result_dtype): knl = self.get_kernel(result_dtype) @@ -832,8 +819,7 @@ def get_optimized_kernel(self, result_dtype): _, optimizations = self.get_inner_knl_and_optimizations(result_dtype) for optimization in optimizations: knl = optimization(knl) - knl = lp.add_inames_for_unused_hw_axes(knl) - return knl + return lp.add_inames_for_unused_hw_axes(knl) def __call__(self, actx: ArrayContext, **kwargs): """ @@ -943,11 +929,9 @@ def get_kernel(self): loopy_knl = knl.prepare_loopy_kernel(loopy_knl) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") - loopy_knl = lp.set_options(loopy_knl, + return lp.set_options(loopy_knl, enforce_variable_access_ordered="no_check") - return loopy_knl - def __call__(self, actx: ArrayContext, **kwargs): """ :arg src_expansions: @@ -1050,11 +1034,9 @@ def get_kernel(self): loopy_knl = knl.prepare_loopy_kernel(loopy_knl) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") - loopy_knl = lp.set_options(loopy_knl, + return lp.set_options(loopy_knl, enforce_variable_access_ordered="no_check") - return loopy_knl - def __call__(self, actx: ArrayContext, **kwargs): """ :arg src_expansions: diff --git a/sumpy/e2p.py b/sumpy/e2p.py index 400d7b44..c4ad36d8 100644 --- a/sumpy/e2p.py +++ b/sumpy/e2p.py @@ -29,8 +29,8 @@ import numpy as np import loopy as lp -import pytools.obj_array as obj_array from loopy.version import MOST_RECENT_LANGUAGE_VERSION # noqa: F401 +from pytools import obj_array from sumpy.array_context import make_loopy_program from sumpy.tools import KernelCacheMixin, gather_loopy_arguments @@ -101,8 +101,7 @@ def add_loopy_eval_callable( loopy_knl = lp.remove_unused_inames(loopy_knl) for kernel in self.kernels: loopy_knl = kernel.prepare_loopy_kernel(loopy_knl) - loopy_knl = lp.tag_array_axes(loopy_knl, "targets", "sep,C") - return loopy_knl + return lp.tag_array_axes(loopy_knl, "targets", "sep,C") def get_loopy_args(self): return gather_loopy_arguments((self.expansion, *tuple(self.kernels))) @@ -194,20 +193,16 @@ def get_kernel(self): loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") loopy_knl = lp.tag_inames(loopy_knl, "iknl*:unr") - loopy_knl = self.add_loopy_eval_callable(loopy_knl) - - return loopy_knl + return self.add_loopy_eval_callable(loopy_knl) def get_optimized_kernel(self): # FIXME knl = self.get_kernel() knl = lp.tag_inames(knl, {"itgt_box": "g.0"}) knl = lp.add_inames_to_insn(knl, "itgt_box", "id:kernel_scaling") - knl = lp.set_options(knl, + return lp.set_options(knl, enforce_variable_access_ordered="no_check") - return knl - def __call__(self, actx: ArrayContext, **kwargs): """ :arg expansions: @@ -322,20 +317,16 @@ def get_kernel(self): loopy_knl = lp.tag_inames(loopy_knl, "iknl*:unr") loopy_knl = lp.prioritize_loops(loopy_knl, "itgt_box,itgt,isrc_box") loopy_knl = self.add_loopy_eval_callable(loopy_knl) - loopy_knl = lp.tag_array_axes(loopy_knl, "targets", "sep,C") - - return loopy_knl + return lp.tag_array_axes(loopy_knl, "targets", "sep,C") def get_optimized_kernel(self): # FIXME knl = self.get_kernel() knl = lp.tag_inames(knl, {"itgt_box": "g.0"}) knl = lp.add_inames_to_insn(knl, "itgt_box", "id:kernel_scaling") - knl = lp.set_options(knl, + return lp.set_options(knl, enforce_variable_access_ordered="no_check") - return knl - def __call__(self, actx: ArrayContext, **kwargs): centers = kwargs.pop("centers") # "1" may be passed for rscale, which won't have its type diff --git a/sumpy/expansion/__init__.py b/sumpy/expansion/__init__.py index 47087acb..eee9f882 100644 --- a/sumpy/expansion/__init__.py +++ b/sumpy/expansion/__init__.py @@ -333,8 +333,7 @@ def _get_mi_hyperplanes(self) -> list[tuple[int, int]]: axis `d`. """ d = self.dim - 1 - hyperplanes = [(d, const) for const in range(self.order + 1)] - return hyperplanes + return [(d, const) for const in range(self.order + 1)] @memoize_method def _split_coeffs_into_hyperplanes( @@ -648,8 +647,7 @@ def mi_key(ident: MultiIndex | DerivativeIdentifier) -> tuple[int, ...]: mi = ident key = [sum(mi)] - for i in range(dim): - key.append(mi[axis_permutation[i]]) + key.extend(mi[axis_permutation[i]] for i in range(dim)) return tuple(key) diff --git a/sumpy/expansion/m2l.py b/sumpy/expansion/m2l.py index 209b4947..ed42212f 100644 --- a/sumpy/expansion/m2l.py +++ b/sumpy/expansion/m2l.py @@ -385,11 +385,9 @@ def translate(self, # (FIXME? Though this is just the correctness-checking # fallback for the FFT anyhow) result = matvec_toeplitz_upper_triangular(src_coeff_exprs, derivatives) - result = self.postprocess_local_exprs(tgt_expansion, src_expansion, + return self.postprocess_local_exprs(tgt_expansion, src_expansion, result, src_rscale, tgt_rscale, sac) - return result - @override def translation_classes_dependent_ndata(self, tgt_expansion: LocalExpansionBase, @@ -694,13 +692,11 @@ def postprocess_local_exprs(self, # Filter out the dummy rows and scale them for target rscale_ratio = add_to_sac(sac, tgt_rscale/src_rscale) - result = [ + return [ m2l_result[circulant_matrix_ident_to_index[term]] * rscale_ratio**sum(term) for term in tgt_expansion.get_coefficient_identifiers()] - return result - @override def postprocess_local_nexprs(self, tgt_expansion: LocalExpansionBase, @@ -859,9 +855,7 @@ def translate(self, # Returns a big symbolic sum of matrix entries # (FIXME? Though this is just the correctness-checking # fallback for the FFT anyhow) - result = matvec_toeplitz_upper_triangular(src_coeff_exprs, derivatives) - - return result + return matvec_toeplitz_upper_triangular(src_coeff_exprs, derivatives) @override def loopy_translate(self, @@ -896,7 +890,7 @@ def loopy_translate(self, ), ] - knl = lp.make_function( + return lp.make_function( domains, insns, kernel_data=[ @@ -910,8 +904,6 @@ def loopy_translate(self, lang_version=lp.MOST_RECENT_LANGUAGE_VERSION, ) - return knl - # }}} VolumeTaylorM2LWithPreprocessedMultipoles @@ -938,8 +930,7 @@ def translate(self, derivatives = translation_classes_dependent_data assert len(src_coeff_exprs) == len(derivatives) - result = [a*b for a, b in zip(derivatives, src_coeff_exprs, strict=True)] - return result + return [a*b for a, b in zip(derivatives, src_coeff_exprs, strict=True)] @override def translation_classes_dependent_data(self, @@ -1007,9 +998,7 @@ def optimize_loopy_kernel(self, knl = lp.split_iname(knl, "icoeff_tgt", 64, inner_iname="inner", inner_tag="l.0", outer_tag="g.1") - knl = lp.tag_inames(knl, {"itgt_box": "g.0"}) - - return knl + return lp.tag_inames(knl, {"itgt_box": "g.0"}) # }}} VolumeTaylorM2LWithFFT @@ -1044,19 +1033,16 @@ def translate(self, sym.sympify(0)) for j, in tgt_expansion.get_coefficient_identifiers()] - translated_coeffs = self.postprocess_local_exprs(tgt_expansion, + return self.postprocess_local_exprs(tgt_expansion, src_expansion, translated_coeffs, src_rscale, tgt_rscale, sac) - return translated_coeffs - @override def translation_classes_dependent_ndata(self, tgt_expansion: LocalExpansionBase, src_expansion: MultipoleExpansionBase, ) -> int: - nexpr = 2 * tgt_expansion.order + 2 * src_expansion.order + 1 - return nexpr + return 2 * tgt_expansion.order + 2 * src_expansion.order + 1 @override def translation_classes_dependent_data(self, @@ -1155,7 +1141,7 @@ def translate(self, assert translation_classes_dependent_data derivatives = translation_classes_dependent_data - translated_coeffs = [ + return [ sum((derivatives[m + j + tgt_expansion.order + src_expansion.order] * src_coeff_exprs[src_expansion.get_storage_index((m,))] for m, in src_expansion.get_coefficient_identifiers()), @@ -1163,8 +1149,6 @@ def translate(self, for j, in tgt_expansion.get_coefficient_identifiers() ] - return translated_coeffs - @override def loopy_translate(self, tgt_expansion: LocalExpansionBase, @@ -1194,7 +1178,7 @@ def loopy_translate(self, expression=tgt_coeffs[icoeff_tgt] + expr), ] - knl = lp.make_function(domains, insns, + return lp.make_function(domains, insns, kernel_data=[ lp.GlobalArg("tgt_coeffs", shape=lp.auto, is_input=True, is_output=True), @@ -1206,7 +1190,6 @@ def loopy_translate(self, lang_version=lp.MOST_RECENT_LANGUAGE_VERSION, ) - return knl # }}} FourierBesselM2LWithPreprocessedMultipoles @@ -1370,7 +1353,7 @@ def loopy_translation_classes_dependent_data( ) happens_after = frozenset([f"data_{idx}"]) - knl = lp.make_function([], insns, + return lp.make_function([], insns, kernel_data=[ lp.ValueArg("src_rscale", None), lp.GlobalArg("d", None, shape=tgt_expansion.dim), @@ -1382,7 +1365,6 @@ def loopy_translation_classes_dependent_data( lang_version=lp.MOST_RECENT_LANGUAGE_VERSION, ) - return knl # }}} loopy_translation_classes_dependent_data diff --git a/sumpy/fmm.py b/sumpy/fmm.py index 3599995a..c53c40b8 100644 --- a/sumpy/fmm.py +++ b/sumpy/fmm.py @@ -45,8 +45,7 @@ from boxtree.fmm import ExpansionWranglerInterface, TreeIndependentDataForWrangler from boxtree.tree import Tree -import pytools.obj_array as obj_array -from pytools import memoize_in, memoize_method +from pytools import memoize_in, memoize_method, obj_array from sumpy import ( E2EFromChildren, @@ -394,6 +393,7 @@ def tree_level_start_box_nrs(self): # NOTE: a host version of `level_start_box_nrs` is used repeatedly and # this simply caches it to avoid repeated transfers actx = self.tree_indep._setup_actx + assert self.tree.level_start_box_nrs is not None return actx.to_numpy(self.tree.level_start_box_nrs) def _expansions_level_starts(self, order_to_size: Callable[[int], int]): @@ -496,9 +496,8 @@ def m2l_preproc_mpole_expansions_level_starts(self): def order_to_size(order): mpole_expn = self.tree_indep.multipole_expansion(order) local_expn = self.tree_indep.local_expansion(order) - res = local_expn.m2l_translation.preprocess_multipole_nexprs( + return local_expn.m2l_translation.preprocess_multipole_nexprs( local_expn, mpole_expn) - return res return build_csr_level_starts(self.level_orders, order_to_size, level_starts=self.tree_level_start_box_nrs) @@ -773,8 +772,7 @@ def multipole_to_local_precompute(self): inverse=False, wait_for=None)) result.append(m2l_translation_classes_dependent_data_view) - result = [actx.freeze(arr) for arr in result] - return result + return [actx.freeze(arr) for arr in result] def _add_m2l_precompute_kwargs(self, kwargs_for_m2l, lev): diff --git a/sumpy/kernel.py b/sumpy/kernel.py index c3c9981f..b9b448a0 100644 --- a/sumpy/kernel.py +++ b/sumpy/kernel.py @@ -37,7 +37,7 @@ ) import numpy as np -from typing_extensions import override +from typing_extensions import Self, override import loopy as lp import pymbolic.primitives as prim @@ -434,13 +434,11 @@ def get_expression(self, dist_vec: sym.Matrix) -> sym.Expr: f"kernel dim is '{self.dim}' and dist_vec has length '{len(dist_vec)}'") from sumpy.symbolic import Symbol - expr = expr.xreplace({ + return expr.xreplace({ Symbol(f"d{i}"): dist_vec_i for i, dist_vec_i in enumerate(dist_vec) }) - return expr - @override def get_global_scaling_const(self) -> sym.Expr: from sumpy.symbolic import PymbolicToSympyMapperWithSymbols @@ -769,7 +767,7 @@ def __new__(cls, dim: int, icomp: int, jcomp: int, viscosity_mu: float | str | SpatialConstant = "mu", poisson_ratio: float | str | SpatialConstant = "nu", - ) -> ElasticityKernel: + ) -> Self: if poisson_ratio == 0.5: # noqa: RUF069 return super().__new__(StokesletKernel) else: @@ -844,9 +842,9 @@ def get_args(self) -> Sequence[KernelArgument]: from sumpy.tools import get_all_variables variables = get_all_variables(self.viscosity_mu) - args: list[KernelArgument] = [] - for v in variables: - args.append(KernelArgument(loopy_arg=lp.ValueArg(v.name, np.float64))) + args: list[KernelArgument] = [ + KernelArgument(loopy_arg=lp.ValueArg(v.name, np.float64)) + for v in variables] return [*args, *self.get_source_args()] @@ -856,9 +854,9 @@ def get_source_args(self) -> Sequence[KernelArgument]: from sumpy.tools import get_all_variables variables = get_all_variables(self.poisson_ratio) - args: list[KernelArgument] = [] - for v in variables: - args.append(KernelArgument(loopy_arg=lp.ValueArg(v.name, np.float64))) + args: list[KernelArgument] = [ + KernelArgument(loopy_arg=lp.ValueArg(v.name, np.float64)) + for v in variables] return args @@ -884,7 +882,7 @@ def __new__(cls, jcomp: int, viscosity_mu: float | str | SpatialConstant = "mu", poisson_ratio: float | str | SpatialConstant | None = None, - ) -> StokesletKernel: + ) -> Self: return object.__new__(cls) def __init__(self, @@ -1071,9 +1069,9 @@ def get_args(self) -> Sequence[KernelArgument]: *get_all_variables(self.viscosity_mu), *get_all_variables(self.poisson_ratio)] - args: list[KernelArgument] = [] - for v in variables: - args.append(KernelArgument(loopy_arg=lp.ValueArg(v.name, np.float64))) + args: list[KernelArgument] = [ + KernelArgument(loopy_arg=lp.ValueArg(v.name, np.float64)) + for v in variables] return args diff --git a/sumpy/p2e.py b/sumpy/p2e.py index 63d45246..4ae9be98 100644 --- a/sumpy/p2e.py +++ b/sumpy/p2e.py @@ -103,8 +103,7 @@ def add_loopy_form_callable( loopy_knl = lp.remove_unused_inames(loopy_knl) for kernel in self.source_kernels: loopy_knl = kernel.prepare_loopy_kernel(loopy_knl) - loopy_knl = lp.tag_array_axes(loopy_knl, "strengths", "sep,C") - return loopy_knl + return lp.tag_array_axes(loopy_knl, "strengths", "sep,C") def get_loopy_args(self): from sumpy.tools import gather_loopy_source_arguments @@ -124,9 +123,8 @@ def get_optimized_kernel(self, sources_is_obj_array, centers_is_obj_array): knl = lp.tag_array_axes(knl, "centers", "sep,C") knl = self._allow_redundant_execution_of_knl_scaling(knl) - knl = lp.set_options(knl, + return lp.set_options(knl, enforce_variable_access_ordered="no_check") - return knl def __call__(self, actx: ArrayContext, **kwargs): from sumpy.tools import is_obj_array_like @@ -230,9 +228,7 @@ def get_kernel(self): loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") loopy_knl = lp.tag_inames(loopy_knl, "istrength*:unr") - loopy_knl = self.add_loopy_form_callable(loopy_knl) - - return loopy_knl + return self.add_loopy_form_callable(loopy_knl) def get_optimized_kernel(self, sources_is_obj_array, centers_is_obj_array): knl = super().get_optimized_kernel( @@ -240,8 +236,7 @@ def get_optimized_kernel(self, sources_is_obj_array, centers_is_obj_array): centers_is_obj_array=centers_is_obj_array) # FIXME - knl = lp.split_iname(knl, "isrc_box", 16, outer_tag="g.0") - return knl + return lp.split_iname(knl, "isrc_box", 16, outer_tag="g.0") def __call__(self, actx: ArrayContext, **kwargs): """ @@ -361,9 +356,7 @@ def get_kernel(self): loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") loopy_knl = lp.tag_inames(loopy_knl, "istrength*:unr") - loopy_knl = self.add_loopy_form_callable(loopy_knl) - - return loopy_knl + return self.add_loopy_form_callable(loopy_knl) def get_optimized_kernel(self, sources_is_obj_array, centers_is_obj_array): knl = super().get_optimized_kernel( @@ -371,8 +364,7 @@ def get_optimized_kernel(self, sources_is_obj_array, centers_is_obj_array): centers_is_obj_array=centers_is_obj_array) # FIXME - knl = lp.split_iname(knl, "itgt_box", 16, outer_tag="g.0") - return knl + return lp.split_iname(knl, "itgt_box", 16, outer_tag="g.0") def __call__(self, actx: ArrayContext, **kwargs): """ diff --git a/sumpy/p2p.py b/sumpy/p2p.py index e1ef9078..7cf2dc75 100644 --- a/sumpy/p2p.py +++ b/sumpy/p2p.py @@ -33,8 +33,8 @@ from typing_extensions import override import loopy as lp -import pytools.obj_array as obj_array from arraycontext import PyOpenCLArrayContext +from pytools import obj_array from sumpy.array_context import make_loopy_program from sumpy.tools import KernelCacheMixin, KernelComputation, is_obj_array_like @@ -204,9 +204,8 @@ def get_optimized_kernel(self, *, knl = lp.split_iname(knl, "itgt", 1024, outer_tag="g.0") knl = self._allow_redundant_execution_of_knl_scaling(knl) - knl = lp.set_options(knl, enforce_variable_access_ordered="no_check") + return lp.set_options(knl, enforce_variable_access_ordered="no_check") - return knl # }}} @@ -437,11 +436,9 @@ def get_optimized_kernel(self, targets_is_obj_array, sources_is_obj_array): knl = lp.split_iname(knl, "imat", 1024, outer_tag="g.0") knl = self._allow_redundant_execution_of_knl_scaling(knl) - knl = lp.set_options(knl, + return lp.set_options(knl, enforce_variable_access_ordered="no_check") - return knl - def __call__(self, actx: ArrayContext, targets: ObjectArray1D[Array] | Array, @@ -799,8 +796,7 @@ def get_optimized_kernel(self, *, "inner", "id:init_* or id:*_scaling or id:src_box_insn_*") knl = lp.add_inames_to_insn(knl, "itgt_box", "id:*_scaling") - knl = lp.set_options(knl, enforce_variable_access_ordered="no_check") - return knl + return lp.set_options(knl, enforce_variable_access_ordered="no_check") def __call__(self, actx: ArrayContext, diff --git a/sumpy/point_calculus.py b/sumpy/point_calculus.py index 6af274c6..2309b2e6 100644 --- a/sumpy/point_calculus.py +++ b/sumpy/point_calculus.py @@ -27,8 +27,7 @@ import numpy as np import numpy.linalg as la -import pytools.obj_array as obj_array -from pytools import memoize_method +from pytools import memoize_method, obj_array if TYPE_CHECKING: diff --git a/sumpy/qbx.py b/sumpy/qbx.py index 926367a9..5c7428c9 100644 --- a/sumpy/qbx.py +++ b/sumpy/qbx.py @@ -34,9 +34,8 @@ from typing_extensions import override import loopy as lp -import pytools.obj_array as obj_array from pymbolic import parse -from pytools import memoize_method +from pytools import memoize_method, obj_array import sumpy.symbolic as sym from sumpy.array_context import is_cl_cpu, make_loopy_program @@ -116,12 +115,10 @@ def _expand(self, sac, avec, bvec, rscale, isrc): conv = PymbolicToSympyMapper() strengths = [conv.to_expr(self.get_strength_or_not(isrc, idx)) for idx in range(len(self.source_kernels))] - coefficients = self.expansion.coefficients_from_source_vec( + return self.expansion.coefficients_from_source_vec( self.source_kernels, avec, bvec, rscale=rscale, weights=strengths, sac=sac) - return coefficients - def _evaluate(self, sac, avec, bvec, rscale, expansion_nr, coefficients): from sumpy.expansion.local import LineTaylorLocalExpansion tgt_knl = self.target_kernels[expansion_nr] @@ -242,9 +239,8 @@ def get_optimized_kernel(self, *, "non-CPU targets", stacklevel=1) loopy_knl = lp.split_iname(loopy_knl, itgt_name, 128, outer_tag="g.0") - loopy_knl = self._allow_redundant_execution_of_knl_scaling(loopy_knl) + return self._allow_redundant_execution_of_knl_scaling(loopy_knl) - return loopy_knl # }}} @@ -500,8 +496,7 @@ def get_optimized_kernel(self, loopy_knl = lp.tag_array_axes(loopy_knl, "center", "sep,C") loopy_knl = lp.split_iname(loopy_knl, "imat", 1024, outer_tag="g.0") - loopy_knl = self._allow_redundant_execution_of_knl_scaling(loopy_knl) - return loopy_knl + return self._allow_redundant_execution_of_knl_scaling(loopy_knl) def __call__(self, actx: ArrayContext, targets, sources, centers, expansion_radii, diff --git a/sumpy/symbolic.py b/sumpy/symbolic.py index 00dd741a..64a26294 100644 --- a/sumpy/symbolic.py +++ b/sumpy/symbolic.py @@ -344,7 +344,6 @@ def map_subscript(self, expr: prim.Subscript) -> sym.Basic: return Symbol(f"{expr.aggregate.name}{expr.index}") else: self.raise_conversion_error(expr) - raise @override def map_call(self, expr: prim.Call) -> sym.Basic: diff --git a/sumpy/test/curve.py b/sumpy/test/curve.py index c220711f..7960b424 100644 --- a/sumpy/test/curve.py +++ b/sumpy/test/curve.py @@ -26,7 +26,7 @@ from typing import TYPE_CHECKING, final import numpy as np -import scipy.fftpack as fftpack +from scipy import fftpack if TYPE_CHECKING: diff --git a/sumpy/test/geometries.py b/sumpy/test/geometries.py index 65b243e1..1687ab6d 100644 --- a/sumpy/test/geometries.py +++ b/sumpy/test/geometries.py @@ -96,7 +96,7 @@ def make_torus( ]) def diff2d(ary: NDArray[np.floating]): - import scipy.fftpack as fftpack + from scipy import fftpack return np.array([ fftpack.diff(ary[idx]) for idx in np.ndindex(ary.shape[:-1]) diff --git a/sumpy/test/test_fmm.py b/sumpy/test/test_fmm.py index 5f54e327..45455f72 100644 --- a/sumpy/test/test_fmm.py +++ b/sumpy/test/test_fmm.py @@ -33,12 +33,12 @@ import numpy.linalg as la import pytest -import pytools.obj_array as obj_array from arraycontext import ( ArrayContextFactory, PyOpenCLArrayContext, pytest_generate_tests_for_array_contexts, ) +from pytools import obj_array from sumpy.array_context import PytestPyOpenCLArrayContextFactory, _acf # noqa: F401 from sumpy.expansion.local import ( diff --git a/sumpy/test/test_kernels.py b/sumpy/test/test_kernels.py index 54468ffd..ae21ef03 100644 --- a/sumpy/test/test_kernels.py +++ b/sumpy/test/test_kernels.py @@ -31,12 +31,12 @@ import numpy.linalg as la import pytest -import pytools.obj_array as obj_array from arraycontext import ( ArrayContextFactory, PyOpenCLArrayContext, pytest_generate_tests_for_array_contexts, ) +from pytools import obj_array from pytools.convergence import PConvergenceVerifier import sumpy.symbolic as sym diff --git a/sumpy/test/test_matrixgen.py b/sumpy/test/test_matrixgen.py index 0bc4406a..2248f8f8 100644 --- a/sumpy/test/test_matrixgen.py +++ b/sumpy/test/test_matrixgen.py @@ -30,8 +30,8 @@ import numpy.linalg as la import pytest -import pytools.obj_array as obj_array from arraycontext import ArrayContextFactory, pytest_generate_tests_for_array_contexts +from pytools import obj_array from sumpy.array_context import PytestPyOpenCLArrayContextFactory, _acf # noqa: F401 diff --git a/sumpy/test/test_misc.py b/sumpy/test/test_misc.py index 41bf03b2..ce85f30b 100644 --- a/sumpy/test/test_misc.py +++ b/sumpy/test/test_misc.py @@ -573,8 +573,7 @@ def is_complex_valued(self) -> bool: @override def get_pde_as_diff_op(self): w = make_identity_diff_op(self.dim) - pde = diff(w, tuple(self._max_mi)) - return pde + return diff(w, tuple(self._max_mi)) @pytest.mark.parametrize("order", [6]) diff --git a/sumpy/tools.py b/sumpy/tools.py index 25dc4bdc..952c594c 100644 --- a/sumpy/tools.py +++ b/sumpy/tools.py @@ -31,7 +31,7 @@ import logging import warnings from abc import ABC, abstractmethod -from collections.abc import Hashable, Sequence, Set +from collections.abc import Hashable, Sequence, Set as AbstractSet from dataclasses import dataclass from typing import TYPE_CHECKING, Any, TypeAlias, cast @@ -200,8 +200,8 @@ def add_to_sac(sac: SymbolicAssignmentCollection | None, expr: sym.Expr): # {{{ get variables -def get_all_variables(expr: Expression) -> Set[Variable]: - return cast("Set[Variable]", DependencyMapper()(expr)) +def get_all_variables(expr: Expression) -> AbstractSet[Variable]: + return cast("AbstractSet[Variable]", DependencyMapper()(expr)) # }}} @@ -914,8 +914,7 @@ def loopy_fft( knl = lp.add_inames_for_unused_hw_axes(knl) knl = lp.preprocess_kernel(knl) - knl = lp.linearize(knl) - return knl + return lp.linearize(knl) class FFTBackend(enum.Enum): diff --git a/sumpy/toys.py b/sumpy/toys.py index 032b74f3..71318a31 100644 --- a/sumpy/toys.py +++ b/sumpy/toys.py @@ -34,8 +34,7 @@ import numpy as np from typing_extensions import override -import pytools.obj_array as obj_array -from pytools import memoize_method +from pytools import memoize_method, obj_array from sumpy.kernel import TargetTransformationRemover From ab0bd19ca7b51123a5e695ef2c70dd96c1e148c7 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 20 Feb 2026 23:07:37 -0600 Subject: [PATCH 2/2] Update baseline --- .basedpyright/baseline.json | 1488 +++++------------------------------ 1 file changed, 184 insertions(+), 1304 deletions(-) diff --git a/.basedpyright/baseline.json b/.basedpyright/baseline.json index b27e0901..bd264051 100644 --- a/.basedpyright/baseline.json +++ b/.basedpyright/baseline.json @@ -2891,6 +2891,14 @@ "lineCount": 1 } }, + { + "code": "reportUnknownParameterType", + "range": { + "startColumn": 8, + "endColumn": 32, + "lineCount": 1 + } + }, { "code": "reportIncompatibleMethodOverride", "range": { @@ -2951,28 +2959,36 @@ "code": "reportUnknownMemberType", "range": { "startColumn": 12, - "endColumn": 47, + "endColumn": 44, "lineCount": 1 } }, { - "code": "reportUnknownMemberType", + "code": "reportUnknownArgumentType", "range": { - "startColumn": 16, - "endColumn": 48, + "startColumn": 43, + "endColumn": 60, "lineCount": 1 } }, { "code": "reportUnknownArgumentType", "range": { - "startColumn": 43, - "endColumn": 60, + "startColumn": 36, + "endColumn": 17, + "lineCount": 4 + } + }, + { + "code": "reportCallIssue", + "range": { + "startColumn": 16, + "endColumn": 57, "lineCount": 1 } }, { - "code": "reportUnknownArgumentType", + "code": "reportArgumentType", "range": { "startColumn": 32, "endColumn": 56, @@ -3011,30 +3027,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 32, - "endColumn": 53, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 32, - "endColumn": 58, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 32, - "endColumn": 74, - "lineCount": 1 - } - }, { "code": "reportUnknownParameterType", "range": { @@ -3091,30 +3083,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 46, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 51, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 69, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -3549,22 +3517,6 @@ "lineCount": 1 } }, - { - "code": "reportImplicitOverride", - "range": { - "startColumn": 8, - "endColumn": 18, - "lineCount": 1 - } - }, - { - "code": "reportUnknownParameterType", - "range": { - "startColumn": 8, - "endColumn": 28, - "lineCount": 1 - } - }, { "code": "reportIncompatibleMethodOverride", "range": { @@ -3581,14 +3533,6 @@ "lineCount": 1 } }, - { - "code": "reportArgumentType", - "range": { - "startColumn": 29, - "endColumn": 32, - "lineCount": 1 - } - }, { "code": "reportIncompatibleMethodOverride", "range": { @@ -3725,14 +3669,6 @@ "lineCount": 1 } }, - { - "code": "reportIncompatibleMethodOverride", - "range": { - "startColumn": 8, - "endColumn": 18, - "lineCount": 1 - } - }, { "code": "reportImplicitOverride", "range": { @@ -3904,16 +3840,16 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 20, - "endColumn": 34, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, { "code": "reportUnknownArgumentType", "range": { - "startColumn": 35, - "endColumn": 44, + "startColumn": 30, + "endColumn": 39, "lineCount": 1 } }, @@ -3928,8 +3864,8 @@ { "code": "reportUnknownArgumentType", "range": { - "startColumn": 29, - "endColumn": 32, + "startColumn": 30, + "endColumn": 33, "lineCount": 1 } }, @@ -4832,24 +4768,24 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 14, - "endColumn": 32, + "startColumn": 15, + "endColumn": 33, "lineCount": 1 } }, { "code": "reportUnknownMemberType", "range": { - "startColumn": 14, - "endColumn": 48, + "startColumn": 15, + "endColumn": 49, "lineCount": 1 } }, { "code": "reportUnknownMemberType", "range": { - "startColumn": 14, - "endColumn": 70, + "startColumn": 15, + "endColumn": 71, "lineCount": 1 } }, @@ -5192,8 +5128,8 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 20, - "endColumn": 34, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, @@ -6008,8 +5944,8 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 20, - "endColumn": 34, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, @@ -6088,8 +6024,8 @@ { "code": "reportUnknownArgumentType", "range": { - "startColumn": 47, - "endColumn": 50, + "startColumn": 48, + "endColumn": 51, "lineCount": 1 } }, @@ -6165,14 +6101,6 @@ "lineCount": 1 } }, - { - "code": "reportIncompatibleMethodOverride", - "range": { - "startColumn": 8, - "endColumn": 18, - "lineCount": 1 - } - }, { "code": "reportImplicitOverride", "range": { @@ -6352,16 +6280,16 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 20, - "endColumn": 34, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, { "code": "reportUnknownArgumentType", "range": { - "startColumn": 35, - "endColumn": 44, + "startColumn": 30, + "endColumn": 39, "lineCount": 1 } }, @@ -6469,14 +6397,6 @@ "lineCount": 1 } }, - { - "code": "reportIncompatibleMethodOverride", - "range": { - "startColumn": 8, - "endColumn": 18, - "lineCount": 1 - } - }, { "code": "reportImplicitOverride", "range": { @@ -6664,16 +6584,16 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 20, - "endColumn": 34, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, { "code": "reportUnknownArgumentType", "range": { - "startColumn": 35, - "endColumn": 44, + "startColumn": 30, + "endColumn": 39, "lineCount": 1 } }, @@ -7138,8 +7058,8 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 14, - "endColumn": 28, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, @@ -7330,8 +7250,8 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 14, - "endColumn": 28, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, @@ -8691,20 +8611,12 @@ "code": "reportUnknownParameterType", "range": { "startColumn": 16, - "endColumn": 25, - "lineCount": 1 - } - }, - { - "code": "reportUnknownParameterType", - "range": { - "startColumn": 16, - "endColumn": 34, + "endColumn": 40, "lineCount": 1 } }, { - "code": "reportUnknownParameterType", + "code": "reportMissingParameterType", "range": { "startColumn": 16, "endColumn": 40, @@ -8715,39 +8627,39 @@ "code": "reportMissingParameterType", "range": { "startColumn": 16, - "endColumn": 40, + "endColumn": 44, "lineCount": 1 } }, { - "code": "reportMissingParameterType", + "code": "reportUnannotatedClassAttribute", "range": { - "startColumn": 16, - "endColumn": 44, + "startColumn": 13, + "endColumn": 25, "lineCount": 1 } }, { - "code": "reportUnknownMemberType", + "code": "reportUnannotatedClassAttribute", "range": { - "startColumn": 8, - "endColumn": 24, + "startColumn": 17, + "endColumn": 45, "lineCount": 1 } }, { "code": "reportUnknownArgumentType", "range": { - "startColumn": 37, - "endColumn": 46, + "startColumn": 55, + "endColumn": 79, "lineCount": 1 } }, { - "code": "reportUnknownArgumentType", + "code": "reportUnknownMemberType", "range": { - "startColumn": 24, - "endColumn": 42, + "startColumn": 8, + "endColumn": 37, "lineCount": 1 } }, @@ -8755,180 +8667,52 @@ "code": "reportUnannotatedClassAttribute", "range": { "startColumn": 13, - "endColumn": 25, + "endColumn": 37, "lineCount": 1 } }, { - "code": "reportUnknownMemberType", + "code": "reportAny", "range": { - "startColumn": 64, - "endColumn": 78, + "startColumn": 8, + "endColumn": 9, "lineCount": 1 } }, { - "code": "reportUnknownArgumentType", + "code": "reportAny", "range": { - "startColumn": 64, - "endColumn": 78, + "startColumn": 19, + "endColumn": 32, "lineCount": 1 } }, { - "code": "reportUnknownMemberType", + "code": "reportAny", "range": { - "startColumn": 33, - "endColumn": 47, + "startColumn": 19, + "endColumn": 32, "lineCount": 1 } }, { "code": "reportUnknownMemberType", "range": { - "startColumn": 33, - "endColumn": 55, + "startColumn": 12, + "endColumn": 41, "lineCount": 1 } }, { - "code": "reportUnknownArgumentType", + "code": "reportUnknownMemberType", "range": { - "startColumn": 33, - "endColumn": 55, - "lineCount": 1 + "startColumn": 12, + "endColumn": 63, + "lineCount": 2 } }, { - "code": "reportUnannotatedClassAttribute", - "range": { - "startColumn": 17, - "endColumn": 45, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 16, - "endColumn": 40, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 26, - "endColumn": 35, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 37, - "endColumn": 46, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 37, - "endColumn": 46, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 16, - "endColumn": 40, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 55, - "endColumn": 79, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 8, - "endColumn": 37, - "lineCount": 1 - } - }, - { - "code": "reportUnannotatedClassAttribute", - "range": { - "startColumn": 13, - "endColumn": 37, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 15, - "endColumn": 24, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 12, - "endColumn": 28, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 29, - "endColumn": 38, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 29, - "endColumn": 58, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 29, - "endColumn": 58, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 12, - "endColumn": 41, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 12, - "endColumn": 63, - "lineCount": 2 - } - }, - { - "code": "reportUnknownArgumentType", + "code": "reportUnknownArgumentType", "range": { "startColumn": 12, "endColumn": 63, @@ -8983,30 +8767,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 27, - "endColumn": 36, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 27, - "endColumn": 44, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 27, - "endColumn": 44, - "lineCount": 1 - } - }, { "code": "reportAny", "range": { @@ -9319,30 +9079,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 27, - "endColumn": 36, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 27, - "endColumn": 44, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 27, - "endColumn": 44, - "lineCount": 1 - } - }, { "code": "reportAny", "range": { @@ -9455,30 +9191,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 30, - "endColumn": 39, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 30, - "endColumn": 48, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 30, - "endColumn": 48, - "lineCount": 1 - } - }, { "code": "reportUnusedVariable", "range": { @@ -9519,22 +9231,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 37, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 53, - "lineCount": 1 - } - }, { "code": "reportUnknownParameterType", "range": { @@ -9591,22 +9287,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 21, - "endColumn": 30, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 21, - "endColumn": 48, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -9631,38 +9311,6 @@ "lineCount": 3 } }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 12, - "endColumn": 61, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 24, - "endColumn": 33, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 24, - "endColumn": 60, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 24, - "endColumn": 60, - "lineCount": 1 - } - }, { "code": "reportAny", "range": { @@ -9679,150 +9327,6 @@ "lineCount": 3 } }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 12, - "endColumn": 61, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 24, - "endColumn": 33, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 24, - "endColumn": 60, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 24, - "endColumn": 60, - "lineCount": 1 - } - }, - { - "code": "reportUnknownParameterType", - "range": { - "startColumn": 8, - "endColumn": 30, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 37, - "endColumn": 46, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 37, - "endColumn": 64, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 46, - "endColumn": 55, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 46, - "endColumn": 82, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 27, - "endColumn": 36, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 27, - "endColumn": 44, - "lineCount": 1 - } - }, - { - "code": "reportUnknownParameterType", - "range": { - "startColumn": 8, - "endColumn": 30, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 37, - "endColumn": 46, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 37, - "endColumn": 64, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 46, - "endColumn": 55, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 46, - "endColumn": 82, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 27, - "endColumn": 36, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 27, - "endColumn": 44, - "lineCount": 1 - } - }, { "code": "reportAny", "range": { @@ -10055,38 +9559,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 22, - "endColumn": 51, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 34, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 42, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 25, - "endColumn": 42, - "lineCount": 1 - } - }, { "code": "reportUnknownMemberType", "range": { @@ -10114,48 +9586,24 @@ { "code": "reportAny", "range": { - "startColumn": 12, - "endColumn": 28, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 44, - "endColumn": 74, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 33, - "endColumn": 57, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 37, + "startColumn": 12, + "endColumn": 28, "lineCount": 1 } }, { "code": "reportUnknownMemberType", "range": { - "startColumn": 28, - "endColumn": 49, + "startColumn": 44, + "endColumn": 74, "lineCount": 1 } }, { "code": "reportUnknownArgumentType", "range": { - "startColumn": 28, - "endColumn": 49, + "startColumn": 33, + "endColumn": 57, "lineCount": 1 } }, @@ -10247,14 +9695,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 15, - "endColumn": 24, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -10263,22 +9703,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 34, - "endColumn": 46, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 34, - "endColumn": 48, - "lineCount": 1 - } - }, { "code": "reportAny", "range": { @@ -10391,54 +9815,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 34, - "endColumn": 43, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 34, - "endColumn": 57, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 34, - "endColumn": 57, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 37, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, { "code": "reportIncompatibleMethodOverride", "range": { @@ -10519,22 +9895,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 22, - "endColumn": 51, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 22, - "endColumn": 51, - "lineCount": 1 - } - }, { "code": "reportAny", "range": { @@ -10591,30 +9951,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 34, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 42, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 25, - "endColumn": 42, - "lineCount": 1 - } - }, { "code": "reportUnknownMemberType", "range": { @@ -10719,6 +10055,14 @@ "lineCount": 2 } }, + { + "code": "reportUnknownArgumentType", + "range": { + "startColumn": 40, + "endColumn": 63, + "lineCount": 1 + } + }, { "code": "reportUnknownMemberType", "range": { @@ -10727,6 +10071,14 @@ "lineCount": 1 } }, + { + "code": "reportUnknownArgumentType", + "range": { + "startColumn": 37, + "endColumn": 69, + "lineCount": 1 + } + }, { "code": "reportAny", "range": { @@ -10762,8 +10114,8 @@ { "code": "reportUnknownArgumentType", "range": { - "startColumn": 30, - "endColumn": 33, + "startColumn": 28, + "endColumn": 31, "lineCount": 1 } }, @@ -11015,30 +10367,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 34, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 42, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 25, - "endColumn": 42, - "lineCount": 1 - } - }, { "code": "reportAny", "range": { @@ -11199,30 +10527,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 37, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, { "code": "reportUnknownMemberType", "range": { @@ -11383,14 +10687,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 22, - "endColumn": 51, - "lineCount": 1 - } - }, { "code": "reportUnknownMemberType", "range": { @@ -11503,30 +10799,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 37, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -11626,56 +10898,24 @@ { "code": "reportMissingParameterType", "range": { - "startColumn": 58, - "endColumn": 73, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 21, - "endColumn": 47, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 26, - "endColumn": 69, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 22, - "endColumn": 51, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 34, + "startColumn": 58, + "endColumn": 73, "lineCount": 1 } }, { "code": "reportUnknownMemberType", "range": { - "startColumn": 25, - "endColumn": 42, + "startColumn": 21, + "endColumn": 47, "lineCount": 1 } }, { "code": "reportUnknownArgumentType", "range": { - "startColumn": 25, - "endColumn": 42, + "startColumn": 26, + "endColumn": 69, "lineCount": 1 } }, @@ -11743,30 +10983,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 37, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -11863,30 +11079,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 35, - "endColumn": 44, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 35, - "endColumn": 52, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 35, - "endColumn": 52, - "lineCount": 1 - } - }, { "code": "reportAny", "range": { @@ -11999,54 +11191,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 35, - "endColumn": 44, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 35, - "endColumn": 59, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 35, - "endColumn": 59, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 37, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, { "code": "reportIncompatibleMethodOverride", "range": { @@ -12119,38 +11263,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 22, - "endColumn": 51, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 34, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 25, - "endColumn": 42, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 25, - "endColumn": 42, - "lineCount": 1 - } - }, { "code": "reportAny", "range": { @@ -12223,30 +11335,6 @@ "lineCount": 1 } }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 37, - "lineCount": 1 - } - }, - { - "code": "reportUnknownMemberType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, - { - "code": "reportUnknownArgumentType", - "range": { - "startColumn": 28, - "endColumn": 49, - "lineCount": 1 - } - }, { "code": "reportUnknownParameterType", "range": { @@ -13086,8 +12174,8 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 14, - "endColumn": 28, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, @@ -13984,8 +13072,8 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 14, - "endColumn": 28, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, @@ -14312,8 +13400,8 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 14, - "endColumn": 28, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, @@ -14552,16 +13640,16 @@ { "code": "reportUnknownMemberType", "range": { - "startColumn": 14, - "endColumn": 28, + "startColumn": 15, + "endColumn": 29, "lineCount": 1 } }, { "code": "reportUnknownArgumentType", "range": { - "startColumn": 29, - "endColumn": 32, + "startColumn": 30, + "endColumn": 33, "lineCount": 1 } }, @@ -19741,14 +18829,6 @@ "lineCount": 1 } }, - { - "code": "reportAny", - "range": { - "startColumn": 8, - "endColumn": 23, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -19766,23 +18846,7 @@ } }, { - "code": "reportAny", - "range": { - "startColumn": 8, - "endColumn": 23, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 25, - "endColumn": 26, - "lineCount": 1 - } - }, - { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 53, "endColumn": 68, @@ -19790,7 +18854,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 54, "endColumn": 69, @@ -19805,6 +18869,14 @@ "lineCount": 1 } }, + { + "code": "reportUnknownArgumentType", + "range": { + "startColumn": 42, + "endColumn": 60, + "lineCount": 1 + } + }, { "code": "reportUnknownParameterType", "range": { @@ -20319,14 +19391,6 @@ "lineCount": 1 } }, - { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -20344,23 +19408,7 @@ } }, { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 10, - "endColumn": 11, - "lineCount": 1 - } - }, - { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 27, "endColumn": 31, @@ -20368,7 +19416,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 34, "endColumn": 38, @@ -20376,7 +19424,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 34, "endColumn": 38, @@ -20728,10 +19776,18 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", + "range": { + "startColumn": 54, + "endColumn": 58, + "lineCount": 1 + } + }, + { + "code": "reportUnknownArgumentType", "range": { - "startColumn": 54, - "endColumn": 58, + "startColumn": 31, + "endColumn": 49, "lineCount": 1 } }, @@ -20863,14 +19919,6 @@ "lineCount": 1 } }, - { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -20888,23 +19936,7 @@ } }, { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 10, - "endColumn": 11, - "lineCount": 1 - } - }, - { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 27, "endColumn": 31, @@ -21016,13 +20048,21 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 50, "endColumn": 54, "lineCount": 1 } }, + { + "code": "reportUnknownArgumentType", + "range": { + "startColumn": 27, + "endColumn": 45, + "lineCount": 1 + } + }, { "code": "reportUnknownArgumentType", "range": { @@ -21056,7 +20096,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownMemberType", "range": { "startColumn": 8, "endColumn": 56, @@ -21064,7 +20104,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 8, "endColumn": 56, @@ -21072,7 +20112,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownMemberType", "range": { "startColumn": 8, "endColumn": 42, @@ -21080,7 +20120,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 8, "endColumn": 42, @@ -21088,7 +20128,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownMemberType", "range": { "startColumn": 8, "endColumn": 35, @@ -21096,7 +20136,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 8, "endColumn": 35, @@ -21104,7 +20144,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownMemberType", "range": { "startColumn": 8, "endColumn": 34, @@ -21112,7 +20152,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 8, "endColumn": 34, @@ -21159,14 +20199,6 @@ "lineCount": 1 } }, - { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -21184,23 +20216,7 @@ } }, { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 10, - "endColumn": 11, - "lineCount": 1 - } - }, - { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 27, "endColumn": 31, @@ -21240,21 +20256,13 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 54, "endColumn": 58, "lineCount": 1 } }, - { - "code": "reportUnknownLambdaType", - "range": { - "startColumn": 63, - "endColumn": 67, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -21367,14 +20375,6 @@ "lineCount": 1 } }, - { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -21384,23 +20384,7 @@ } }, { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 10, - "endColumn": 11, - "lineCount": 1 - } - }, - { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 27, "endColumn": 31, @@ -21408,21 +20392,13 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 50, "endColumn": 54, "lineCount": 1 } }, - { - "code": "reportUnknownLambdaType", - "range": { - "startColumn": 59, - "endColumn": 63, - "lineCount": 1 - } - }, { "code": "reportGeneralTypeIssues", "range": { @@ -21439,14 +20415,6 @@ "lineCount": 1 } }, - { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -21456,23 +20424,7 @@ } }, { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 10, - "endColumn": 11, - "lineCount": 1 - } - }, - { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 27, "endColumn": 31, @@ -21480,7 +20432,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownMemberType", "range": { "startColumn": 49, "endColumn": 62, @@ -21488,7 +20440,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 49, "endColumn": 62, @@ -21496,21 +20448,13 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 50, "endColumn": 54, "lineCount": 1 } }, - { - "code": "reportUnknownLambdaType", - "range": { - "startColumn": 59, - "endColumn": 63, - "lineCount": 1 - } - }, { "code": "reportGeneralTypeIssues", "range": { @@ -21567,14 +20511,6 @@ "lineCount": 1 } }, - { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -21584,23 +20520,7 @@ } }, { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 10, - "endColumn": 11, - "lineCount": 1 - } - }, - { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 27, "endColumn": 31, @@ -21608,7 +20528,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownMemberType", "range": { "startColumn": 49, "endColumn": 62, @@ -21616,7 +20536,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 49, "endColumn": 62, @@ -21624,21 +20544,13 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 54, "endColumn": 58, "lineCount": 1 } }, - { - "code": "reportUnknownLambdaType", - "range": { - "startColumn": 63, - "endColumn": 67, - "lineCount": 1 - } - }, { "code": "reportGeneralTypeIssues", "range": { @@ -21719,14 +20631,6 @@ "lineCount": 1 } }, - { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, { "code": "reportUnknownArgumentType", "range": { @@ -21736,23 +20640,7 @@ } }, { - "code": "reportAny", - "range": { - "startColumn": 4, - "endColumn": 8, - "lineCount": 1 - } - }, - { - "code": "reportAny", - "range": { - "startColumn": 10, - "endColumn": 11, - "lineCount": 1 - } - }, - { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 27, "endColumn": 31, @@ -21760,7 +20648,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownMemberType", "range": { "startColumn": 49, "endColumn": 62, @@ -21768,7 +20656,7 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 49, "endColumn": 62, @@ -21824,21 +20712,13 @@ } }, { - "code": "reportAny", + "code": "reportUnknownArgumentType", "range": { "startColumn": 50, "endColumn": 54, "lineCount": 1 } }, - { - "code": "reportUnknownLambdaType", - "range": { - "startColumn": 59, - "endColumn": 63, - "lineCount": 1 - } - }, { "code": "reportGeneralTypeIssues", "range": { @@ -25648,8 +24528,8 @@ { "code": "reportUnknownArgumentType", "range": { - "startColumn": 28, - "endColumn": 40, + "startColumn": 29, + "endColumn": 41, "lineCount": 1 } },