From 7762ed32876c8c4c4c12c53f91b5797d175d2160 Mon Sep 17 00:00:00 2001
From: sblundy <el_gonzzo@hotmail.com>
Date: Sun, 28 Jul 2019 09:10:19 -0700
Subject: [PATCH] Update to 2019.2

* Switched to <fileType declaration
* Fixed new build failure caused by dependency changes involving test framework
---
 build.gradle.kts                                       | 10 +++++++---
 .../kotlin/com/github/sblundy/elvish/ElvishFileType.kt |  2 +-
 .../com/github/sblundy/elvish/ElvishFileTypeFactory.kt | 10 ----------
 .../kotlin/com/github/sblundy/elvish/ElvishLanguage.kt |  2 +-
 src/main/resources/META-INF/plugin.xml                 |  2 +-
 .../com/github/sblundy/elvish/lang/ElvishParserTest.kt |  3 +--
 6 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/kotlin/com/github/sblundy/elvish/ElvishFileTypeFactory.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 0badde4..2d442d3 100644
--- 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
index f0dc1ad..b78a6a1 100644
--- 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
deleted file mode 100644
index 3879543..0000000
--- a/src/main/kotlin/com/github/sblundy/elvish/ElvishFileTypeFactory.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.sblundy.elvish
-
-import com.intellij.openapi.fileTypes.FileTypeConsumer
-import com.intellij.openapi.fileTypes.FileTypeFactory
-
-class ElvishFileTypeFactory: FileTypeFactory() {
-    override fun createFileTypes(consumer: FileTypeConsumer) {
-        consumer.consume(ElvishFileType.INSTANCE)
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/sblundy/elvish/ElvishLanguage.kt b/src/main/kotlin/com/github/sblundy/elvish/ElvishLanguage.kt
index 556543d..ca1dc77 100644
--- 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()
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 6bcb797..e3f5ab7 100644
--- 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
index cc8a435..9c0ae80 100644
--- 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()