Use the registry instead of file extension

JetBrains · Dec 9, 2019 · b6a3865 · b6a3865
1 parent 3a790ae
commit b6a3865
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/ui/UssDisabledEditorNotification.kt b/rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/ui/UssDisabledEditorNotification.kt
@@ -4,12 +4,14 @@ import com.intellij.ide.plugins.PluginManager
 import com.intellij.ide.plugins.PluginManagerMain
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.openapi.fileEditor.FileEditor
+import com.intellij.openapi.fileTypes.FileTypeRegistry
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.EditorNotificationPanel
 import com.intellij.ui.EditorNotifications
 import com.jetbrains.rider.isUnityProject
+import com.jetbrains.rider.plugins.unity.ideaInterop.fileTypes.uss.UssFileType
 import com.jetbrains.rider.plugins.unity.util.isUssFile
 
 class UssDisabledEditorNotification: EditorNotifications.Provider<EditorNotificationPanel>() {

diff --git a/rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/util/FileExtensions.kt b/rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/util/FileExtensions.kt
@@ -1,7 +1,12 @@
 package com.jetbrains.rider.plugins.unity.util
 
+import com.intellij.openapi.fileTypes.FileTypeRegistry
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.util.text.CaseInsensitiveStringHashingStrategy
+import com.jetbrains.rider.ideaInterop.fileTypes.msbuild.CsprojFileType
+import com.jetbrains.rider.ideaInterop.fileTypes.sln.SolutionFileType
+import com.jetbrains.rider.plugins.unity.ideaInterop.fileTypes.uss.UssFileType
+import com.jetbrains.rider.plugins.unity.ideaInterop.fileTypes.uxml.UxmlFileType
 import gnu.trove.THashSet
 
 private val nonEditableExtensions = getExtensions()
@@ -48,9 +53,9 @@ fun isNonEditableUnityFileExtension(extension: String?): Boolean {
 }
 
 fun isGeneratedUnityFile(file: VirtualFile): Boolean {
-    val extension = file.extension
-    return extension.equals("csproj", true) || extension.equals("sln", true)
+    val fileTypeRegistry = FileTypeRegistry.getInstance()
+    return fileTypeRegistry.isFileOfType(file, CsprojFileType) || fileTypeRegistry.isFileOfType(file, SolutionFileType)
 }
 
-fun isUxmlFile(file: VirtualFile) = file.extension.equals("uxml", true)
-fun isUssFile(file: VirtualFile) = file.extension.equals("uss", true)
+fun isUxmlFile(file: VirtualFile) = FileTypeRegistry.getInstance().isFileOfType(file, UxmlFileType)
+fun isUssFile(file: VirtualFile) = FileTypeRegistry.getInstance().isFileOfType(file, UssFileType)