Skip to content

fix(file): Replace strip-comments with @repomix/strip-comments #1009

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
yamadashy merged 2 commits into from
Dec 16, 2025
Merged

fix(file): Replace strip-comments with @repomix/strip-comments #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdae79d
fix(file): Replace strip-comments with @repomix/strip-comments
yamadashy Dec 14, 2025
6e19fd8
chore(deps): Update @repomix/strip-comments to 2.4.2
yamadashy Dec 14, 2025
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
19 changes: 10 additions & 9 deletions package-lock.json
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"dependencies": {
"@clack/prompts": "^0.11.0",
"@modelcontextprotocol/sdk": "^1.24.3",
"@repomix/strip-comments": "^2.4.2",
"@repomix/tree-sitter-wasms": "^0.1.15",
"@secretlint/core": "^11.2.5",
"@secretlint/secretlint-rule-preset-recommend": "^11.2.5",
Expand All @@ -94,7 +95,6 @@
"log-update": "^7.0.2",
"minimatch": "^10.1.1",
"picocolors": "^1.1.1",
"strip-comments": "^2.0.1",
"tiktoken": "^1.0.22",
"tinypool": "^2.0.0",
"web-tree-sitter": "^0.25.10",
Expand Down
278 changes: 7 additions & 271 deletions src/core/file/fileManipulate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'node:path';
import strip from 'strip-comments';
import strip from '@repomix/strip-comments';

export interface FileManipulator {
removeComments(content: string): string;
Expand Down Expand Up @@ -42,269 +42,6 @@ class StripCommentsManipulator extends BaseManipulator {
}
}

class CppManipulator extends BaseManipulator {
removeComments(content: string): string {
let result = strip(content, {
language: 'c',
preserveNewlines: true,
});

result = result
.split('\n')
.map((line) => {
const tripleSlashIndex = line.indexOf('///');
if (tripleSlashIndex !== -1) {
return line.substring(0, tripleSlashIndex).trimEnd();
}
return line;
})
.join('\n');

return rtrimLines(result);
}
}

enum GoParserState {
Normal = 0,
InLineComment = 1,
InBlockComment = 2,
InDoubleQuoteString = 3,
InRawString = 4,
InRuneLiteral = 5,
}

class GoManipulator extends BaseManipulator {
removeComments(content: string): string {
if (!content) return '';

let state: GoParserState = GoParserState.Normal;
let result = '';
let i = 0;
let hasNonWhitespaceOnLine = false; // Track if line has non-whitespace content

while (i < content.length) {
const char = content[i];
const nextChar = i + 1 < content.length ? content[i + 1] : null;

switch (state) {
case GoParserState.Normal:
if (char === '/' && nextChar === '/') {
// Go directive handling
if (!hasNonWhitespaceOnLine) {
if (content.startsWith('//go:', i)) {
// Preserve //go: directives
const lineEnd = content.indexOf('\n', i);
if (lineEnd === -1) {
result += content.substring(i);
i = content.length;
} else {
result += content.substring(i, lineEnd + 1);
i = lineEnd + 1;
hasNonWhitespaceOnLine = false;
}
continue;
}
}
state = GoParserState.InLineComment;
i += 2; // skip '//'
continue;
}
if (char === '/' && nextChar === '*') {
state = GoParserState.InBlockComment;
i += 2; // skip '/*'
continue;
}
result += char;
if (char !== ' ' && char !== '\t' && char !== '\n') {
hasNonWhitespaceOnLine = true;
}
if (char === '"') {
state = GoParserState.InDoubleQuoteString;
} else if (char === '`') {
state = GoParserState.InRawString;
} else if (char === "'") {
state = GoParserState.InRuneLiteral;
}
break;

case GoParserState.InLineComment:
// Skip text within line comments until newline
if (char === '\n') {
result += char;
state = GoParserState.Normal;
hasNonWhitespaceOnLine = false;
}
// Skip all other characters
break;

case GoParserState.InBlockComment:
// Go block comments do not nest - first */ closes the comment
if (char === '*' && nextChar === '/') {
state = GoParserState.Normal;
i += 2; // skip '*/'
continue;
}
if (char === '\n') {
// Preserve newlines in block comments to maintain line structure
result += char;
hasNonWhitespaceOnLine = false;
}
// Skip all other characters within block comments
break;

case GoParserState.InDoubleQuoteString:
result += char;
if (char === '\\' && nextChar !== null) {
// Handle escape sequences
result += nextChar;
i += 2;
continue;
}
if (char === '"') {
state = GoParserState.Normal;
}
break;

case GoParserState.InRawString:
result += char;
if (char === '`') {
state = GoParserState.Normal;
}
break;

case GoParserState.InRuneLiteral:
result += char;
if (char === '\\' && nextChar !== null) {
// Handle escape sequences
result += nextChar;
i += 2;
continue;
}
if (char === "'") {
state = GoParserState.Normal;
}
break;
}

if (char === '\n') {
hasNonWhitespaceOnLine = false;
}
i++;
}
return rtrimLines(result);
}
}

class PythonManipulator extends BaseManipulator {
removeDocStrings(content: string): string {
if (!content) return '';
const lines = content.split('\n');

let result = '';

let buffer = '';
let quoteType: '' | "'" | '"' = '';
let tripleQuotes = 0;

const doubleQuoteRegex = /^\s*(?<!\\)(?:""")\s*(?:\n)?[\s\S]*?(?<!("""))(?<!\\)(?:""")/gm;
const singleQuoteRegex = /^\s*(?<!\\)(?:''')\s*(?:\n)?[\s\S]*?(?<!('''))(?<!\\)(?:''')/gm;

const sz = lines.length;
for (let i = 0; i < sz; i++) {
const line = lines[i] + (i !== sz - 1 ? '\n' : '');
buffer += line;
if (quoteType === '') {
const indexSingle = line.search(/(?<!["])(?<!\\)'''(?!["])/g);
const indexDouble = line.search(/(?<!['])(?<!\\)"""(?!['])/g);
if (indexSingle !== -1 && (indexDouble === -1 || indexSingle < indexDouble)) {
quoteType = "'";
} else if (indexDouble !== -1 && (indexSingle === -1 || indexDouble < indexSingle)) {
quoteType = '"';
}
}
if (quoteType === "'") {
tripleQuotes += (line.match(/(?<!["])(?<!\\)'''(?!["])/g) || []).length;
}
if (quoteType === '"') {
tripleQuotes += (line.match(/(?<!['])(?<!\\)"""(?!['])/g) || []).length;
}

if (tripleQuotes % 2 === 0) {
const docstringRegex = quoteType === '"' ? doubleQuoteRegex : singleQuoteRegex;
buffer = buffer.replace(docstringRegex, '');
result += buffer;
buffer = '';
tripleQuotes = 0;
quoteType = '';
}
}

result += buffer;
return result;
}

removeHashComments(content: string): string {
const searchInPairs = (pairs: [number, number][], hashIndex: number): boolean => {
return pairs.some(([start, end]) => hashIndex > start && hashIndex < end);
};

let result = '';
const pairs: [number, number][] = [];
let prevQuote = 0;
while (prevQuote < content.length) {
const openingQuote = content.slice(prevQuote + 1).search(/(?<!\\)(?:"|'|'''|""")/g) + prevQuote + 1;
if (openingQuote === prevQuote) break;

let closingQuote = -1;
if (content.startsWith('"""', openingQuote) || content.startsWith("'''", openingQuote)) {
const quoteType = content.slice(openingQuote, openingQuote + 3);
closingQuote = content.indexOf(quoteType, openingQuote + 3);
} else {
const quoteType = content[openingQuote];
closingQuote = content.indexOf(quoteType, openingQuote + 1);
}

if (closingQuote === -1) break;
pairs.push([openingQuote, closingQuote]);
prevQuote = closingQuote;
}
let prevHash = 0;
while (prevHash < content.length) {
const hashIndex = content.slice(prevHash).search(/(?<!\\)#/g) + prevHash;
if (hashIndex === prevHash - 1) {
result += content.slice(prevHash);
break;
}

const isInsideString = searchInPairs(pairs, hashIndex);
const nextNewLine = content.indexOf('\n', hashIndex);

if (!isInsideString) {
if (nextNewLine === -1) {
result += content.slice(prevHash);
break;
}
result += `${content.slice(prevHash, hashIndex)}\n`;
} else {
if (nextNewLine === -1) {
result += content.slice(prevHash);
break;
}
result += `${content.slice(prevHash, nextNewLine)}\n`;
}

prevHash = nextNewLine + 1;
}
return result;
}

removeComments(content: string): string {
let result = this.removeDocStrings(content);
result = this.removeHashComments(result);
return rtrimLines(result);
}
}

class CompositeManipulator extends BaseManipulator {
private manipulators: FileManipulator[];

Expand All @@ -321,21 +58,22 @@ class CompositeManipulator extends BaseManipulator {
const manipulators: Record<string, FileManipulator> = {
'.c': new StripCommentsManipulator('c'),
'.h': new StripCommentsManipulator('c'),
'.hpp': new CppManipulator(),
'.cpp': new CppManipulator(),
'.cc': new CppManipulator(),
'.cxx': new CppManipulator(),
'.hpp': new StripCommentsManipulator('cpp'),
'.cpp': new StripCommentsManipulator('cpp'),
'.cc': new StripCommentsManipulator('cpp'),
'.cxx': new StripCommentsManipulator('cpp'),
'.cs': new StripCommentsManipulator('csharp'),
'.css': new StripCommentsManipulator('css'),
'.dart': new StripCommentsManipulator('c'),
'.go': new GoManipulator(),
'.go': new StripCommentsManipulator('go'),
'.html': new StripCommentsManipulator('html'),
'.java': new StripCommentsManipulator('java'),
'.js': new StripCommentsManipulator('javascript'),
'.jsx': new StripCommentsManipulator('javascript'),
'.kt': new StripCommentsManipulator('c'),
'.less': new StripCommentsManipulator('less'),
'.php': new StripCommentsManipulator('php'),
'.py': new StripCommentsManipulator('python'),
'.rb': new StripCommentsManipulator('ruby'),
'.rs': new StripCommentsManipulator('c'),
'.sass': new StripCommentsManipulator('sass'),
Expand All @@ -350,8 +88,6 @@ const manipulators: Record<string, FileManipulator> = {
'.yaml': new StripCommentsManipulator('perl'),
'.yml': new StripCommentsManipulator('perl'),

'.py': new PythonManipulator(),

'.vue': new CompositeManipulator(
new StripCommentsManipulator('html'),
new StripCommentsManipulator('css'),
Expand Down
Loading
Loading