Update to 2019.2

* Switched to <fileType declaration * Fixed new build failure caused by dependency changes involving test framework
sblundy · Jul 28, 2019 · 7762ed3 · 7762ed3
1 parent 7469084
commit 7762ed3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,10 +1,10 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.jetbrains.intellij") version "0.4.8"
+    id("org.jetbrains.intellij") version "0.4.9"
     java
     kotlin("jvm") version "1.3.21"
-    id("org.jetbrains.grammarkit") version "2019.1"
+    id("org.jetbrains.grammarkit") version "2019.2"
 }
 
 group = "com.github.sblundy"
@@ -23,7 +23,7 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version = "2019.1.2"
+    version = "2019.2"
 }
 configure<JavaPluginConvention> {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -65,6 +65,10 @@ tasks.withType<KotlinCompile> {
     )
 }
 
+tasks.getByName("buildSearchableOptions") {
+    enabled = false
+}
+
 tasks.withType<Test> {
     useJUnitPlatform()
     testLogging {

diff --git a/src/main/kotlin/com/github/sblundy/elvish/ElvishFileType.kt b/src/main/kotlin/com/github/sblundy/elvish/ElvishFileType.kt
@@ -5,7 +5,7 @@ import javax.swing.Icon
 
 class ElvishFileType private constructor(): LanguageFileType(ElvishLanguage.INSTANCE) {
     companion object {
-        val INSTANCE = ElvishFileType()
+        @JvmField val INSTANCE = ElvishFileType()
     }
     override fun getIcon(): Icon? = icons.ElvishIcons.FILE_ICON
 

diff --git a/src/main/kotlin/com/github/sblundy/elvish/ElvishFileTypeFactory.kt b/src/main/kotlin/com/github/sblundy/elvish/ElvishFileTypeFactory.kt
diff --git a/src/main/kotlin/com/github/sblundy/elvish/ElvishLanguage.kt b/src/main/kotlin/com/github/sblundy/elvish/ElvishLanguage.kt
@@ -4,6 +4,6 @@ import com.intellij.lang.Language
 
 class ElvishLanguage private constructor(): Language("Elvish") {
     companion object {
-        val INSTANCE = ElvishLanguage()
+        @JvmField val INSTANCE = ElvishLanguage()
     }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@
     <depends>com.intellij.modules.lang</depends>
 
     <extensions defaultExtensionNs="com.intellij">
-        <fileTypeFactory implementation="com.github.sblundy.elvish.ElvishFileTypeFactory"/>
+        <fileType name="Elvish" language="Elvish" implementationClass="com.github.sblundy.elvish.ElvishFileType" fieldName="INSTANCE" extensions="elv"/>
         <lang.parserDefinition language="Elvish" implementationClass="com.github.sblundy.elvish.lang.ElvishParserDefinition"/>
         <lang.syntaxHighlighterFactory language="Elvish" implementationClass="com.github.sblundy.elvish.ElvishSyntaxHighlighterFactory"/>
         <annotator language="Elvish" implementationClass="com.github.sblundy.elvish.ElvishAnnotator"/>

diff --git a/src/test/kotlin/com/github/sblundy/elvish/lang/ElvishParserTest.kt b/src/test/kotlin/com/github/sblundy/elvish/lang/ElvishParserTest.kt
@@ -12,7 +12,6 @@ import com.intellij.psi.impl.PsiFileFactoryImpl
 import com.intellij.testFramework.*
 import com.intellij.testFramework.fixtures.IdeaProjectTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
-import com.intellij.testFramework.fixtures.JavaTestFixtureFactory
 import com.intellij.testFramework.fixtures.impl.LightTempDirTestFixtureImpl
 import org.jetbrains.annotations.NonNls
 import org.junit.Assert
@@ -42,7 +41,7 @@ class ElvishParserTest {
         val factory = IdeaTestFixtureFactory.getFixtureFactory()
         val fixtureBuilder = factory.createLightFixtureBuilder()
         val fixture = fixtureBuilder.fixture
-        myFixture = JavaTestFixtureFactory.getFixtureFactory()
+        myFixture = IdeaTestFixtureFactory.getFixtureFactory()
             .createCodeInsightFixture(fixture, LightTempDirTestFixtureImpl(true))
 
         myFixture.setUp()