Skip to content

Commit 2f2c20b

Browse files
UnthrottledUnthrottled
committed
Praize Linter & Compiler.
1 parent 0da0eeb commit 2f2c20b

File tree

92 files changed

+1636
-1453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1636
-1453
lines changed

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ intellij {
5757
plugins.set(
5858
properties("platformPlugins").split(',')
5959
.map(String::trim)
60-
.filter(String::isNotEmpty)
60+
.filter(String::isNotEmpty),
6161
)
6262
}
6363

‎detekt-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ formatting:
1818
active: false
1919
autoCorrect: false
2020
Indentation:
21-
active: true
21+
active: false
2222
autoCorrect: false
2323
indentSize: 2
2424
ParameterListWrapping:

‎src/main/kotlin/io/unthrottled/doki/TheDokiTheme.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class TheDokiTheme : Disposable {
4747
.map { it.toOptional() }
4848
.orElseGet {
4949
PluginManagerCore.getPlugin(
50-
PluginId.getId(ULTIMATE_PLUGIN_ID)
50+
PluginId.getId(ULTIMATE_PLUGIN_ID),
5151
).toOptional()
5252
}
5353
.map { it.version }
@@ -73,7 +73,7 @@ class TheDokiTheme : Disposable {
7373
setSVGColorPatcher(it)
7474
}
7575
}
76-
}
76+
},
7777
)
7878

7979
connection.subscribe(
@@ -89,7 +89,7 @@ class TheDokiTheme : Disposable {
8989
IconPathReplacementComponent.removePatchers()
9090
LookAndFeelInstaller.removeIcons()
9191
}
92-
}
92+
},
9393
)
9494
}
9595

@@ -118,7 +118,7 @@ class TheDokiTheme : Disposable {
118118
UpdateNotification.display(
119119
project,
120120
version,
121-
isNewUser
121+
isNewUser,
122122
)
123123
}
124124
}

‎src/main/kotlin/io/unthrottled/doki/actions/BackgroundToggleAction.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ import io.unthrottled.doki.config.ThemeConfig
55
import io.unthrottled.doki.settings.actors.BackgroundActor
66

