Skip to content

Commit b82ad6b

Browse files
committed
refactor: use better names for local variables
1 parent 029e689 commit b82ad6b

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

src/main/kotlin/com/github/lppedd/cc/configuration/CCTokensService.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ internal class CCTokensService(private val project: Project) {
3939
* Bundled commit message tokens.
4040
*/
4141
private val bundledTokensModel: TokensModel by lazy {
42-
val reader = getResourceAsStream("/defaults/${CC.File.Defaults}").bufferedReader()
43-
val result = reader.use {
42+
val defaultsReader = getResourceAsStream("/defaults/${CC.File.Defaults}").bufferedReader()
43+
val parseResult = defaultsReader.use {
4444
parseTokens(it.readText())
4545
}
4646

47-
when (result) {
48-
is TokensResult.Success -> return@lazy result.tokens
49-
is TokensResult.FileError -> error("Unexpected TokensResult.FileError. ${result.message}")
50-
is TokensResult.SchemaError -> error("unexpected TokensResult.SchemaError. ${result.failure}")
47+
when (parseResult) {
48+
is TokensResult.Success -> return@lazy parseResult.tokens
49+
is TokensResult.FileError -> error("Unexpected TokensResult.FileError. ${parseResult.message}")
50+
is TokensResult.SchemaError -> error("unexpected TokensResult.SchemaError. ${parseResult.failure}")
5151
}
5252
}
5353

src/main/kotlin/com/github/lppedd/cc/configuration/component/DefaultTokensFileExportPanel.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,13 @@ internal class DefaultTokensFileExportPanel(private val project: Project) :
6565

6666
// When exporting to a file, we also need to add the JSON schema reference.
6767
// Better normalize line endings to \n.
68-
val content = StringUtil.convertLineSeparators(
69-
getResourceAsStream("/defaults/${CC.File.Defaults}").bufferedReader().use(Reader::readText)
70-
)
68+
val defaultsReader = getResourceAsStream("/defaults/${CC.File.Defaults}").bufferedReader()
69+
val defaultsStr = StringUtil.convertLineSeparators(defaultsReader.use(Reader::readText))
7170

7271
val pluginVersion = getPluginVersion()
7372
val schemaPath = "src/main/resources/defaults/conventionalcommit.schema.json"
7473
val schemaUrl = "https://github.com/lppedd/idea-conventional-commit/raw/$pluginVersion/$schemaPath"
75-
val bytes = (content.substring(0, 4) + $$"\"$schema\": \"$$schemaUrl\",\n" + content.substring(2))
74+
val bytes = (defaultsStr.substring(0, 4) + $$"\"$schema\": \"$$schemaUrl\",\n" + defaultsStr.substring(2))
7675
.toByteArray(file.charset)
7776

7877
WriteAction.runAndWait<Throwable> {

0 commit comments

Comments
 (0)