upgrade intellij (#200)

* upgrade intellij

* use JavaScriptBundle

* fix

Author: patricklx

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
 
 group = "com.emberjs"
-version = "2024.3.4"
+version = "2024.3.5"
 
 dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
@@ -35,13 +35,13 @@ dependencies {
     // and https://www.jetbrains.com/intellij-repository/snapshots/
     // https://plugins.jetbrains.com/plugin/6884-handlebars-mustache/versions/stable
     intellijPlatform {
-        plugins(listOf("com.dmarcotte.handlebars:242.21829.3"))
+        plugins(listOf("com.dmarcotte.handlebars:243.21565.122"))
         bundledPlugins(listOf("JavaScript", "com.intellij.css", "org.jetbrains.plugins.yaml"))
         pluginVerifier()
         zipSigner()
         instrumentationTools()
         testFramework(TestFrameworkType.Platform)
-        create(IntelliJPlatformType.IntellijIdeaUltimate, "2024.2.4")
+        create(IntelliJPlatformType.IntellijIdeaUltimate, "2024.3")
     }
 }
 

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

@@ -20,6 +20,7 @@ import com.intellij.lang.javascript.integration.JSAnnotationError
 import com.intellij.lang.javascript.integration.JSAnnotationError.*
 import com.intellij.lang.javascript.psi.JSFile
 import com.intellij.lang.javascript.psi.JSFunctionType
+import com.intellij.lang.javascript.service.JSLanguageService
 import com.intellij.lang.javascript.service.JSLanguageServiceProvider
 import com.intellij.lang.parameterInfo.CreateParameterInfoContext
 import com.intellij.lang.typescript.compiler.TypeScriptService
@@ -56,8 +57,8 @@ class GlintLanguageServiceProvider(val project: Project) : JSLanguageServiceProv
 
     override fun getService(file: VirtualFile) = allServices.firstOrNull()
 
-    override fun getAllServices() =
-            if (EmberUtils.isEnabledEmberProject(project)) listOf(GlintTypeScriptService.getInstance(project)) else emptyList()
+    override val allServices: List<GlintTypeScriptService>
+        get() = if (EmberUtils.isEnabledEmberProject(project)) listOf(GlintTypeScriptService.getInstance(project)) else emptyList()
 }
 
 

src/main/kotlin/com/emberjs/hbs/linter/ember-template-lint/TemplateLintEnabler.kt

@@ -1,5 +1,5 @@
 import com.intellij.javascript.nodejs.PackageJsonData
-import com.intellij.lang.javascript.JSBundle
+import com.intellij.lang.javascript.JavaScriptBundle
 import com.intellij.lang.javascript.linter.JSLinterGuesser
 import com.intellij.lang.javascript.linter.JSLinterUtil
 import com.intellij.notification.Notification
@@ -62,15 +62,15 @@ class TemplateLintEnabler : DirectoryProjectConfigurator {
         }
 
         fun notifyEnabled(project: Project, dependency: String) {
-            val message = JSBundle.message("js.linter.guesser.linter.enabled.because.of.package.json.section",
+            val message = JavaScriptBundle.message("js.linter.guesser.linter.enabled.because.of.package.json.section",
                     "TemplateLint",
                     dependency)
 
             JSLinterUtil.NOTIFICATION_GROUP.createNotification(message, MessageType.INFO).addAction(object : NotificationAction("Disable TemplateLint") {
                 override fun actionPerformed(e: AnActionEvent, notification: Notification) {
                     JSLinterGuesser.LOG.info("TemplateLint disabled by user")
                     templateLintEnabled(project, false)
-                    JSLinterUtil.NOTIFICATION_GROUP.createNotification(JSBundle.message("js.linter.guesser.linter.disabled", "TemplateLint"), MessageType.INFO).notify(project)
+                    JSLinterUtil.NOTIFICATION_GROUP.createNotification(JavaScriptBundle.message("js.linter.guesser.linter.disabled", "TemplateLint"), MessageType.INFO).notify(project)
                 }
             }).notify(project)
         }