Skip to content

Commit 7d40cd9

Browse files
SanderKnauffSanderKnauff
authored
Upgrade plugin to Idea 25.1 (#230)
1 parent 0894645 commit 7d40cd9

File tree

6 files changed

+24
-23
lines changed

6 files changed

+24
-23
lines changed

‎build.gradle.kts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
22
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
3-
import java.net.URL
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
4+
import java.net.URI
45

56
// Configure project's dependencies
67
repositories {
@@ -16,13 +17,13 @@ plugins {
1617
// Kotlin support
1718
id("org.jetbrains.kotlin.jvm") version "2.1.20"
1819
// gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
19-
id("org.jetbrains.intellij.platform") version "2.2.1"
20+
id("org.jetbrains.intellij.platform") version "2.5.0"
2021
// id("org.jetbrains.intellij.platform.migration") version "2.0.0-beta7"
2122
}
2223

2324

2425
group = "com.emberjs"
25-
version = "2024.3.7"
26+
version = "2025.1.0"
2627

2728
dependencies {
2829
testImplementation("org.jetbrains.kotlin:kotlin-test")
@@ -35,13 +36,12 @@ dependencies {
3536
// and https://www.jetbrains.com/intellij-repository/snapshots/
3637
// https://plugins.jetbrains.com/plugin/6884-handlebars-mustache/versions/stable
3738
intellijPlatform {
38-
plugins(listOf("com.dmarcotte.handlebars:243.21565.122"))
39+
plugins(listOf("com.dmarcotte.handlebars:251.23774.318"))
3940
bundledPlugins(listOf("JavaScript", "com.intellij.css", "org.jetbrains.plugins.yaml", "com.intellij.modules.json"))
4041
pluginVerifier()
4142
zipSigner()
42-
instrumentationTools()
4343
testFramework(TestFrameworkType.Platform)
44-
create(IntelliJPlatformType.IntellijIdeaUltimate, "2024.3")
44+
create(IntelliJPlatformType.IntellijIdeaUltimate, "2025.1")
4545
}
4646
}
4747

@@ -64,11 +64,11 @@ intellijPlatform {
6464

6565
tasks {
6666
compileKotlin {
67-
kotlinOptions.jvmTarget = "17"
67+
compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
6868
}
6969

7070
compileTestKotlin {
71-
kotlinOptions.jvmTarget = "17"
71+
compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
7272
}
7373

7474
publishPlugin {
@@ -105,7 +105,7 @@ tasks.register("updateChangelog") {
105105

106106
tasks.register("listRecentReleased") {
107107
doLast {
108-
val text = URL("https://plugins.jetbrains.com/api/plugins/15499/updates?channel=&size=8").readText()
108+
val text = URI("https://plugins.jetbrains.com/api/plugins/15499/updates?channel=&size=8").toURL().readText()
109109
val obj = groovy.json.JsonSlurper().parseText(text)
110110
val versions = (obj as ArrayList<Map<*,*>>).map { it.get("version") }
111111
println(groovy.json.JsonBuilder(versions).toPrettyString())
@@ -115,7 +115,7 @@ tasks.register("listRecentReleased") {
115115
tasks.register("verifyAlreadyReleased") {
116116
doLast {
117117
var input = generateSequence(::readLine).joinToString("\n")
118-
val text = URL("https://plugins.jetbrains.com/api/plugins/15499/updates?channel=&size=100").readText()
118+
val text = URI("https://plugins.jetbrains.com/api/plugins/15499/updates?channel=&size=100").toURL().readText()
119119
val obj = groovy.json.JsonSlurper().parseText(text)
120120
val versions = (obj as ArrayList<Map<*,*>>).map { it.get("version") }
121121
println(versions.contains(input))

‎src/main/kotlin/com/emberjs/cli/EmberCliProjectGenerator.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.emberjs.cli
22

33
import com.emberjs.icons.EmberIcons
4+
import com.intellij.execution.filters.Filter
45
import com.intellij.ide.util.projectWizard.SettingsStep
56
import com.intellij.javascript.nodejs.util.NodePackage
67
import com.intellij.lang.javascript.boilerplate.NpmPackageProjectGenerator
@@ -40,7 +41,7 @@ open class EmberCliProjectGenerator : NpmPackageProjectGenerator() {
4041
?: "${pkg.systemDependentPath}${File.separator}bin${File.separator}ember"
4142
}
4243

43-
override fun generatorArgs(project: Project, baseDir: VirtualFile, settings: Settings): Array<out String> {
44+
override fun generatorArgs(project: Project, baseDir: VirtualFile, settings: Settings): Array<String> {
4445
val isAddon = settings.getUserData(CREATE_ADDON_KEY) ?: false
4546
val lang = settings.getUserData(USE_LANGUAGE_KEY) ?: ""
4647
val blueprint = settings.getUserData(USE_BLUEPRINT_KEY) ?: ""
@@ -104,7 +105,7 @@ open class EmberCliProjectGenerator : NpmPackageProjectGenerator() {
104105
}
105106
}
106107

107-
override fun filters(project: Project, baseDir: VirtualFile) = arrayOf(EmberCliFilter(project, baseDir.path))
108+
override fun filters(project: Project, baseDir: VirtualFile): Array<Filter> = arrayOf(EmberCliFilter(project, baseDir.path))
108109

109110
override fun customizeModule(baseDir: VirtualFile, entry: ContentEntry?) = Unit
110111

‎src/main/kotlin/com/emberjs/glint/GlintLanguageService.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class GlintTypeScriptService(project: Project) : BaseLspTypeScriptService(projec
159159
}
160160

161161

162-
override fun getSignatureHelp(file: PsiFile, context: CreateParameterInfoContext): Future<Stream<JSFunctionType>?>? = null
162+
override fun getSignatureHelp(file: PsiFile, offset: Int): Future<Stream<JSFunctionType>?>? = null
163163

164164
override fun isDisabledByContext(context: VirtualFile): Boolean {
165165
return getDescriptor()?.isAvailable(context)?.not() ?: return true

‎src/main/kotlin/com/emberjs/gts/GtsSupport.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,14 @@ class GtsElementTypes {
237237
}
238238
val GTS_FILE_NODE_TYPE = object : IFileElementType("GTS", GtsLanguage.INSTANCE) {
239239
override fun equals(other: Any?): Boolean {
240-
if (other == TypeScriptFileType.INSTANCE) {
240+
if (other == TypeScriptFileType) {
241241
return true
242242
}
243243
return super.equals(other)
244244
}
245245

246246
override fun hashCode(): Int {
247-
return TypeScriptFileType.INSTANCE.hashCode()
247+
return TypeScriptFileType.hashCode()
248248
}
249249

250250
override fun doParseContents(chameleon: ASTNode, psi: PsiElement): ASTNode {
@@ -258,14 +258,14 @@ class GtsElementTypes {
258258
}
259259
val GJS_FILE_NODE_TYPE = object : IFileElementType("GJS", GjsLanguage.INSTANCE) {
260260
override fun equals(other: Any?): Boolean {
261-
if (other == JavaScriptFileType.INSTANCE) {
261+
if (other == JavaScriptFileType) {
262262
return true
263263
}
264264
return super.equals(other)
265265
}
266266

267267
override fun hashCode(): Int {
268-
return JavaScriptFileType.INSTANCE.hashCode()
268+
return JavaScriptFileType.hashCode()
269269
}
270270

271271
override fun doParseContents(chameleon: ASTNode, psi: PsiElement): ASTNode {
@@ -389,7 +389,7 @@ class GtsLexerAdapter(baseLexer: Lexer = HtmlLexer(), val hideMode: Boolean =fal
389389
class GtsFileType : LanguageFileType(GtsLanguage.INSTANCE) {
390390

391391
override fun equals(other: Any?): Boolean {
392-
if (other == TypeScriptFileType.INSTANCE) {
392+
if (other == TypeScriptFileType) {
393393
return true
394394
}
395395
return super.equals(other)
@@ -423,7 +423,7 @@ class GtsFileType : LanguageFileType(GtsLanguage.INSTANCE) {
423423
class GjsFileType : LanguageFileType(GjsLanguage.INSTANCE) {
424424

425425
override fun equals(other: Any?): Boolean {
426-
if (other == JavaScriptFileType.INSTANCE) {
426+
if (other == JavaScriptFileType) {
427427
return true
428428
}
429429
return super.equals(other)
@@ -570,7 +570,7 @@ class GtsHighlighter(val project: Project?, val virtualFile: VirtualFile?, color
570570
}
571571

572572

573-
class GtsSyntaxHighlighter: JSHighlighter(DialectOptionHolder.TS, false) {
573+
class GtsSyntaxHighlighter: JSHighlighter(DialectOptionHolder.TS) {
574574
override fun getHighlightingLexer(): Lexer {
575575
return GtsLexerAdapter()
576576
}

‎src/main/kotlin/com/emberjs/resolver/EmberModuleReferenceContributor.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ProjectAwareVirtualFile(val virtualFile: VirtualFile): VirtualFile(), Proj
4848
override fun getInputStream() = virtualFile.inputStream
4949
override fun isInProject(project: Project) = true
5050
override fun getFileType(): FileType {
51-
return TypeScriptFileType.INSTANCE
51+
return TypeScriptFileType
5252
}
5353
override fun getModificationStamp(): Long {
5454
return 0
@@ -59,7 +59,7 @@ class ProjectAwareVirtualFile(val virtualFile: VirtualFile): VirtualFile(), Proj
5959
class ProjectFile(val psiFile: PsiFile): JSFileImpl(psiFile.viewProvider, JavaScriptSupportLoader.TYPESCRIPT) {
6060

6161
override fun getFileType(): FileType {
62-
return TypeScriptFileType.INSTANCE
62+
return TypeScriptFileType
6363
}
6464
override fun getVirtualFile(): VirtualFile {
6565
return ProjectAwareVirtualFile(psiFile.virtualFile)

‎src/main/kotlin/com/emberjs/utils/EmberStringUtils.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fun String.classify(): String {
2727
private val STRING_DECAMELIZE_REGEXP = Regex("([a-z\\d])([A-Z])")
2828
private val STRING_CAMELIZE_REGEXP = Regex("-([a-z])")
2929

30-
fun String.decamelize(): String = replace(STRING_DECAMELIZE_REGEXP, "$1_$2").toLowerCase(Locale.ROOT)
30+
fun String.decamelize(): String = replace(STRING_DECAMELIZE_REGEXP, "$1_$2").lowercase(Locale.ROOT)
3131

3232
private val STRING_DASHERIZE_REGEXP = Regex("[ _]")
3333

0 commit comments

Comments
 (0)