Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion desloppify/languages/_framework/generic_support/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from typing import Any

from desloppify.engine.policy.zones import ZoneRule
from desloppify.languages._framework.base.types import LangConfig
from desloppify.languages._framework.base.types import DetectorPhase, LangConfig
from .capabilities import (
SHARED_PHASE_LABELS,
capability_report,
Expand Down Expand Up @@ -60,6 +60,7 @@ def generic_lang(
external_test_dirs: list[str] | None = None,
test_file_extensions: list[str] | None = None,
frameworks: bool = False,
custom_phases: list[DetectorPhase] | None = None,
) -> LangConfig:
"""Build and register a generic language plugin from tool specs.

Expand All @@ -86,6 +87,7 @@ def generic_lang(
entry_patterns=entry_patterns,
external_test_dirs=external_test_dirs,
test_file_extensions=test_file_extensions,
custom_phases=custom_phases,
)

from desloppify.languages import register_generic_lang
Expand All @@ -102,6 +104,7 @@ def generic_lang(
has_treesitter=has_treesitter,
extract_fn=extract_fn,
dep_graph_fn=dep_graph_fn,
custom_phases=opts.custom_phases,
)

cfg = LangConfig(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class GenericLangOptions:
entry_patterns: list[str] | None = None
external_test_dirs: list[str] | None = None
test_file_extensions: list[str] | None = None
custom_phases: list[DetectorPhase] | None = None


def _register_generic_tool_specs(tool_specs: list[dict[str, Any]]) -> dict[str, FixerConfig]:
Expand Down Expand Up @@ -106,6 +107,7 @@ def _build_generic_phases(
has_treesitter: bool,
extract_fn,
dep_graph_fn,
custom_phases: list[DetectorPhase] | None = None,
) -> list[DetectorPhase]:
from desloppify.languages._framework.base.phase_builders import (
detector_phase_security,
Expand Down Expand Up @@ -141,6 +143,9 @@ def _build_generic_phases(
phases.append(_make_coupling_phase(dep_graph_fn))
phases.append(detector_phase_test_coverage())

if custom_phases:
phases.extend(custom_phases)

phases.extend(shared_subjective_duplicates_tail())
return phases

Expand Down
7 changes: 6 additions & 1 deletion desloppify/languages/r/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
"""R language plugin — Jarl, lintr + tree-sitter."""
"""R language plugin — Jarl, lintr + tree-sitter + R-specific smells."""

from desloppify.languages._framework.base.types import DetectorPhase
from desloppify.languages._framework.generic_support.core import generic_lang
from desloppify.languages._framework.treesitter import R_SPEC
from desloppify.languages.r.phases_smells import phase_smells

generic_lang(
name="r",
Expand Down Expand Up @@ -31,6 +33,9 @@
detect_markers=["DESCRIPTION", ".Rproj"],
default_src="R",
treesitter_spec=R_SPEC,
custom_phases=[
DetectorPhase("R code smells", phase_smells),
],
)

__all__ = [
Expand Down
1 change: 1 addition & 0 deletions desloppify/languages/r/detectors/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Loading
Loading