version to 0.6.0, suit idea 2024.1

XenoAmess · Sep 27, 2024 · 250b4b4 · 250b4b4
1 parent 2b32a61
commit 250b4b4
Show file tree

Hide file tree

Showing 16 changed files with 268 additions and 19 deletions.
diff --git a/build.cmd b/build.cmd
@@ -1,4 +1,5 @@
 cd ./shade_asm
-call mvnw install
+call mvnw clean install
 cd ..
+set JAVA_HOME=C:\jdk-17\
 call gradlew clean buildPlugin
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,17 @@
 plugins {
     id 'java'
-    id "org.jetbrains.intellij" version "1.13.3"
+    id "org.jetbrains.intellij" version "1.17.4"
 }
 
 apply plugin: 'idea'
 
 allprojects {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     compileJava.options.encoding = 'UTF-8'
+//    kotlin {
+//        jvmToolchain(17)
+//    }
 }
 
 repositories {

diff --git a/gradle.properties b/gradle.properties
@@ -2,10 +2,10 @@
 # See https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html
 # See https://www.jetbrains.com/intellij-repository/releases/
 # See https://www.jetbrains.com/intellij-repository/snapshots/
-idea_version=231.8109.175
+idea_version=2024.1
 #idea_version=211-EAP-SNAPSHOT
 #idea_version=181.5540.23
 #idea_version=145.258.11
 plugin_name=Bytecode Editor(XenoAmess TPM)
 systemProp.file.encoding=UTF-8
-plugin_version=0.5.0
+plugin_version=0.6.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sat Sep 21 06:16:57 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/shade_asm b/shade_asm
diff --git a/src/main/java/com/github/pshirshov/action/AbstractShowByteCodeAction.java b/src/main/java/com/github/pshirshov/action/AbstractShowByteCodeAction.java
@@ -24,6 +24,7 @@
 import com.github.pshirshov.vfs.DisassembledVirtualFile;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.highlighter.JavaClassFileType;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -158,10 +159,10 @@ public void onSuccess() {
 
                 FileEditorManager manager = FileEditorManager.getInstance(project);
 
-                final String filename = '/' + psiClass.getQualifiedName().replace('.', '/') + ".bc";
+                final String filename = '/' + psiClass.getQualifiedName().replace('.', '/') + "." + getDisassembleStrategy().getFileNameSuffix();
                 DisassembledVirtualFile disassembledVirtualFile = new DisassembledVirtualFile(
                         filename,
-                        JavaClassFileType.INSTANCE,
+                        getDisassembleStrategy().getFileType(),
                         myByteCode.getBytes(),
                         psiElement,
                         virtualFile,
@@ -215,4 +216,10 @@ private static boolean isMarkedForCompilation(Project project, VirtualFile virtu
         return !compilerManager.isUpToDate(compilerManager.createFilesCompileScope(new VirtualFile[]{virtualFile}));
     }
 
+    @Override
+    @NotNull
+    public ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
+
 }
diff --git a/src/main/java/com/github/pshirshov/action/ExportAssembledClassAction.java b/src/main/java/com/github/pshirshov/action/ExportAssembledClassAction.java
@@ -13,6 +13,7 @@
 import com.github.pshirshov.util.IdeaUtils;
 import com.github.pshirshov.vfs.DisassembledVirtualFile;
 import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.application.ApplicationManager;
@@ -124,4 +125,10 @@ protected OutputStream getExportClassFileDestinationOutputStream(
         );
     }
 
+    @Override
+    @NotNull
+    public ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
+
 }
diff --git a/src/main/java/com/github/pshirshov/action/ExportAssembledClassToOriginalClassFileAction.java b/src/main/java/com/github/pshirshov/action/ExportAssembledClassToOriginalClassFileAction.java
@@ -7,6 +7,7 @@
 import com.github.pshirshov.ByteCodeFileEditor;
 import com.github.pshirshov.vfs.DisassembledVirtualFile;
 import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -63,4 +64,10 @@ protected OutputStream getExportClassFileDestinationOutputStream(
         return this.getVirtualFile().getOriginalClassVirtualFile().getOutputStream(this);
     }
 
+    @Override
+    @NotNull
+    public ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
+
 }
