Skip to content

Commit f9922f5

Browse files
egorikftpegorikftp
committed
Merge :ktfile with :pis:imagevector
1 parent a69059f commit f9922f5

33 files changed

Lines changed: 75 additions & 101 deletions

‎components/parser/ktfile/build.gradle.kts‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎components/parser/ktfile/src/main/kotlin/io/github/composegears/valkyrie/parser/ktfile/KtFileToImageVectorParser.kt‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎components/psi/imagevector/build.gradle.kts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,42 @@
1+
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
2+
13
plugins {
24
alias(libs.plugins.kotlin.jvm)
5+
alias(libs.plugins.valkyrie.compose)
36
alias(libs.plugins.jetbrains.intellij.module)
47
alias(libs.plugins.kover)
58
}
69

10+
sourceSets {
11+
test {
12+
resources {
13+
srcDir("$rootDir/components/sharedTestResources")
14+
}
15+
}
16+
}
17+
18+
configurations {
19+
testImplementation {
20+
exclude(group = "org.jetbrains.kotlinx")
21+
}
22+
}
23+
724
dependencies {
825
implementation(projects.components.extensions)
926
implementation(projects.components.ir)
27+
28+
compileOnly(compose.runtime)
29+
30+
testImplementation(compose.ui)
31+
testImplementation(projects.components.irCompose)
1032
testImplementation(libs.bundles.test)
1133
testRuntimeOnly(libs.junit.launcher)
34+
35+
// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#junit5-test-framework-refers-to-junit4
36+
testRuntimeOnly(libs.junit4)
37+
38+
intellijPlatform {
39+
testFramework(TestFrameworkType.Platform)
40+
testFramework(TestFrameworkType.JUnit5)
41+
}
1242
}

components/parser/ktfile/src/test/kotlin/androidx/compose/material/icons/Icons.kt renamed to components/psi/imagevector/src/test/kotlin/androidx/compose/material/icons/Icons.kt

File renamed without changes.

components/psi/imagevector/src/test/kotlin/io/github/composegears/valkyrie/psi/imagevector/common/KtCallExpressionTests.kt renamed to components/psi/imagevector/src/test/kotlin/io/github/composegears/valkyrie/psi/imagevector/KtCallExpressionTests.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package io.github.composegears.valkyrie.psi.imagevector.common
1+
package io.github.composegears.valkyrie.psi.imagevector
22

33
import assertk.assertThat
44
import assertk.assertions.isEqualTo
55
import assertk.assertions.isNull
66
import io.github.composegears.valkyrie.ir.IrColor
7+
import io.github.composegears.valkyrie.psi.imagevector.common.getIrColor
78
import org.junit.jupiter.api.Nested
89
import org.junit.jupiter.api.Test
910

components/parser/ktfile/src/test/kotlin/io/github/composegears/valkyrie/parser/ktfile/KtFileToImageVectorParserTest.kt renamed to components/psi/imagevector/src/test/kotlin/io/github/composegears/valkyrie/psi/imagevector/KtFileToImageVectorParserTest.kt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
package io.github.composegears.valkyrie.parser.ktfile
1+
package io.github.composegears.valkyrie.psi.imagevector
22

