Skip to content

Refactor searchInPairs and Enhance rtrimLines Functions #122

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 6 commits into from
Oct 14, 2024
Merged

Refactor searchInPairs and Enhance rtrimLines Functions #122

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e420e4b
Update fileManipulate.ts
Mefisto04 Oct 13, 2024
4f5d5f8
Update fileManipulate.ts
Mefisto04 Oct 13, 2024
53aa2d9
Update fileManipulate.ts
Mefisto04 Oct 13, 2024
2351758
Update fileManipulate.ts
Mefisto04 Oct 13, 2024
0135354
Update fileManipulate.ts
Mefisto04 Oct 13, 2024
713cde3
refact(lint): Run lint fix
yamadashy Oct 14, 2024
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
33 changes: 13 additions & 20 deletions src/core/file/fileManipulate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ interface FileManipulator {
removeEmptyLines(content: string): string;
}

const rtrimLines = (content: string): string => content.replace(/[ \t]+$/gm, '');
const rtrimLines = (content: string): string =>
content
.split('\n')
.map((line) => line.trimEnd())
.join('\n');

class BaseManipulator implements FileManipulator {
removeComments(content: string): string {
Expand Down Expand Up @@ -88,39 +92,25 @@ class PythonManipulator extends BaseManipulator {

removeHashComments(content: string): string {
const searchInPairs = (pairs: [number, number][], hashIndex: number): boolean => {
let ans = -1;
let start = 0;
let end = pairs.length - 1;
while (start <= end) {
const mid = Math.floor((start + end) / 2);
const [pairStart, pairEnd] = pairs[mid];
if (hashIndex > pairStart && hashIndex < pairEnd) {
ans = mid;
break;
}
if (hashIndex < pairStart) {
end = mid - 1;
} else {
start = mid + 1;
}
}
return ans !== -1;
return pairs.some(([start, end]) => hashIndex > start && hashIndex < end);
};

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

let closingQuote: number;
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;
Expand All @@ -132,8 +122,10 @@ class PythonManipulator extends BaseManipulator {
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);
Expand All @@ -147,6 +139,7 @@ class PythonManipulator extends BaseManipulator {
}
result += `${content.slice(prevHash, nextNewLine)}\n`;
}

prevHash = nextNewLine + 1;
}
return result;
Expand Down