diff --git a/src/main/java/com/github/pshirshov/conversion/BytecodeConverter.java b/src/main/java/com/github/pshirshov/conversion/BytecodeConverter.java
@@ -67,8 +67,8 @@ private String tryGetByteCodeNew(@NotNull PsiFile containingFile) {
         String res = null;
         try {
             res = processClassFile(virtualFile.contentsToByteArray());
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            log.error("processClassFile failed", e);
         }
         return res;
     }
@@ -111,7 +111,7 @@ public String getByteCode(@NotNull PsiElement psiElement) {
                                 return processClassFile(classFile.contentsToByteArray());
                             }
                         }
-                    } catch (IOException e) {
+                    } catch (Exception e) {
                         log.error("getByteCode failed", e);
                     }
                     return null;

diff --git a/src/main/java/com/github/pshirshov/conversion/DisassembleStrategy.java b/src/main/java/com/github/pshirshov/conversion/DisassembleStrategy.java
@@ -1,11 +1,24 @@
 package com.github.pshirshov.conversion;
 
+import com.intellij.openapi.fileTypes.FileType;
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+
 public interface DisassembleStrategy {
 
+    @NotNull
     String getName();
 
+    @NotNull
     Assembler getAssembler();
 
+    @NotNull
     Disassembler getDisassembler();
 
+    @NotNull
+    String getFileNameSuffix();
+
+    @NotNull
+    FileType getFileType();
+
 }
diff --git a/src/main/java/com/github/pshirshov/conversion/DisassembleStrategyEnum.java b/src/main/java/com/github/pshirshov/conversion/DisassembleStrategyEnum.java
@@ -1,11 +1,16 @@
 package com.github.pshirshov.conversion;
 
 import com.github.pshirshov.conversion.impl.asm.AsmDisassembler;
+import com.github.pshirshov.conversion.impl.asm.AsmFileType;
 import com.github.pshirshov.conversion.impl.asm_xml.AsmXmlAssembler;
 import com.github.pshirshov.conversion.impl.asm_xml.AsmXmlDisassembler;
+import com.github.pshirshov.conversion.impl.asm_xml.AsmXmlFileType;
 import com.github.pshirshov.conversion.impl.jasmin.JasminDisassembler;
+import com.github.pshirshov.conversion.impl.jasmin.JasminFileType;
 import com.github.pshirshov.conversion.impl.krakatau.KrakatauAssembler;
 import com.github.pshirshov.conversion.impl.krakatau.KrakatauDisassembler;
