Merge pull request #59 from yamadashy/fix/remove-comment-python-f-string

Fix Python comment removal to preserve f-strings
yamadashy · Aug 24, 2024 · 1e04161 · 1e04161
2 parents d2fef62 + edba6ed
commit 1e04161
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/src/core/file/fileManipulater.ts → src/core/file/fileManipulator.ts b/src/core/file/fileManipulater.ts → src/core/file/fileManipulator.ts
@@ -37,15 +37,8 @@ class StripCommentsManipulator extends BaseManipulator {
 
 class PythonManipulator extends BaseManipulator {
   removeComments(content: string): string {
-    // First, use strip-comments to remove standard comments
-    let result = strip(content, { language: 'python', preserveNewlines: true });
-
-    // Then, remove triple-quote comments
-    result = result.replace(/'''[\s\S]*?'''/g, '');
-    result = result.replace(/"""[\s\S]*?"""/g, '');
-
-    // Then, remove inline comments
-    result = result.replace(/(?<!\\)#.*$/gm, '');
+    // Remove single-line comments
+    const result = content.replace(/(?<!\\)#.*$/gm, '');
 
     return rtrimLines(result);
   }

diff --git a/src/core/file/fileProcessor.ts b/src/core/file/fileProcessor.ts
@@ -1,7 +1,7 @@
 import pMap from 'p-map';
 import { RepopackConfigMerged } from '../../config/configTypes.js';
 import { getProcessConcurrency } from '../../shared/processConcurrency.js';
-import { getFileManipulator } from './fileManipulater.js';
+import { getFileManipulator } from './fileManipulator.js';
 import { ProcessedFile, RawFile } from './fileTypes.js';
 
 export const processFiles = async (rawFiles: RawFile[], config: RepopackConfigMerged): Promise<ProcessedFile[]> => {

diff --git a/tests/core/file/fileManipulator.test.ts b/tests/core/file/fileManipulator.test.ts
@@ -1,5 +1,5 @@
 import { expect, test, describe } from 'vitest';
-import { getFileManipulator } from '../../../src/core/file/fileManipulater.js';
+import { getFileManipulator } from '../../../src/core/file/fileManipulator.js';
 
 describe('fileManipulator', () => {
   const testCases = [
@@ -156,21 +156,23 @@ describe('fileManipulator', () => {
         # Single line comment
         def test():
           '''
-          Multi-line comment
+          docstring
           '''
           return True
         """
-        Another multi-line comment
+        Another docstring
         """
       `,
       expected: `
 
         def test():
-
+          '''
+          docstring
+          '''
           return True
-
-
-
+        """
+        Another docstring
+        """
 `,
     },
     {

diff --git a/tests/core/file/fileProcessor.test.ts b/tests/core/file/fileProcessor.test.ts
@@ -1,10 +1,10 @@
 import { expect, describe, it, vi } from 'vitest';
 import { processFiles, processContent } from '../../../src/core/file/fileProcessor.js';
-import { getFileManipulator } from '../../../src/core/file/fileManipulater.js';
+import { getFileManipulator } from '../../../src/core/file/fileManipulator.js';
 import { RawFile } from '../../../src/core/file/fileTypes.js';
 import { createMockConfig } from '../../testing/testUtils.js';
 
-vi.mock('../../../src/core/file/fileManipulater');
+vi.mock('../../../src/core/file/fileManipulator');
 
 describe('fileProcessor', () => {
   describe('processFiles', () => {