Skip to content

Commit cf35033

Browse files
committed
chore: format with ktfmt --kotlinlang-style
1 parent 1ca4934 commit cf35033

File tree

8 files changed

+78
-56
lines changed

8 files changed

+78
-56
lines changed

src/main/kotlin/com/github/tempest/framework/ComponentGotoDeclarationHandler.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ import com.intellij.psi.util.PsiTreeUtil
1313

1414
class ComponentGotoDeclarationHandler : GotoDeclarationHandler {
1515
override fun getGotoDeclarationTargets(
16-
element: PsiElement?, offset: Int, editor: Editor?
16+
element: PsiElement?,
17+
offset: Int,
18+
editor: Editor?,
1719
): Array<PsiElement>? {
1820
if (element == null) return null
1921

@@ -26,7 +28,9 @@ class ComponentGotoDeclarationHandler : GotoDeclarationHandler {
2628
val libraryFiles = mutableListOf<PsiFile>()
2729

2830
FilenameIndex.processFilesByName(
29-
tag.name + TempestFrameworkUtil.TEMPLATE_PREFIX, true, GlobalSearchScope.projectScope(project)
31+
tag.name + TempestFrameworkUtil.TEMPLATE_PREFIX,
32+
true,
33+
GlobalSearchScope.projectScope(project),
3034
) { virtualFile ->
3135
val psiFile = virtualFile.findPsiFile(project) ?: return@processFilesByName true
3236

src/main/kotlin/com/github/tempest/framework/ComponentTagNameProvider.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import com.intellij.xml.XmlTagNameProvider
99

1010
class ComponentTagNameProvider : XmlTagNameProvider {
1111
override fun addTagNameVariants(
12-
elements: MutableList<LookupElement>, tag: XmlTag, prefix: String?
12+
elements: MutableList<LookupElement>,
13+
tag: XmlTag,
14+
prefix: String?,
1315
) {
1416
val project = tag.project
1517

@@ -31,7 +33,10 @@ class ComponentTagNameProvider : XmlTagNameProvider {
3133

3234
elements.addAll(
3335
result.map {
34-
LookupElementBuilder.create(it).withIcon(TempestIcons.TEMPEST).withTypeText("Tempest Component")
35-
})
36+
LookupElementBuilder.create(it)
37+
.withIcon(TempestIcons.TEMPEST)
38+
.withTypeText("Tempest Component")
39+
}
40+
)
3641
}
3742
}

src/main/kotlin/com/github/tempest/framework/SpellcheckingDictionaryProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ import com.intellij.spellchecker.BundledDictionaryProvider
44

55
class SpellcheckingDictionaryProvider : BundledDictionaryProvider {
66
override fun getBundledDictionaries(): Array<String> = arrayOf("/META-INF/spellcheck.dic")
7-
}
7+
}

src/main/kotlin/com/github/tempest/framework/TempestBundle.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import com.intellij.DynamicBundle
44
import org.jetbrains.annotations.NonNls
55
import org.jetbrains.annotations.PropertyKey
66

7-
@NonNls
8-
private const val BUNDLE = "messages.TempestBundle"
7+
@NonNls private const val BUNDLE = "messages.TempestBundle"
98

109
object TempestBundle : DynamicBundle(BUNDLE) {
1110

1211
@JvmStatic
13-
fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any) = getMessage(key, *params)
12+
fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any) =
13+
getMessage(key, *params)
1414

1515
@Suppress("unused")
1616
@JvmStatic

src/main/kotlin/com/github/tempest/framework/TempestFrameworkUtil.kt

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@ package com.github.tempest.framework
33
object TempestFrameworkUtil {
44
const val TEMPLATE_PREFIX = ".view.php"
55

6-
private val BUILT_IN_COMPONENTS = setOf(
7-
"x-base",
8-
"x-form",
9-
"x-input",
10-
"x-submit",
11-
"x-csrf-token",
12-
"x-icon",
13-
"x-vite-tags",
14-
"x-template",
15-
"x-slot",
16-
"x-markdown",
17-
"x-component",
18-
)
6+
private val BUILT_IN_COMPONENTS =
7+
setOf(
8+
"x-base",
9+
"x-form",
10+
"x-input",
11+
"x-submit",
12+
"x-csrf-token",
13+
"x-icon",
14+
"x-vite-tags",
15+
"x-template",
16+
"x-slot",
17+
"x-markdown",
18+
"x-component",
19+
)
1920

2021
fun isBuiltInComponent(name: String): Boolean = BUILT_IN_COMPONENTS.contains(name)
2122
}

src/main/kotlin/com/github/tempest/framework/TempestIcons.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ import com.intellij.openapi.util.IconLoader
44

55
object TempestIcons {
66
@JvmField
7-
val TEMPEST = IconLoader.getIcon("/icons/tempest/icon_transparent.svg", TempestIcons::class.java)
7+
val TEMPEST =
8+
IconLoader.getIcon("/icons/tempest/icon_transparent.svg", TempestIcons::class.java)
89
}

src/main/kotlin/com/github/tempest/framework/views/injection/InjectionHostWrapper.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import com.intellij.psi.PsiLanguageInjectionHost
88
import com.intellij.psi.impl.source.html.HtmlRawTextImpl
99
import com.intellij.psi.impl.source.xml.XmlTextImpl
1010

11-
abstract class InjectionHostWrapper(node: ASTNode) : ASTWrapperPsiElement(node), PsiLanguageInjectionHost {
11+
abstract class InjectionHostWrapper(node: ASTNode) :
12+
ASTWrapperPsiElement(node), PsiLanguageInjectionHost {
1213
override fun isValidHost(): Boolean = true
1314

1415
override fun updateText(text: String): PsiLanguageInjectionHost {
@@ -17,10 +18,12 @@ abstract class InjectionHostWrapper(node: ASTNode) : ASTWrapperPsiElement(node),
1718
}
1819
}
1920

20-
class XmlTextInjectionHostWrapper(val myElement: XmlTextImpl) : InjectionHostWrapper(myElement.node) {
21+
class XmlTextInjectionHostWrapper(val myElement: XmlTextImpl) :
22+
InjectionHostWrapper(myElement.node) {
2123
override fun createLiteralTextEscaper() = myElement.createLiteralTextEscaper()
2224
}
2325

24-
class HtmlTextInjectionHostWrapper(val myElement: HtmlRawTextImpl) : InjectionHostWrapper(myElement.node) {
26+
class HtmlTextInjectionHostWrapper(val myElement: HtmlRawTextImpl) :
27+
InjectionHostWrapper(myElement.node) {
2528
override fun createLiteralTextEscaper() = LiteralTextEscaper.createSimple(this, false)
26-
}
29+
}

src/main/kotlin/com/github/tempest/framework/views/injection/PHPLanguageInjector.kt

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ import com.intellij.psi.xml.XmlText
1515
import com.intellij.psi.xml.XmlToken
1616

1717
class PHPLanguageInjector : MultiHostInjector {
18-
override fun getLanguagesToInject(
19-
registrar: MultiHostRegistrar, element: PsiElement
20-
) {
18+
override fun getLanguagesToInject(registrar: MultiHostRegistrar, element: PsiElement) {
2119
when (element) {
2220
is XmlAttributeValue -> {
2321
val attribute = element.parent as? XmlAttribute ?: return
@@ -26,51 +24,61 @@ class PHPLanguageInjector : MultiHostInjector {
2624

2725
val injectableHost = element as? PsiLanguageInjectionHost ?: return
2826

29-
registrar.startInjecting(Language.findLanguageByID("PHP") ?: return)
30-
.addPlace("<?=", "?>", injectableHost, TextRange(0, injectableHost.textLength)).doneInjecting()
27+
registrar
28+
.startInjecting(Language.findLanguageByID("PHP") ?: return)
29+
.addPlace("<?=", "?>", injectableHost, TextRange(0, injectableHost.textLength))
30+
.doneInjecting()
3131
}
3232

3333
is HtmlTag -> {
34-
element.children.mapNotNull { it as? HtmlRawTextImpl }.forEach { child ->
35-
injectIntoText(HtmlTextInjectionHostWrapper(child), registrar)
36-
}
34+
element.children
35+
.mapNotNull { it as? HtmlRawTextImpl }
36+
.forEach { child ->
37+
injectIntoText(HtmlTextInjectionHostWrapper(child), registrar)
38+
}
3739
}
3840

3941
is XmlText -> {
40-
// println("element: ${element.text}, ${element.javaClass.name} ${element is PsiLanguageInjectionHost}")
42+
// println("element: ${element.text}, ${element.javaClass.name}
43+
// ${element is
44+
// PsiLanguageInjectionHost}")
4145
val injectableHost = element as? PsiLanguageInjectionHost ?: return
4246
injectIntoText(injectableHost, registrar)
4347
}
4448
}
4549
}
4650

47-
val tagsMap = mapOf(
48-
"{!!" to "!!}",
49-
"{{" to "}}",
50-
)
51+
val tagsMap = mapOf("{!!" to "!!}", "{{" to "}}")
5152

52-
private fun injectIntoText(
53-
element: PsiLanguageInjectionHost, registrar: MultiHostRegistrar
54-
) {
55-
val children = element.node.children().toList().filter { it is XmlToken }.apply { if (size < 2) return }
53+
private fun injectIntoText(element: PsiLanguageInjectionHost, registrar: MultiHostRegistrar) {
54+
val children =
55+
element.node
56+
.children()
57+
.toList()
58+
.filter { it is XmlToken }
59+
.apply { if (size < 2) return }
5660

57-
// println("children: $children")
61+
// println("children: $children")
5862
val openTag = children.find { it.text == "{!!" || it.text == "{{" }?.psi ?: return
5963
val closeTag = children.find { it.text == tagsMap[openTag.text] }?.psi
6064

61-
// println("openTag: ${openTag.text}, closeTag: ${closeTag?.text}")
62-
if ((openTag.text == "{!!" && closeTag?.text == "!!}") || (openTag.text == "{{" && closeTag?.text == "}}")) {
65+
// println("openTag: ${openTag.text}, closeTag: ${closeTag?.text}")
66+
if (
67+
(openTag.text == "{!!" && closeTag?.text == "!!}") ||
68+
(openTag.text == "{{" && closeTag?.text == "}}")
69+
) {
6370
val language = Language.findLanguageByID("PHP") ?: return
6471

65-
val textRange = TextRange(openTag.textRangeInParent.endOffset, closeTag.startOffsetInParent)
66-
// println("injecting ${language} into $element, $textRange")
67-
registrar.startInjecting(language).addPlace("<?=", "?>", element, textRange).doneInjecting()
72+
val textRange =
73+
TextRange(openTag.textRangeInParent.endOffset, closeTag.startOffsetInParent)
74+
// println("injecting ${language} into $element, $textRange")
75+
registrar
76+
.startInjecting(language)
77+
.addPlace("<?=", "?>", element, textRange)
78+
.doneInjecting()
6879
}
6980
}
7081

71-
override fun elementsToInjectIn() = listOf(
72-
XmlAttributeValue::class.java,
73-
XmlText::class.java,
74-
HtmlTag::class.java,
75-
)
76-
}
82+
override fun elementsToInjectIn() =
83+
listOf(XmlAttributeValue::class.java, XmlText::class.java, HtmlTag::class.java)
84+
}

0 commit comments

Comments
 (0)