-
Notifications
You must be signed in to change notification settings - Fork 175
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.
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
Fix bug #83 #95
Fix bug #83 #95
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good job and I've added minor comment
@@ -16,6 +16,7 @@ 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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unused import
@@ -144,6 +145,23 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") { | |||
if (offset == 0) { | |||
offset = document.textLength | |||
} | |||
val lastPackageKeywordLineEndIndex = try { | |||
"^[\\s]*package.+\n$".toRegex(RegexOption.MULTILINE).findAll(document.text).last().range.endInclusive |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need a space after package
in the regex in case that other statement starts with package
? i.e. "^\\s*package\\s+.+\n$"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, you are right.
-1 | ||
} | ||
val lastImportKeywordLineEndIndex = try { | ||
"^[\\s]*import.+\n$".toRegex(RegexOption.MULTILINE).findAll(document.text).last().range.endInclusive |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here with import
, "^\\s*import\\s+.+\n$"
add space into regex for `package and import declaration` matcher
(cherry picked from commit 79b22d7)