Fix bug #83 #95
Merged
Fix bug #83 #95
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kezhenxu94
requested changes
Dec 23, 2018
| @@ -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 | |||
| @@ -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.
Do we need a space after package in the regex in case that other statement starts with package? i.e. "^\\s*package\\s+.+\n$"
| -1 | ||
| } | ||
| val lastImportKeywordLineEndIndex = try { | ||
| "^[\\s]*import.+\n$".toRegex(RegexOption.MULTILINE).findAll(document.text).last().range.endInclusive |
There was a problem hiding this comment.
Same here with import, "^\\s*import\\s+.+\n$"
add space into regex for `package and import declaration` matcher
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(cherry picked from commit 79b22d7)