Skip to content

Rust duplicate improvement #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
b4prog merged 4 commits into from
Jun 26, 2026
+186 −60
Merged

Rust duplicate improvement #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca2d92a
[chore] bump CodeM8 minor version to 0.5.0
b4prog Jun 26, 2026
52eb474
[fix] treat #[test] as a duplicate mitigation line
b4prog Jun 26, 2026
15224b1
[refactor] split language pattern settings by language
b4prog Jun 26, 2026
af635dd
[fix] use Fish block terminator for duplicate mitigation
b4prog Jun 26, 2026
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "codem8"
version = "0.4.0"
version = "0.5.0"
edition = "2021"
rust-version = "1.85"
license = "MIT"
Expand Down
242 changes: 184 additions & 58 deletions src/language.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,78 @@ pub struct LanguageLinePattern {

pub const LANGUAGE_PATTERNS: &[LanguageLinePattern] = &[
LanguageLinePattern {
language_name: "TypeScript / JavaScript",
extensions: &["ts", "tsx", "js", "jsx", "mjs", "cjs"],
language_name: "Bash",
extensions: &["bash"],
duplicate_mitigation_pattern: &['&', '(', ')', ';', '[', ']', '{', '|', '}'],
duplicate_mitigation_lines: &["do", "done", "else", "fi", "then"],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "C",
extensions: &["c", "h"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &["#else", "#endif"],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "C#",
extensions: &["cs"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &["#else", "#endif", "#endregion"],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "C++",
extensions: &["cpp", "hpp", "cc", "hh", "cxx", "hxx"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &["#else", "#endif"],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "CSS",
extensions: &["css"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '[', ']', '{', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "Fish",
extensions: &["fish"],
duplicate_mitigation_pattern: &['&', '(', ')', ';', '[', ']', '{', '|', '}'],
duplicate_mitigation_lines: &["else", "end"],
duplicate_mitigation_regexps: &[],
Comment thread
coderabbitai[bot] marked this conversation as resolved.
},
LanguageLinePattern {
language_name: "Go",
extensions: &["go"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '[', ']', '{', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "HTML",
extensions: &["html", "htm"],
duplicate_mitigation_pattern: &['/', '<', '>'],
duplicate_mitigation_lines: &[
"</article>",
"</body>",
"</div>",
"</html>",
"</section>",
"</span>",
],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "Java",
extensions: &["java"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "JavaScript",
extensions: &["js", "jsx", "mjs", "cjs"],
duplicate_mitigation_pattern: &[
'&', '(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '|', '}',
],
Expand All @@ -31,50 +101,39 @@ pub const LANGUAGE_PATTERNS: &[LanguageLinePattern] = &[
],
},
LanguageLinePattern {
language_name: "Rust",
extensions: &["rs"],
language_name: "Kotlin",
extensions: &["kt", "kts"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &["///"],
duplicate_mitigation_regexps: &[
// Excludes short path or enum variant fragments. Example: Self::Ready,
r"^[A-Za-z0-9_]*::?\s*[A-Za-z0-9_]*[,]?$",
// Excludes bare identifiers with optional punctuation. Example: value,
r"^[A-Za-z0-9_]+\s*[.,]?$",
// Excludes simple method or field access lines. Example: .clone()
r"^\.?\s*[A-Za-z0-9_]+(?:\(\s*\)?)?$",
// Excludes incomplete let bindings split across lines. Example: let value =
r"^let\s+(?:mut\s+)?[A-Za-z0-9_]+\s*=$",
// Excludes simple public struct field declarations. Example: pub name: String,
r"^pub\s+[A-Za-z0-9_]*\s*:\s*[A-Za-z0-9_]*[,]?$",
// Excludes single-path use imports. Example: use crate::module;
r"^use\s+[A-Za-z_][A-Za-z0-9_]*(?:::[A-Za-z_][A-Za-z0-9_]*)*;$",
],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "C / C++ / Objective-C",
extensions: &["c", "h", "cpp", "hpp", "cc", "hh", "cxx", "hxx", "m", "mm"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &["#else", "#endif"],
language_name: "Less",
extensions: &["less"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '[', ']', '{', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "C#",
extensions: &["cs"],
language_name: "Objective-C",
extensions: &["m", "mm"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &["#else", "#endif", "#endregion"],
duplicate_mitigation_lines: &["#else", "#endif"],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "Java / Kotlin / Scala",
extensions: &["java", "kt", "kts", "scala", "sc"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
language_name: "PHP",
extensions: &["php", "phtml"],
duplicate_mitigation_pattern: &[
'(', ')', ',', '/', ':', ';', '<', '>', '?', '[', ']', '{', '}',
],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "Go",
extensions: &["go"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '[', ']', '{', '}'],
language_name: "PowerShell",
extensions: &["ps1", "psm1", "psd1"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '?', '[', ']', '{', '|', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
Expand All @@ -93,38 +152,86 @@ pub const LANGUAGE_PATTERNS: &[LanguageLinePattern] = &[
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "PHP",
extensions: &["php", "phtml"],
duplicate_mitigation_pattern: &[
'(', ')', ',', '/', ':', ';', '<', '>', '?', '[', ']', '{', '}',
language_name: "Rust",
extensions: &["rs"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &["///", "#[test]"],
duplicate_mitigation_regexps: &[
// Excludes short path or enum variant fragments. Example: Self::Ready,
r"^[A-Za-z0-9_]*::?\s*[A-Za-z0-9_]*[,]?$",
// Excludes bare identifiers with optional punctuation. Example: value,
r"^[A-Za-z0-9_]+\s*[.,]?$",
// Excludes simple method or field access lines. Example: .clone()
r"^\.?\s*[A-Za-z0-9_]+(?:\(\s*\)?)?$",
// Excludes incomplete let bindings split across lines. Example: let value =
r"^let\s+(?:mut\s+)?[A-Za-z0-9_]+\s*=$",
// Excludes simple public struct field declarations. Example: pub name: String,
r"^pub\s+[A-Za-z0-9_]*\s*:\s*[A-Za-z0-9_]*[,]?$",
// Excludes single-path use imports. Example: use crate::module;
r"^use\s+[A-Za-z_][A-Za-z0-9_]*(?:::[A-Za-z_][A-Za-z0-9_]*)*;$",
],
},
LanguageLinePattern {
language_name: "Sass",
extensions: &["sass"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '[', ']', '{', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "Swift",
extensions: &["swift"],
language_name: "Scala",
extensions: &["scala", "sc"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "SCSS",
extensions: &["scss"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '[', ']', '{', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "Shell",
extensions: &["sh", "bash", "zsh", "fish"],
extensions: &["sh"],
duplicate_mitigation_pattern: &['&', '(', ')', ';', '[', ']', '{', '|', '}'],
duplicate_mitigation_lines: &["do", "done", "else", "fi", "then"],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "PowerShell",
extensions: &["ps1", "psm1", "psd1"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '?', '[', ']', '{', '|', '}'],
language_name: "SQL",
extensions: &["sql"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';'],
duplicate_mitigation_lines: &["BEGIN", "END"],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "Swift",
extensions: &["swift"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "HTML / XML",
extensions: &["html", "htm", "xml", "xhtml", "svg"],
language_name: "TypeScript",
extensions: &["ts", "tsx"],
duplicate_mitigation_pattern: &[
'&', '(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '|', '}',
],
duplicate_mitigation_lines: &["// @ts-nocheck"],
duplicate_mitigation_regexps: &[
// Excludes single-line block comments used by generated files and tooling. Example: /* eslint-disable */
r"^/\*.*\*/$",
// Excludes generated interface field declarations. Example: errors: InvalidInputError[]
r"^[A-Za-z_$][A-Za-z0-9_$]*\??:\s*(?:Scalars\['[A-Za-z]+'\]|[A-Z][A-Za-z0-9_$]*(?:\[\])?|[a-z]+(?:\[\])?|\([^)]*\))(?:\[\])?(?:\s*\|\s*(?:null|number|boolean|string))*[,]?$",
// Excludes generated GraphQL typename marker fields. Example: __typename: 'User'
r"^__typename:\s*'[A-Za-z_$][A-Za-z0-9_$]*'[,]?$",
],
},
LanguageLinePattern {
language_name: "XML",
extensions: &["xml", "xhtml", "svg"],
duplicate_mitigation_pattern: &['/', '<', '>'],
duplicate_mitigation_lines: &[
"</article>",
Expand All @@ -136,27 +243,20 @@ pub const LANGUAGE_PATTERNS: &[LanguageLinePattern] = &[
],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "CSS / SCSS / Sass / Less",
extensions: &["css", "scss", "sass", "less"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '[', ']', '{', '}'],
duplicate_mitigation_lines: &[],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "SQL",
extensions: &["sql"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';'],
duplicate_mitigation_lines: &["BEGIN", "END"],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "YAML",
extensions: &["yaml", "yml"],
duplicate_mitigation_pattern: &['(', ')', ',', ':', ';', '<', '>', '?', '[', ']', '{', '}'],
duplicate_mitigation_lines: &["jobs:", "on:"],
duplicate_mitigation_regexps: &[],
},
LanguageLinePattern {
language_name: "Zsh",
extensions: &["zsh"],
duplicate_mitigation_pattern: &['&', '(', ')', ';', '[', ']', '{', '|', '}'],
duplicate_mitigation_lines: &["do", "done", "else", "fi", "then"],
duplicate_mitigation_regexps: &[],
},
];

#[must_use]
Expand Down Expand Up @@ -389,4 +489,30 @@ mod tests {
}
}
}

#[test]
fn language_patterns_are_sorted_by_name() {
for pair in LANGUAGE_PATTERNS.windows(2) {
assert!(
pair[0].language_name.to_ascii_lowercase()
<= pair[1].language_name.to_ascii_lowercase()
);
}
}

#[test]
fn language_patterns_use_unique_extensions() {
let mut languages_by_extension = HashMap::new();
for language in LANGUAGE_PATTERNS {
for extension in language.extensions {
let previous = languages_by_extension.insert(extension, language.language_name);
assert!(
previous.is_none(),
"{extension} belongs to both {} and {}",
previous.unwrap_or_default(),
language.language_name
);
}
}
}
}
Loading