From e96bba88b84274f188d932709ae6856062bb7ff6 Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <goldifit@gmail.com>
Date: Thu, 1 Aug 2019 16:47:14 +0300
Subject: [PATCH] Textmate: register file types from JSON-like bundles

GitOrigin-RevId: 566476c2fdafbcb85f1ea378b559e9f1b18a25b2
---
 .../org/jetbrains/plugins/textmate/bundles/VSCBundle.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/textmate/src/org/jetbrains/plugins/textmate/bundles/VSCBundle.java b/plugins/textmate/src/org/jetbrains/plugins/textmate/bundles/VSCBundle.java
index b9fbba192a45..390b043db39d 100644
--- a/plugins/textmate/src/org/jetbrains/plugins/textmate/bundles/VSCBundle.java
+++ b/plugins/textmate/src/org/jetbrains/plugins/textmate/bundles/VSCBundle.java
@@ -41,8 +41,11 @@ public class VSCBundle extends Bundle {
 
   @Override
   public Collection<String> getExtensions(File file, Plist plist) {
+    HashSet<String> result = new HashSet<>(super.getExtensions(file, plist));
     loadExtensions();
-    return grammarToExtensions.getOrDefault(FileUtil.toSystemIndependentName(Objects.requireNonNull(FileUtil.getRelativePath(bundleFile, file))), emptyList());
+    result.addAll(grammarToExtensions.getOrDefault(FileUtil.toSystemIndependentName(
+      Objects.requireNonNull(FileUtil.getRelativePath(bundleFile, file))), emptyList()));
+    return result;
   }
 
   private void loadExtensions() {