Merge pull request #19815 from shahariel/masterv7.493.25

Some little changes In sd-plugin (like make buildPlugin default task)

2 files changed, 17 insertions, 3 deletions

diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java
index 56aaae6d02a..e3eb6b431c7 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java
@@ -7,7 +7,7 @@ import com.intellij.lang.findUsages.FindUsagesProvider;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.tree.TokenSet;
-import org.intellij.sdk.language.SdLexerAdapter;
+import org.intellij.sdk.language.lexer.SdLexerAdapter;
 import org.intellij.sdk.language.psi.SdDeclaration;
 import org.intellij.sdk.language.psi.SdIdentifierVal;
 import org.intellij.sdk.language.psi.SdIdentifierWithDashVal;
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java
index 0423db89cd6..b67c561e8d4 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java
@@ -9,6 +9,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
 import com.intellij.usages.UsageGroup;
+import com.intellij.usages.UsageView;
 import org.intellij.sdk.language.psi.SdDeclaration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -59,7 +60,8 @@ public class SdUsageGroup implements UsageGroup {
 
     @Override
     public int compareTo(@NotNull UsageGroup usageGroup) {
-        return getPresentableGroupText().compareToIgnoreCase(usageGroup.getPresentableGroupText());
+//        return getPresentableGroupText().compareToIgnoreCase(usageGroup.getPresentableGroupText());
+        return getText(null).compareTo(usageGroup.getText(null));
     }
     
     @Override
@@ -91,6 +93,18 @@ public class SdUsageGroup implements UsageGroup {
         return myIcon;
     }
     
+    // here because JetBrains asked:
+    
+    @SuppressWarnings("deprecation")
+    public Icon getIcon(boolean isOpen) {
+        return myIcon;
+    }
+    
+    @SuppressWarnings("deprecation")
+    public String getText(UsageView view) {
+        return myText;
+    }
+    
     @Override
-    public void update() {} // here because JetBrains asked
+    public void update() {} 
 }