77
class BackgroundToggleAction : BaseToggleAction() {
8-
override fun isSelected(e: AnActionEvent): Boolean =
9-
ThemeConfig.instance.isDokiBackground
8+
override fun isSelected(e: AnActionEvent): Boolean = ThemeConfig.instance.isDokiBackground
109

11-
override fun setSelected(e: AnActionEvent, state: Boolean) {
10+
override fun setSelected(
11+
e: AnActionEvent,
12+
state: Boolean,
13+
) {
1214
BackgroundActor.handleBackgroundUpdate(state)
1315
}
1416
}

‎src/main/kotlin/io/unthrottled/doki/actions/DiscreetModeAction.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import io.unthrottled.doki.discreet.toDiscreetMode
66
import io.unthrottled.doki.settings.actors.DiscreetModeActor
77

88
class DiscreetModeAction : BaseToggleAction() {
9-
override fun isSelected(e: AnActionEvent): Boolean =
10-
ThemeConfig.instance.discreetMode
9+
override fun isSelected(e: AnActionEvent): Boolean = ThemeConfig.instance.discreetMode
1110

12-
override fun setSelected(e: AnActionEvent, state: Boolean) {
11+
override fun setSelected(
12+
e: AnActionEvent,
13+
state: Boolean,
14+
) {
1315
DiscreetModeActor.dispatchDiscreetMode(state.toDiscreetMode())
1416
}
1517
}

‎src/main/kotlin/io/unthrottled/doki/actions/HideOnHoverAction.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ import io.unthrottled.doki.settings.actors.StickerHideActor
88
class HideOnHoverAction : BaseToggleAction(), DumbAware {
99
override fun isSelected(e: AnActionEvent): Boolean = ThemeConfig.instance.hideOnHover
1010

11-
override fun setSelected(e: AnActionEvent, state: Boolean) {
11+
override fun setSelected(
12+
e: AnActionEvent,
13+
state: Boolean,
14+
) {
1215
StickerHideActor.setStickerHideStuff(
1316
state,
14-
ThemeConfig.instance.hideDelayMS
17+
ThemeConfig.instance.hideDelayMS,
1518
)
1619
}
1720
}

‎src/main/kotlin/io/unthrottled/doki/actions/MoveableStickerToggleAction.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ import io.unthrottled.doki.config.ThemeConfig
55
import io.unthrottled.doki.settings.actors.MoveableStickerActor
66

77
class MoveableStickerToggleAction : BaseToggleAction() {
8-
override fun isSelected(e: AnActionEvent): Boolean =
9-
ThemeConfig.instance.isMoveableStickers
8+
override fun isSelected(e: AnActionEvent): Boolean = ThemeConfig.instance.isMoveableStickers
109

11-
override fun setSelected(e: AnActionEvent, state: Boolean) {
10+
override fun setSelected(
11+
e: AnActionEvent,
12+
state: Boolean,
13+
) {
1214
MoveableStickerActor.moveableStickers(state)
1315
}
1416
}

‎src/main/kotlin/io/unthrottled/doki/actions/ShowSettingsAction.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ class ShowSettingsAction : AnAction(), DumbAware {
1515
{
1616
ShowSettingsUtil.getInstance().showSettingsDialog(
1717
ProjectManager.getInstance().defaultProject,
18-
THEME_SETTINGS_DISPLAY_NAME
18+
THEME_SETTINGS_DISPLAY_NAME,
1919
)
2020
},
21-
ModalityState.NON_MODAL
21+
ModalityState.NON_MODAL,
2222
)
2323
}
2424
}

‎src/main/kotlin/io/unthrottled/doki/actions/ShowUpdateNotification.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ import io.unthrottled.doki.TheDokiTheme
77
import io.unthrottled.doki.notification.UpdateNotification
88

99
class ShowUpdateNotification : AnAction(), DumbAware {
10-
1110
override fun actionPerformed(e: AnActionEvent) {
1211
TheDokiTheme.getVersion()
1312
.ifPresent {
1413
UpdateNotification.display(
1514
e.project!!,
1615
it,
17-
false
16+
false,
1817
)
1918
}
2019
}

‎src/main/kotlin/io/unthrottled/doki/actions/StickersToggleAction.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import io.unthrottled.doki.settings.actors.StickerActor
66
import io.unthrottled.doki.stickers.StickerLevel.ON
77

88
class StickersToggleAction : BaseToggleAction() {
9-
override fun isSelected(e: AnActionEvent): Boolean =
10-
ThemeConfig.instance.currentStickerLevel == ON
9+
override fun isSelected(e: AnActionEvent): Boolean = ThemeConfig.instance.currentStickerLevel == ON
1110

12-
override fun setSelected(e: AnActionEvent, state: Boolean) {
11+
override fun setSelected(
12+
e: AnActionEvent,
13+
state: Boolean,
14+
) {
1315
StickerActor.enableStickers(state)
1416
}
1517
}

‎src/main/kotlin/io/unthrottled/doki/actions/SwapStickerAction.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import io.unthrottled.doki.settings.actors.StickerActor
66
import io.unthrottled.doki.stickers.CurrentSticker
77

88
class SwapStickerAction : BaseToggleAction() {
9-
override fun isSelected(e: AnActionEvent): Boolean =
10-
ThemeConfig.instance.currentSticker == CurrentSticker.SECONDARY
9+
override fun isSelected(e: AnActionEvent): Boolean = ThemeConfig.instance.currentSticker == CurrentSticker.SECONDARY
1110

12-
override fun setSelected(e: AnActionEvent, state: Boolean) {
11+
override fun setSelected(
12+
e: AnActionEvent,
13+
state: Boolean,
14+
) {
1315
StickerActor.swapStickers(if (state) CurrentSticker.SECONDARY else CurrentSticker.DEFAULT)
1416
}
1517
}

‎src/main/kotlin/io/unthrottled/doki/actions/ThemeAnimationToggle.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ import io.unthrottled.doki.config.ThemeConfig
55
import io.unthrottled.doki.settings.actors.LafAnimationActor
66

77
class ThemeAnimationToggle : BaseToggleAction() {
8-
override fun isSelected(e: AnActionEvent): Boolean =
9-
ThemeConfig.instance.isLafAnimation
8+
override fun isSelected(e: AnActionEvent): Boolean = ThemeConfig.instance.isLafAnimation
109

11-
override fun setSelected(e: AnActionEvent, state: Boolean) {
10+
override fun setSelected(
11+
e: AnActionEvent,
12+
state: Boolean,
13+
) {
1214
LafAnimationActor.enableAnimation(state)
1315
}
1416
}

‎src/main/kotlin/io/unthrottled/doki/assets/AssetManager.kt

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ import java.util.Optional
1919
import java.util.concurrent.Callable
2020

2121
enum class AssetCategory(val category: String) {
22-
STICKERS("stickers"), BACKGROUNDS("backgrounds"),
22+
STICKERS("stickers"),
23+
BACKGROUNDS("backgrounds"),
2324
PROMOTION("promotion"),
24-
MISC("misc")
25+
MISC("misc"),
2526
}
2627

2728
object HttpClientFactory {
@@ -41,7 +42,10 @@ object AssetManager {
4142
* file:// url to the local asset. If it was not able to get the asset then it
4243
* will return empty if the asset is not available locally.
4344
*/
44-
fun resolveAssetUrl(assetCategory: AssetCategory, assetPath: String): Optional<String> =
45+
fun resolveAssetUrl(
46+
assetCategory: AssetCategory,
47+
assetPath: String,
48+
): Optional<String> =
4549
cachedResolve(assetCategory, assetPath, ASSET_SOURCE)
4650
.map { it.toOptional() }
4751
.orElseGet {
@@ -52,7 +56,10 @@ object AssetManager {
5256
* Works just like <code>resolveAssetUrl</code> except that it will always
5357
* download the remote asset.
5458
*/
55-
fun forceResolveAssetUrl(assetCategory: AssetCategory, assetPath: String): Optional<String> =
59+
fun forceResolveAssetUrl(
60+
assetCategory: AssetCategory,
61+
assetPath: String,
62+
): Optional<String> =
5663
forceResolve(assetCategory, assetPath, ASSET_SOURCE)
5764
.map { it.toOptional() }
5865
.orElseGet {
@@ -62,7 +69,7 @@ object AssetManager {
6269
private fun cachedResolve(
6370
assetCategory: AssetCategory,
6471
assetPath: String,
65-
assetSource: String
72+
assetSource: String,
6673
): Optional<String> =
6774
resolveAsset(assetCategory, assetPath, assetSource) { localAssetPath, remoteAssetUrl ->
6875
resolveTheAssetUrl(localAssetPath, remoteAssetUrl)
@@ -71,7 +78,7 @@ object AssetManager {
7178
private fun forceResolve(
7279
assetCategory: AssetCategory,
7380
assetPath: String,
74-
assetSource: String
81+
assetSource: String,
7582
): Optional<String> =
7683
resolveAsset(assetCategory, assetPath, assetSource) { localAssetPath, remoteAssetUrl ->
7784
downloadAndGetAssetUrl(localAssetPath, remoteAssetUrl)
@@ -81,29 +88,34 @@ object AssetManager {
8188
assetCategory: AssetCategory,
8289
assetPath: String,
8390
assetSource: String,
84-
resolveAsset: (Path, String) -> Optional<String>
91+
resolveAsset: (Path, String) -> Optional<String>,
8592
): Optional<String> =
8693
constructLocalAssetPath(assetCategory, assetPath)
8794
.toOptional()
8895
.flatMap {
89-
val remoteAssetUrl = constructRemoteAssetUrl(
90-
assetCategory,
91-
assetPath,
92-
assetSource
93-
)
96+
val remoteAssetUrl =
97+
constructRemoteAssetUrl(
98+
assetCategory,
99+
assetPath,
100+
assetSource,
101+
)
94102
resolveAsset(it, remoteAssetUrl)
95103
}
96104

97105
private fun constructRemoteAssetUrl(
98106
assetCategory: AssetCategory,
99107
assetPath: String,
100-
assetSource: String
101-
): String = when (assetCategory) {
102-
AssetCategory.STICKERS -> "$assetSource/${assetCategory.category}/jetbrains/v2$assetPath"
103-
else -> "$assetSource/${assetCategory.category}/$assetPath"
104-
}
108+
assetSource: String,
109+
): String =
110+
when (assetCategory) {
111+
AssetCategory.STICKERS -> "$assetSource/${assetCategory.category}/jetbrains/v2$assetPath"
112+
else -> "$assetSource/${assetCategory.category}/$assetPath"
113+
}
105114

106-
private fun resolveTheAssetUrl(localAssetPath: Path, remoteAssetUrl: String): Optional<String> =
115+
private fun resolveTheAssetUrl(
116+
localAssetPath: Path,
117+
remoteAssetUrl: String,
118+
): Optional<String> =
107119
when {
108120
hasAssetChanged(localAssetPath, remoteAssetUrl) ->
109121
downloadAndGetAssetUrl(localAssetPath, remoteAssetUrl)
@@ -114,30 +126,30 @@ object AssetManager {
114126

115127
fun constructLocalAssetPath(
116128
assetCategory: AssetCategory,
117-
assetPath: String
129+
assetPath: String,
118130
): Path =
119131
Paths.get(
120132
getLocalAssetDirectory(),
121133
assetCategory.category,
122-
assetPath
134+
assetPath,
123135
).normalize().toAbsolutePath()
124136

125137
fun constructGlobalAssetPath(
126138
assetCategory: AssetCategory,
127-
assetPath: String
139+
assetPath: String,
128140
): Optional<Path> =
129141
getGlobalAssetDirectory()
130142
.map {
131143
Paths.get(
132144
it,
133145
assetCategory.category,
134-
assetPath
146+
assetPath,
135147
)
136148
}
137149

138150
private fun downloadAndGetAssetUrl(
139151
localAssetPath: Path,
140-
remoteAssetUrl: String
152+
remoteAssetUrl: String,
141153
): Optional<String> {
142154
createDirectories(localAssetPath)
143155
return ApplicationManager.getApplication().executeOnPooledThread(
@@ -146,13 +158,13 @@ object AssetManager {
146158
Files.newOutputStream(
147159
localAssetPath,
148160
StandardOpenOption.CREATE,
149-
StandardOpenOption.TRUNCATE_EXISTING
161+
StandardOpenOption.TRUNCATE_EXISTING,
150162
).use { bufferedWriter ->
151163
IOUtils.copy(inputStream, bufferedWriter)
152164
}
153165
localAssetPath.toUri().toString()
154166
}
155-
}
167+
},
156168
).get()
157169
}
158170
}

0 commit comments

Comments
 (0)