Skip to content

Commit 6b83297

Browse files
d-biehld-biehl
committed
style(intellij): some code formatting and cleanup
1 parent 74644f0 commit 6b83297

File tree

12 files changed

+172
-164
lines changed

12 files changed

+172
-164
lines changed

‎intellij-client/build.gradle.kts

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ kotlin {
2727
// Configure project's dependencies
2828
repositories {
2929
mavenCentral()
30-
30+
3131
// IntelliJ Platform Gradle Plugin Repositories Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-repositories-extension.html
3232
intellijPlatform {
3333
defaultRepositories()
@@ -37,22 +37,22 @@ repositories {
3737
// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
3838
dependencies {
3939
compileOnly(libs.kotlinxSerialization)
40-
40+
4141
testImplementation(kotlin("test"))
4242
testImplementation(libs.junit)
43-
43+
4444
// IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
4545
intellijPlatform {
4646
create(
4747
providers.gradleProperty("platformType"),
4848
providers.gradleProperty("platformVersion"),
4949
useInstaller = false,
5050
)
51-
51+
5252
// Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
5353
bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
5454
plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
55-
55+
5656
pluginVerifier()
5757
zipSigner()
5858
testFramework(TestFrameworkType.Platform)
@@ -64,22 +64,22 @@ intellijPlatform {
6464
pluginConfiguration {
6565
name = providers.gradleProperty("pluginName")
6666
version = providers.gradleProperty("pluginVersion")
67-
67+
6868
// Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
6969
description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
7070
val start = "<!-- Plugin description -->"
7171
val end = "<!-- Plugin description end -->"
72-
72+
7373
with(it.lines()) {
7474
if (!containsAll(listOf(start, end))) {
7575
throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
7676
}
7777
subList(indexOf(start) + 1, indexOf(end)).joinToString("\n").let(::markdownToHTML)
7878
}
7979
}
80-
80+
8181
val changelog = project.changelog
82-
82+
8383
// local variable for configuration cache compatibility // Get the latest available change notes from the changelog file
8484
changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion ->
8585
with(changelog) {
@@ -89,34 +89,34 @@ intellijPlatform {
8989
)
9090
}
9191
}
92-
92+
9393
ideaVersion {
9494
sinceBuild = providers.gradleProperty("pluginSinceBuild")
9595
untilBuild = providers.gradleProperty("pluginUntilBuild")
9696
}
9797
}
98-
98+
9999
signing {
100100
certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN")
101101
privateKey = providers.environmentVariable("PRIVATE_KEY")
102102
password = providers.environmentVariable("PRIVATE_KEY_PASSWORD")
103103
}
104-
104+
105105
publishing {
106106
token = providers.environmentVariable("PUBLISH_TOKEN")
107-
107+
108108
// The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
109109
// Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
110110
// https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
111111
channels = providers.gradleProperty("pluginVersion")
112112
.map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
113113
}
114-
114+
115115
pluginVerification {
116116
ides {
117117
recommended()
118118
}
119-
119+
120120
}
121121
}
122122

@@ -149,22 +149,22 @@ val prepareSandboxConfig: PrepareSandboxTask.() -> Unit = {
149149

150150
tasks {
151151
runIde {
152-
152+
153153
// From https://app.slack.com/client/T5P9YATH9/C5U8BM1MK
154154
// systemProperty("ide.experimental.ui", "true")
155155
// systemProperty("projectView.hide.dot.idea", "false")
156156
// systemProperty("terminal.new.ui", "false")
157157
// systemProperty("ide.tree.painter.compact.default", "true")
158158
}
159-
159+
160160
wrapper {
161161
gradleVersion = providers.gradleProperty("gradleVersion").get()
162162
}
163-
163+
164164
publishPlugin {
165165
dependsOn(patchChangelog)
166166
}
167-
167+
168168
prepareSandbox(prepareSandboxConfig)
169169
}
170170

@@ -190,29 +190,29 @@ tasks.withType<KotlinCompile> {
190190
)
191191
}
192192
}
193-
193+
194194
prepareSandboxTask(prepareSandboxConfig)
195-
195+
196196
plugins {
197197
robotServerPlugin(Constraints.LATEST_VERSION)
198198
}
199199
}
200200

201201
@Suppress("unused") val runIdePyCharmProf by intellijPlatformTesting.runIde.registering {
202202
type = IntelliJPlatformType.PyCharmProfessional
203-
203+
204204
prepareSandboxTask(prepareSandboxConfig)
205205
}
206206

207207
@Suppress("unused") val runIdePyCharmCommunityEAP by intellijPlatformTesting.runIde.registering {
208208
type = IntelliJPlatformType.PyCharmCommunity
209209
version = "LATEST-EAP-SNAPSHOT"
210-
210+
211211
prepareSandboxTask(prepareSandboxConfig)
212212
}
213213

214214
@Suppress("unused") val runIdeIntellijIdeaC by intellijPlatformTesting.runIde.registering {
215215
type = IntelliJPlatformType.IntellijIdeaCommunity
216-
216+
217217
prepareSandboxTask(prepareSandboxConfig)
218218
}

‎intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/RobotCodeHelpers.kt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class RobotCodeHelpers {
2222
val toolPath: Path = bundledPath.resolve("tool")
2323
val robotCodePath: Path = toolPath.resolve("robotcode")
2424
val checkRobotVersion: Path = toolPath.resolve("utils").resolve("check_robot_version.py")
25-
25+
2626
val PYTHON_AND_ROBOT_OK_KEY = Key.create<Boolean?>("ROBOTCODE_PYTHON_AND_ROBOT_OK")
2727
}
2828
}
@@ -38,28 +38,28 @@ fun Project.checkPythonAndRobotVersion(reset: Boolean = false): Boolean {
3838
if (!reset && this.getUserData(RobotCodeHelpers.PYTHON_AND_ROBOT_OK_KEY) == true) {
3939
return true
4040
}
41-
41+
4242
val result = ApplicationManager.getApplication().executeOnPooledThread<Boolean> {
43-
43+
4444
val pythonInterpreter = this.robotPythonSdk?.homePath
45-
45+
4646
if (pythonInterpreter == null) {
4747
thisLogger().info("No Python Interpreter defined for project '${this.name}'")
4848
return@executeOnPooledThread false
4949
}
50-
50+
5151
if (!Path(pythonInterpreter).exists()) {
5252
thisLogger().warn("Python Interpreter $pythonInterpreter not exists")
5353
return@executeOnPooledThread false
5454
}
55-
55+
5656
if (!Path(pythonInterpreter).isRegularFile()) {
5757
thisLogger().warn("Python Interpreter $pythonInterpreter is not a regular file")
5858
return@executeOnPooledThread false
5959
}
60-
60+
6161
thisLogger().info("Use Python Interpreter $pythonInterpreter for project '${this.name}'")
62-
62+
6363
val res = ExecUtil.execAndGetOutput(
6464
GeneralCommandLine(
6565
pythonInterpreter, "-u", "-c", "import sys; print(sys.version_info[:2]>=(3,8))"
@@ -69,7 +69,7 @@ fun Project.checkPythonAndRobotVersion(reset: Boolean = false): Boolean {
6969
thisLogger().warn("Invalid python version")
7070
return@executeOnPooledThread false
7171
}
72-
72+
7373
val res1 = ExecUtil.execAndGetOutput(
7474
GeneralCommandLine(pythonInterpreter, "-u", RobotCodeHelpers.checkRobotVersion.pathString),
7575
timeoutInMilliseconds = 5000
@@ -78,13 +78,13 @@ fun Project.checkPythonAndRobotVersion(reset: Boolean = false): Boolean {
7878
thisLogger().warn("Invalid Robot Framework version")
7979
return@executeOnPooledThread false
8080
}
81-
81+
8282
return@executeOnPooledThread true
83-
83+
8484
}.get()
85-
85+
8686
this.putUserData(RobotCodeHelpers.PYTHON_AND_ROBOT_OK_KEY, result)
87-
87+
8888
return result
8989
}
9090

@@ -100,7 +100,7 @@ fun Project.buildRobotCodeCommandLine(
100100
if (!this.checkPythonAndRobotVersion()) {
101101
throw IllegalArgumentException("PythonSDK is not defined or robot version is not valid for project ${this.name}")
102102
}
103-
103+
104104
val pythonInterpreter = this.robotPythonSdk?.homePath
105105
val commandLine = GeneralCommandLine(
106106
pythonInterpreter,
@@ -115,6 +115,6 @@ fun Project.buildRobotCodeCommandLine(
115115
*extraArgs,
116116
*args
117117
).withWorkDirectory(this.basePath).withCharset(Charsets.UTF_8)
118-
118+
119119
return commandLine
120120
}

‎intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/TextMateBundleHolder.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ import org.jetbrains.plugins.textmate.language.syntax.TextMateSyntaxTableBuilder
88

99
object TextMateBundleHolder {
1010
private val interner = TextMateConcurrentMapInterner()
11-
11+
1212
val descriptor: TextMateLanguageDescriptor by lazy {
13-
13+
1414
val reader = TextMateService.getInstance().readBundle(RobotCodeHelpers.basePath)
1515
?: throw IllegalStateException("Failed to read robotcode textmate bundle")
16-
16+
1717
val builder = TextMateSyntaxTableBuilder(interner)
18-
18+
1919
val grammarIterator = reader.readGrammars().iterator()
2020
while (grammarIterator.hasNext()) {
2121
val grammar = grammarIterator.next()
22-
23-
val rootScopeName = builder.addSyntax(grammar.plist.value) ?: continue
22+
23+
val rootScopeName = builder.addSyntax(grammar.plist.value) ?: continue
2424
if (rootScopeName == "source.robotframework") {
2525
val syntax = builder.build()
2626
return@lazy TextMateLanguageDescriptor(rootScopeName, syntax.getSyntax(rootScopeName))
2727
}
2828
}
29-
29+
3030
throw IllegalStateException("Failed to find robotcode textmate in bundle")
3131
}
32-
32+
3333
}

‎intellij-client/src/main/kotlin/dev/robotcode/robotcode4ij/configuration/RobotCodeColorSettingsPage.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import dev.robotcode.robotcode4ij.highlighting.RobotCodeSyntaxHighlighter
1111
import javax.swing.Icon
1212

1313
class RobotCodeColorSettingsPage : ColorSettingsPage {
14-
14+
1515
private val descriptors: Array<AttributesDescriptor> = arrayOf(
1616
AttributesDescriptor("Header", Colors.HEADER),
1717
AttributesDescriptor("Test case name", Colors.TESTCASE_NAME),
@@ -30,37 +30,37 @@ class RobotCodeColorSettingsPage : ColorSettingsPage {
3030
AttributesDescriptor("Variable expression", Colors.VARIABLE_EXPRESSION),
3131
AttributesDescriptor("Variable begin", Colors.VARIABLE_BEGIN),
3232
AttributesDescriptor("Variable end", Colors.VARIABLE_END),
33-
33+
3434
AttributesDescriptor("Line comment", Colors.LINE_COMMENT),
3535
AttributesDescriptor("Block comment", Colors.BLOCK_COMMENT),
36-
36+
3737
AttributesDescriptor("Operator", Colors.OPERATOR),
3838
AttributesDescriptor("Namespace", Colors.NAMESPACE),
3939
AttributesDescriptor("BDD prefix", Colors.BDD_PREFIX),
40-
40+
4141
AttributesDescriptor("Continuation", Colors.CONTINUATION),
4242
)
43-
43+
4444
override fun getAttributeDescriptors(): Array<AttributesDescriptor> {
4545
return descriptors
4646
}
47-
47+
4848
override fun getColorDescriptors(): Array<ColorDescriptor> {
4949
return ColorDescriptor.EMPTY_ARRAY
5050
}
51-
51+
5252
override fun getDisplayName(): String {
5353
return "Robot Framework"
5454
}
55-
55+
5656
override fun getIcon(): Icon? {
5757
return RobotIcons.RobotCode
5858
}
59-
59+
6060
override fun getHighlighter(): SyntaxHighlighter {
6161
return RobotCodeSyntaxHighlighter()
6262
}
63-
63+
6464
override fun getDemoText(): String {
6565
return """
6666
*** Settings ***
@@ -124,7 +124,7 @@ class RobotCodeColorSettingsPage : ColorSettingsPage {
124124
with multiple lines
125125
""".trimIndent()
126126
}
127-
127+
128128
override fun getAdditionalHighlightingTagToDescriptorMap(): MutableMap<String, TextAttributesKey>? {
129129
return null
130130
}

0 commit comments

Comments
 (0)