remove unused import

add space into regex for `package and import declaration` matcher
wuseal · Dec 23, 2018 · 649d98b · 649d98b
1 parent 9902bc6
commit 649d98b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/ImportClassWriter.kt b/src/main/kotlin/wu/seal/jsontokotlin/ImportClassWriter.kt
@@ -79,12 +79,12 @@ object ImportClassWriter : IImportClassWriter {
             if (importClassLineString !in text) {
 
                 val packageIndex =  try {
-                    "^[\\s]*package".toRegex(RegexOption.MULTILINE).find(text)!!.range.endInclusive
+                    "^[\\s]*package\\s.+\n$".toRegex(RegexOption.MULTILINE).find(text)!!.range.endInclusive
                 } catch (e: Exception) {
                     -1
                 }
                 val lastImportKeywordIndex = try {
-                    "^[\\s]*import".toRegex(RegexOption.MULTILINE).findAll(text).last().range.endInclusive
+                    "^[\\s]*import\\s.+\n$".toRegex(RegexOption.MULTILINE).findAll(text).last().range.endInclusive
                 } catch (e: Exception) {
                     -1
                 }

diff --git a/src/main/kotlin/wu/seal/jsontokotlin/MakeKotlinClassAction.kt b/src/main/kotlin/wu/seal/jsontokotlin/MakeKotlinClassAction.kt
@@ -16,7 +16,6 @@ import wu.seal.jsontokotlin.feedback.sendActionInfo
 import wu.seal.jsontokotlin.ui.JsonInputDialog
 import wu.seal.jsontokotlin.utils.ClassCodeFilter
 import wu.seal.jsontokotlin.utils.executeCouldRollBackAction
-import java.awt.SystemColor.text
 import java.net.URL
 import java.util.*
 
@@ -146,12 +145,12 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
                     offset = document.textLength
                 }
                 val lastPackageKeywordLineEndIndex = try {
-                    "^[\\s]*package.+\n$".toRegex(RegexOption.MULTILINE).findAll(document.text).last().range.endInclusive
+                    "^[\\s]*package\\s.+\n$".toRegex(RegexOption.MULTILINE).findAll(document.text).last().range.endInclusive
                 } catch (e: Exception) {
                     -1
                 }
                 val lastImportKeywordLineEndIndex = try {
-                    "^[\\s]*import.+\n$".toRegex(RegexOption.MULTILINE).findAll(document.text).last().range.endInclusive
+                    "^[\\s]*import\\s.+\n$".toRegex(RegexOption.MULTILINE).findAll(document.text).last().range.endInclusive
                 } catch (e: Exception) {
                     -1
                 }