33
import assertk.assertThat
44
import assertk.assertions.isEqualTo
55
import com.intellij.openapi.project.Project
66
import com.intellij.testFramework.ProjectExtension
77
import com.intellij.testFramework.runInEdtAndGet
8-
import io.github.composegears.valkyrie.parser.ktfile.common.ParseType
9-
import io.github.composegears.valkyrie.parser.ktfile.common.createKtFile
10-
import io.github.composegears.valkyrie.parser.ktfile.common.toKtFile
11-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedAllGroupParams
12-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedAllPathParams
13-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedClipPathGradient
14-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedComposeColor
15-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedEmptyImageVector
16-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedEmptyPaths
17-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedIconWithGroup
18-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedLinearGradient
19-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedLinearGradientWithStroke
20-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedMaterialIcon
21-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedRadialGradient
22-
import io.github.composegears.valkyrie.parser.ktfile.expected.ExpectedSinglePath
23-
import org.junit.jupiter.api.Test
8+
import io.github.composegears.valkyrie.ir.compose.toComposeImageVector
9+
import io.github.composegears.valkyrie.psi.imagevector.common.ParseType
10+
import io.github.composegears.valkyrie.psi.imagevector.common.createKtFile
11+
import io.github.composegears.valkyrie.psi.imagevector.common.toKtFile
12+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedAllGroupParams
13+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedAllPathParams
14+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedClipPathGradient
15+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedComposeColor
16+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedEmptyImageVector
17+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedEmptyPaths
18+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedIconWithGroup
19+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedLinearGradient
20+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedLinearGradientWithStroke
21+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedMaterialIcon
22+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedRadialGradient
23+
import io.github.composegears.valkyrie.psi.imagevector.expected.ExpectedSinglePath
2424
import org.junit.jupiter.api.extension.RegisterExtension
2525
import org.junit.jupiter.params.ParameterizedTest
2626
import org.junit.jupiter.params.provider.EnumSource
@@ -44,7 +44,7 @@ class KtFileToImageVectorParserTest {
4444
pathToLazy = "lazy/EmptyImageVector.kt",
4545
pathToBacking = "backing/EmptyImageVector.kt",
4646
)
47-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
47+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
4848

4949
assertThat(imageVector).isEqualTo(ExpectedEmptyImageVector)
5050
}
@@ -57,7 +57,7 @@ class KtFileToImageVectorParserTest {
5757
pathToLazy = "lazy/EmptyPaths.kt",
5858
pathToBacking = "backing/EmptyPaths.kt",
5959
)
60-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
60+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
6161

6262
assertThat(imageVector).isEqualTo(ExpectedEmptyPaths)
6363
}
@@ -70,15 +70,15 @@ class KtFileToImageVectorParserTest {
7070
pathToLazy = "lazy/AllPathParams.kt",
7171
pathToBacking = "backing/AllPathParams.kt",
7272
)
73-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
73+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
7474

7575
assertThat(imageVector).isEqualTo(ExpectedAllPathParams)
7676
}
7777

78-
@Test
78+
@org.junit.jupiter.api.Test
7979
fun `parse material icon`() = runInEdtAndGet {
8080
val ktFile = project.createKtFile(from = "backing/MaterialIcon.kt")
81-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
81+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
8282

8383
assertThat(imageVector).isEqualTo(ExpectedMaterialIcon)
8484
}
@@ -91,7 +91,7 @@ class KtFileToImageVectorParserTest {
9191
pathToLazy = "lazy/IconWithGroup.kt",
9292
pathToBacking = "backing/IconWithGroup.kt",
9393
)
94-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
94+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
9595

9696
assertThat(imageVector).isEqualTo(ExpectedIconWithGroup)
9797
}
@@ -104,7 +104,7 @@ class KtFileToImageVectorParserTest {
104104
pathToLazy = "lazy/SinglePath.kt",
105105
pathToBacking = "backing/SinglePath.kt",
106106
)
107-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
107+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
108108

109109
assertThat(imageVector).isEqualTo(ExpectedSinglePath)
110110
}
@@ -117,7 +117,7 @@ class KtFileToImageVectorParserTest {
117117
pathToLazy = "imagevector/kt/lazy/AllGroupParams.kt",
118118
pathToBacking = "imagevector/kt/backing/AllGroupParams.kt",
119119
)
120-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
120+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
121121

122122
assertThat(imageVector).isEqualTo(ExpectedAllGroupParams)
123123
}
@@ -130,7 +130,7 @@ class KtFileToImageVectorParserTest {
130130
pathToLazy = "imagevector/kt/lazy/ComposeColor.kt",
131131
pathToBacking = "imagevector/kt/backing/ComposeColor.kt",
132132
)
133-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
133+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
134134

