Skip to content

upgrade intellij #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 20, 2024
Merged

upgrade intellij #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e3c01f
upgrade intellij
patricklx Nov 14, 2024
d6a9868
use JavaScriptBundle
patricklx Nov 14, 2024
36c9238
fix
patricklx Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {


group = "com.emberjs"
version = "2024.3.4"
version = "2024.3.5"

dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test")
Expand All @@ -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")
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/com/emberjs/glint/GlintLanguageService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -60,8 +61,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()
}


Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/com/emberjs/hbs/linter/ember-template-lint/TemplateLintEnabler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
}
Expand Down
Loading