diff --git a/tests/samples/codefiles/kotlin.kt b/tests/samples/codefiles/kotlin.kt index 05e30e9..000b04e 100644 --- a/tests/samples/codefiles/kotlin.kt +++ b/tests/samples/codefiles/kotlin.kt @@ -14,7 +14,7 @@ package ${package} import delta.io.* import echo.Foxtrot as Golf -import hotel +import h class MainActivity : AppCompatActivity() { diff --git a/tests/test_dependencies.py b/tests/test_dependencies.py index 046d7a6..0677581 100644 --- a/tests/test_dependencies.py +++ b/tests/test_dependencies.py @@ -456,7 +456,7 @@ class DependenciesTestCase(TestCase): 'bravo.charlie', 'delta.io', 'echo.Foxtrot', - 'hotel', + 'h', ], expected_language='Kotlin', expected_lines=24, diff --git a/wakatime/dependencies/jvm.py b/wakatime/dependencies/jvm.py index 38fa408..7107666 100644 --- a/wakatime/dependencies/jvm.py +++ b/wakatime/dependencies/jvm.py @@ -134,25 +134,16 @@ class KotlinParser(TokenParser): def _format(self, content): content = content.split(u('.')) + if content[-1] == u('*'): + content = content[:len(content) - 1] + if len(content) == 0: return None if len(content) == 1: return content[0] - if len(content[0]) == 3: - content = content[1:] - if content[-1] == u('*'): - content = content[:len(content) - 1] - - if len(content) == 0: - return None - elif len(content) == 1: - content = content[0] - elif len(content) > 1: - content = u('.').join(content[:2]) - - return content + return u('.').join(content[:2]) class ScalaParser(TokenParser):