+import com.github.pshirshov.conversion.impl.krakatau.KrakatauFileType;
+import com.intellij.openapi.fileTypes.FileType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
@@ -20,7 +25,8 @@ public enum DisassembleStrategyEnum implements DisassembleStrategy {
     JASMIN(
             DisassembleStrategyConstant.STRING_JASMIN,
             null,
-            JasminDisassembler.INSTANCE
+            JasminDisassembler.INSTANCE,
+            JasminFileType.INSTANCE
     ),
 
     /**
@@ -29,7 +35,8 @@ public enum DisassembleStrategyEnum implements DisassembleStrategy {
     ASM(
             DisassembleStrategyConstant.STRING_ASM,
             null,
-            AsmDisassembler.INSTANCE
+            AsmDisassembler.INSTANCE,
+            AsmFileType.INSTANCE
     ),
 
     /**
@@ -38,7 +45,8 @@ public enum DisassembleStrategyEnum implements DisassembleStrategy {
     ASM_XML(
             DisassembleStrategyConstant.STRING_ASM_XML,
             AsmXmlAssembler.INSTANCE,
-            AsmXmlDisassembler.INSTANCE
+            AsmXmlDisassembler.INSTANCE,
+            AsmXmlFileType.INSTANCE
     ),
 
     /**
@@ -47,7 +55,8 @@ public enum DisassembleStrategyEnum implements DisassembleStrategy {
     KRAKATAU(
             DisassembleStrategyConstant.STRING_KRAKATAU,
             KrakatauAssembler.INSTANCE,
-            KrakatauDisassembler.INSTANCE
+            KrakatauDisassembler.INSTANCE,
+            KrakatauFileType.INSTANCE
     );
 
     @Getter
@@ -62,4 +71,14 @@ public enum DisassembleStrategyEnum implements DisassembleStrategy {
     @NotNull
     private final Disassembler disassembler;
 
+    @Getter
+    @NotNull
+    private final FileType fileType;
+
+    @NotNull
+    @Override
+    public String getFileNameSuffix(){
+        return this.getName();
+    }
+
 }
diff --git a/src/main/java/com/github/pshirshov/conversion/impl/asm/AsmFileType.java b/src/main/java/com/github/pshirshov/conversion/impl/asm/AsmFileType.java
@@ -0,0 +1,47 @@
+package com.github.pshirshov.conversion.impl.asm;
+
+import com.github.pshirshov.conversion.DisassembleStrategyEnum;
+import com.intellij.ide.highlighter.JavaClassFileType;
+import com.intellij.openapi.fileTypes.FileType;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.Icon;
+
+
+public final class AsmFileType implements FileType {
+    public static final AsmFileType INSTANCE = new AsmFileType();
+
+    private AsmFileType() {
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return DisassembleStrategyEnum.ASM.getName();
+    }
+
+    @Override
+    public @NotNull String getDescription() {
+        return DisassembleStrategyEnum.ASM.getName();
+    }
+
+    @Override
+    public @Nls @NotNull String getDisplayName() {
+        return DisassembleStrategyEnum.ASM.getName();
+    }
+
+    @Override
+    public @NotNull String getDefaultExtension() {
+        return DisassembleStrategyEnum.ASM.getFileNameSuffix();
+    }
+
+    @Override
+    public Icon getIcon() {
+        return JavaClassFileType.INSTANCE.getIcon();
+    }
+
+    @Override
+    public boolean isBinary() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/pshirshov/conversion/impl/asm_xml/AsmXmlFileType.java b/src/main/java/com/github/pshirshov/conversion/impl/asm_xml/AsmXmlFileType.java
@@ -0,0 +1,47 @@
+package com.github.pshirshov.conversion.impl.asm_xml;
+
+import com.github.pshirshov.conversion.DisassembleStrategyEnum;
+import com.intellij.ide.highlighter.JavaClassFileType;
+import com.intellij.openapi.fileTypes.FileType;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.Icon;
+
+
+public final class AsmXmlFileType implements FileType {
+    public static final AsmXmlFileType INSTANCE = new AsmXmlFileType();
+
+    private AsmXmlFileType() {
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return DisassembleStrategyEnum.ASM_XML.getName();
+    }
+
+    @Override
+    public @NotNull String getDescription() {
+        return DisassembleStrategyEnum.ASM_XML.getName();
+    }
+
+    @Override
+    public @Nls @NotNull String getDisplayName() {
+        return DisassembleStrategyEnum.ASM_XML.getName();
+    }
+
+    @Override
+    public @NotNull String getDefaultExtension() {
+        return DisassembleStrategyEnum.ASM_XML.getFileNameSuffix();
+    }
+
+    @Override
+    public Icon getIcon() {
+        return JavaClassFileType.INSTANCE.getIcon();
+    }
+
+    @Override
+    public boolean isBinary() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/pshirshov/conversion/impl/jasmin/JasminFileType.java b/src/main/java/com/github/pshirshov/conversion/impl/jasmin/JasminFileType.java
@@ -0,0 +1,47 @@
+package com.github.pshirshov.conversion.impl.jasmin;
+
+import com.github.pshirshov.conversion.DisassembleStrategyEnum;
+import com.intellij.ide.highlighter.JavaClassFileType;
+import com.intellij.openapi.fileTypes.FileType;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.Icon;
+
+
+public final class JasminFileType implements FileType {
+    public static final JasminFileType INSTANCE = new JasminFileType();
+
+    private JasminFileType() {
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return DisassembleStrategyEnum.JASMIN.getName();
+    }
+
+    @Override
+    public @NotNull String getDescription() {
+        return DisassembleStrategyEnum.JASMIN.getName();
+    }
+
+    @Override
+    public @Nls @NotNull String getDisplayName() {
+        return DisassembleStrategyEnum.JASMIN.getName();
+    }
+
+    @Override
+    public @NotNull String getDefaultExtension() {
+        return DisassembleStrategyEnum.JASMIN.getFileNameSuffix();
+    }
+
+    @Override
+    public Icon getIcon() {
+        return JavaClassFileType.INSTANCE.getIcon();
+    }
+
+    @Override
+    public boolean isBinary() {
+        return true;
+    }
+}