Fix some deprecation warnings (#545)

* Fix some deprecation warnings * Spotless --------- Co-authored-by: hfhbd <[email protected]>
sqldelight · Aug 7, 2023 · 04bb66e · 04bb66e
1 parent 0dff525
commit 04bb66e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 27 deletions.
diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/SqlCoreEnvironment.kt b/core/src/main/kotlin/com/alecstrong/sql/psi/core/SqlCoreEnvironment.kt
@@ -11,7 +11,6 @@ import com.intellij.core.CoreProjectEnvironment
 import com.intellij.lang.MetaLanguage
 import com.intellij.openapi.diagnostic.DefaultLogger
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.extensions.Extensions
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ContentIterator
 import com.intellij.openapi.roots.ProjectFileIndex
@@ -47,13 +46,11 @@ private object ApplicationEnvironment {
     CoreApplicationEnvironment(Disposer.newDisposable()).apply {
       Logger.setFactory { logger }
 
-      CoreApplicationEnvironment.registerExtensionPoint(
-        Extensions.getRootArea(),
+      CoreApplicationEnvironment.registerApplicationExtensionPoint(
         MetaLanguage.EP_NAME,
         MetaLanguage::class.java,
       )
-      CoreApplicationEnvironment.registerExtensionPoint(
-        Extensions.getRootArea(),
+      CoreApplicationEnvironment.registerApplicationExtensionPoint(
         SmartPointerAnchorProvider.EP_NAME,
         SmartPointerAnchorProvider::class.java,
       )
@@ -76,13 +73,11 @@ open class SqlCoreEnvironment(
     ApplicationEnvironment.coreApplicationEnvironment,
   )
 
-  protected val localFileSystem: VirtualFileSystem
+  protected val localFileSystem: VirtualFileSystem = VirtualFileManager.getInstance().getFileSystem(
+    StandardFileSystems.FILE_PROTOCOL,
+  )
 
   init {
-    localFileSystem = VirtualFileManager.getInstance().getFileSystem(
-      StandardFileSystems.FILE_PROTOCOL,
-    )
-
     projectEnvironment.registerProjectComponent(
       ProjectRootManager::class.java,
       ProjectRootManagerImpl(projectEnvironment.project),
@@ -182,8 +177,8 @@ open class SqlCoreEnvironment(
       } catch (e: Throwable) {
         throw IllegalStateException(
           """
-        |Failed to compile ${this.containingFile.virtualFile.path}:${this.node.startOffset}:
-        |  ${this.text}
+        |Failed to compile ${containingFile.virtualFile.path}:${node.startOffset}:
+        |  $text
         |
           """.trimMargin(),
           e,

diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/SchemaContributorIndex.kt b/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/SchemaContributorIndex.kt
@@ -1,6 +1,6 @@
 package com.alecstrong.sql.psi.core.psi
 
-import com.intellij.openapi.components.ServiceManager
+import com.intellij.openapi.components.serviceOrNull
 import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
@@ -18,8 +18,7 @@ interface SchemaContributorIndex {
     }
 
     fun getInstance(project: Project): SchemaContributorIndex {
-      return ServiceManager.getService(project, SchemaContributorIndex::class.java)
-        ?: SchemaContributorIndexImpl.instance
+      return project.serviceOrNull() ?: SchemaContributorIndexImpl.instance
     }
   }
 }

diff --git a/sample-plugin/build.gradle b/sample-plugin/build.gradle
@@ -13,3 +13,5 @@ sourceSets {
 dependencies {
   implementation project(":sample-core")
 }
+
+tasks.named('buildSearchableOptions') { enabled = false }
diff --git a/...e-plugin/src/main/kotlin/com/alecstrong/sqlite/psi/sample/plugin/SampleFileTypeFactory.kt b/...e-plugin/src/main/kotlin/com/alecstrong/sqlite/psi/sample/plugin/SampleFileTypeFactory.kt
diff --git a/sample-plugin/src/main/resources/META-INF/plugin.xml b/sample-plugin/src/main/resources/META-INF/plugin.xml
@@ -18,7 +18,11 @@
   <extensions defaultExtensionNs="com.intellij">
     <lang.parserDefinition language="Sample" implementationClass="com.alecstrong.sql.psi.sample.core.SampleParserDefinition" />
     <annotator language="Sample" implementationClass="com.alecstrong.sql.psi.core.SqlAnnotator"/>
-    <fileTypeFactory implementation="com.alecstrong.sql.psi.sample.plugin.SampleFileTypeFactory"/>
+    <fileType name="Sample File"
+              language="Sample"
+              implementationClass="com.alecstrong.sql.psi.sample.core.SampleFileType"
+              extensions="samplesql"
+              fieldName="INSTANCE"/>
     <stubIndex implementation="com.alecstrong.sql.psi.core.psi.SchemaContributorIndexImpl"/>
     <stubElementTypeHolder class="com.alecstrong.sql.psi.core.psi.SqlTypes"/>
   </extensions>