Improved import regex

Author: matsoftware

swift_code_metrics/_helpers.py

@@ -2,7 +2,6 @@
 
 
 class AnalyzerHelpers:
-
     # Constants
 
     SWIFT_FILE_EXTENSION = '.swift'
@@ -161,7 +160,6 @@ def is_path_in_list(subdir, exclude_paths):
 
 
 class ParsingHelpers:
-
     # Constants
 
     DEFAULT_FRAMEWORK_NAME = 'AppTarget'
@@ -174,7 +172,7 @@ class ParsingHelpers:
     END_COMMENT = '\*/$'
     SINGLE_COMMENT = '^//'
 
-    IMPORTS = '(?<=^import)(?:[^.]+)\\b(\w+)'
+    IMPORTS = '(?<=^import )(?:\\b\w+\s|)([^.; ]+)'
 
     PROTOCOLS = '.*protocol (.*?)[:|{|\s]'
     STRUCTS = '.*struct (.*?)[:|{|\s]'

swift_code_metrics/tests/test_helper.py

@@ -36,17 +36,21 @@ def test_helpers_single_comment_check_existence_expectedTrue(self):
         string = '// True single line comment'
         self.assertTrue(_helpers.ParsingHelpers.check_existence(regex, string))
 
-
     # Imports
 
     def test_helpers_imports_extract_substring_with_pattern_expectFalse(self):
         regex = _helpers.ParsingHelpers.IMPORTS
         string = '//import Foundation '
         self.assertEqual('', _helpers.ParsingHelpers.extract_substring_with_pattern(regex, string))
 
+    def test_helpers_imports_leading_semicolon_expectFalse(self):
+        regex = _helpers.ParsingHelpers.IMPORTS
+        string = 'import Foundation;'
+        self.assertEqual('Foundation', _helpers.ParsingHelpers.extract_substring_with_pattern(regex, string))
+
     def test_helpers_imports_extract_substring_with_pattern_expectTrue(self):
         regex = _helpers.ParsingHelpers.IMPORTS
-        string = 'import Foundation'
+        string = 'import Foundation '
         self.assertEqual('Foundation', _helpers.ParsingHelpers.extract_substring_with_pattern(regex, string))
 
     def test_helpers_imports_submodule_expectTrue(self):
@@ -59,6 +63,11 @@ def test_helpers_imports_subcomponent_expectTrue(self):
         string = 'import struct Foundation.KeyChain'
         self.assertEqual('Foundation', _helpers.ParsingHelpers.extract_substring_with_pattern(regex, string))
 
+    def test_helpers_imports_specialwords_expectFalse(self):
+        regex = _helpers.ParsingHelpers.IMPORTS
+        string = 'importedMigratedComponents: AnyImportedComponent'
+        self.assertEqual('', _helpers.ParsingHelpers.extract_substring_with_pattern(regex, string))
+
     # Protocols
 
     def test_helpers_protocols_extract_substring_with_pattern_expectFalse(self):
@@ -147,5 +156,6 @@ def test_helpers_funcs_property_modifier_extract_substring_with_pattern_expectTr
         string = 'private func funzione(){'
         self.assertEqual('funzione', _helpers.ParsingHelpers.extract_substring_with_pattern(regex, string))
 
+
 if __name__ == '__main__':
     unittest.main()