135135
assertThat(imageVector).isEqualTo(ExpectedComposeColor)
136136
}
@@ -143,7 +143,7 @@ class KtFileToImageVectorParserTest {
143143
pathToLazy = "imagevector/kt/backing/LinearGradient.kt",
144144
pathToBacking = "imagevector/kt/lazy/LinearGradient.kt",
145145
)
146-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
146+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
147147

148148
assertThat(imageVector).isEqualTo(ExpectedLinearGradient)
149149
}
@@ -156,7 +156,7 @@ class KtFileToImageVectorParserTest {
156156
pathToLazy = "imagevector/kt/backing/LinearGradientWithStroke.kt",
157157
pathToBacking = "imagevector/kt/lazy/LinearGradientWithStroke.kt",
158158
)
159-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
159+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
160160

161161
assertThat(imageVector).isEqualTo(ExpectedLinearGradientWithStroke)
162162
}
@@ -169,7 +169,7 @@ class KtFileToImageVectorParserTest {
169169
pathToLazy = "imagevector/kt/lazy/ClipPathGradient.kt",
170170
pathToBacking = "imagevector/kt/backing/ClipPathGradient.kt",
171171
)
172-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
172+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
173173

174174
assertThat(imageVector).isEqualTo(ExpectedClipPathGradient)
175175
}
@@ -182,7 +182,7 @@ class KtFileToImageVectorParserTest {
182182
pathToLazy = "imagevector/kt/backing/RadialGradient.kt",
183183
pathToBacking = "imagevector/kt/lazy/RadialGradient.kt",
184184
)
185-
val imageVector = KtFileToImageVectorParser.parse(ktFile)
185+
val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
186186

187187
assertThat(imageVector).isEqualTo(ExpectedRadialGradient)
188188
}

components/parser/ktfile/src/test/kotlin/io/github/composegears/valkyrie/parser/ktfile/common/KtFile.kt renamed to components/psi/imagevector/src/test/kotlin/io/github/composegears/valkyrie/psi/imagevector/common/KtFile.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.composegears.valkyrie.parser.ktfile.common
1+
package io.github.composegears.valkyrie.psi.imagevector.common
22

33
import com.intellij.openapi.project.Project
44
import com.intellij.psi.PsiManager

components/parser/ktfile/src/test/kotlin/io/github/composegears/valkyrie/parser/ktfile/common/ParseType.kt renamed to components/psi/imagevector/src/test/kotlin/io/github/composegears/valkyrie/psi/imagevector/common/ParseType.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.composegears.valkyrie.parser.ktfile.common
1+
package io.github.composegears.valkyrie.psi.imagevector.common
22

33
import com.intellij.openapi.project.Project
44
import org.jetbrains.kotlin.psi.KtFile

components/parser/ktfile/src/test/kotlin/io/github/composegears/valkyrie/parser/ktfile/expected/AllGroupParams.kt renamed to components/psi/imagevector/src/test/kotlin/io/github/composegears/valkyrie/psi/imagevector/expected/AllGroupParams.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.composegears.valkyrie.parser.ktfile.expected
1+
package io.github.composegears.valkyrie.psi.imagevector.expected
22

33
import androidx.compose.ui.graphics.Color
44
import androidx.compose.ui.graphics.SolidColor

components/parser/ktfile/src/test/kotlin/io/github/composegears/valkyrie/parser/ktfile/expected/AllPathParams.kt renamed to components/psi/imagevector/src/test/kotlin/io/github/composegears/valkyrie/psi/imagevector/expected/AllPathParams.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.composegears.valkyrie.parser.ktfile.expected
1+
package io.github.composegears.valkyrie.psi.imagevector.expected
22

33
import androidx.compose.ui.graphics.Color
44
import androidx.compose.ui.graphics.PathFillType

0 commit comments

Comments
 (0)