Improve ui and fix bugs

Author: only52607

README.md

@@ -6,18 +6,18 @@ Smali2Java is a vscode extension that allows you to decompile a single `smali` f
 
 ## Usage
 
-1. Configure the path to the `jadx` executable in `smali2java.jadxPath`. 
+1. Configure the path to the `jadx` executable in `smali2java.decompiler.jadx.path`. 
 
 > [Jadx](https://github.com/skylot/jadx) is an excellent Java bytecode decompiler. Smali2Java uses it for decompilation. More decompilation tools will be supported in future releases.
 
-Download [Jadx](https://github.com/skylot/jadx), unzip it somewhere, and modify the configuration item `smali2java.jadxPath` to point to the path of the Jadx executable (not jadx-gui).
+Download [Jadx](https://github.com/skylot/jadx), unzip it somewhere, and modify the configuration item `smali2java.decompiler.jadx.path` to point to the path of the Jadx executable (not jadx-gui).
 - example: C:/Program Files/jadx/bin/jadx.bat
 
-2. Open a smali file using vscode.Then select `Decompile to Java` from the editor context menu. Or just click the `Decompile` in the editor title bar.
+2. Open a smali file using vscode.Then select `Decompile This File` from the editor context menu. Or just click the `Decompile` in the editor title bar.
 
 ![Usage](./res/snapshot/usage.gif)
 
 ## Extension Settings
 
-* `smali2java.jadxPath`: Specifies the jadx executable path which use to decompile smali.
-* `smali2java.jadxOptions`: Specifies additional command line arguments required for decompilation
+* `smali2java.decompiler.jadx.path`: Path to jadx (or jadx.bat for windows).
+* `smali2java.decompiler.jadx.options`: Options used to run jadx decompilation command (will be appended directly to the end of the command).

README_CN.md

@@ -7,11 +7,11 @@ https://marketplace.visualstudio.com/items?itemName=ooooonly.smali2java
 
 ## 使用方法
 
-1. 将 `smali2java.jadxPath`配置项设置为`jadx`可执行文件路径。
+1. 将 `smali2java.decompiler.jadx.path`配置项设置为`jadx`可执行文件路径。
 
 > [jadx](https://github.com/skylot/jadx) 是一个优秀的反编译工具。 Smali2Java 使用它完成反编译工作。后续将会支持调用更多反编译工具。
 
-下载 [jadx](https://github.com/skylot/jadx), 解压至某处, 修改配置项 `smali2java.jadxPath` 为你的jadx可执行文件路径 (不是 jadx-gui)。
+下载 [jadx](https://github.com/skylot/jadx), 解压至某处, 修改配置项 `smali2java.decompiler.jadx.path` 为你的jadx可执行文件路径 (不是 jadx-gui)。
 - 比如: C:/Program Files/jadx/bin/jadx.bat
 
 2. 使用vscode打开smali文件。在右键菜单中选择 `Decompile to Java` 。或者直接点击标题栏上的 `Decompile` 按钮.
@@ -20,5 +20,5 @@ https://marketplace.visualstudio.com/items?itemName=ooooonly.smali2java
 
 ## 插件设置
 
-* `smali2java.jadxPath`: 设置jadx可执行文件路径
-* `smali2java.jadxOptions`: 设置jadx命令行额外参数
+* `smali2java.decompiler.jadx.path`: jadx可执行文件路径
+* `smali2java.decompiler.jadx.options`: jadx命令行参数

package-lock.json

@@ -3,8 +3,8 @@
 	"author": "ooooonly",
 	"publisher": "ooooonly",
 	"displayName": "Smali2Java",
-	"description": "Decompile single smali file quickly",
-	"version": "1.0.1",
+	"description": "Decompile single smali file instantly",
+	"version": "1.1.0",
 	"license": "SEE LICENSE IN LICENSE",
 	"icon": "res/icon.png",
 	"engines": {
@@ -14,9 +14,7 @@
 		"Other"
 	],
 	"activationEvents": [
-		"onLanguage:smali",
-		"onCommand:smali2java.decompileCurrentSmaliToJava",
-		"onCommand:smali2java.clearCache"
+		"onLanguage:smali"
 	],
 	"keywords": [
 		"smali",
@@ -37,11 +35,15 @@
 	"contributes": {
 		"commands": [
 			{
-				"command": "smali2java.decompileCurrentSmaliToJava",
-				"title": "Decompile to Java",
+				"command": "smali2java.decompileThisFile",
+				"title": "Decompile This File",
 				"shortTitle": "Decompile",
 				"category": "Smali",
-				"enablement": "true"
+				"enablement": "true",
+				"icon": {
+					"dark": "./res/dark/decompile.svg",
+					"light": "./res/light/decompile.svg"
+				}
 			},
 			{
 				"command": "smali2java.clearCache",
@@ -54,14 +56,14 @@
 		"menus": {
 			"editor/title": [
 				{
-					"command": "smali2java.decompileCurrentSmaliToJava",
+					"command": "smali2java.decompileThisFile",
 					"when": "resourceExtname == .smali || editorLangId == smali",
 					"group": "navigation"
 				}
 			],
 			"editor/context": [
 				{
-					"command": "smali2java.decompileCurrentSmaliToJava",
+					"command": "smali2java.decompileThisFile",
 					"when": "resourceExtname == .smali || editorLangId == smali",
 					"group": "navigation"
 				}
@@ -70,15 +72,15 @@
 		"configuration": {
 			"title": "Smali2Java",
 			"properties": {
-				"smali2java.jadxPath": {
+				"smali2java.decompiler.jadx.path": {
 					"type": "string",
 					"default": null,
-					"description": "Specifies the jadx executable path which use to decompile smali."
+					"description": "Path to jadx (or jadx.bat for windows)."
 				},
-				"smali2java.jadxOptions": {
+				"smali2java.decompiler.jadx.options": {
 					"type": "string",
 					"default": "",
-					"description": "Specifies additional command line arguments required for decompilation."
+					"description": "Options used to run jadx decompilation command (will be appended directly to the end of the command)."
 				}
 			}
 		}

package.json

@@ -9,30 +9,38 @@ import { getSmaliDocumentClassNameFromUri } from "../../util/smali-util";
 
 const execAsync = promisify(exec)
 
+interface JadxConfig {
+    path?: string,
+    options?: string
+}
+
 export class JadxDecompiler implements SmaliDecompiler {
     constructor(
         public sourceOutputDir: string,
         public outputChannel: OutputChannel,
     ) {
-        
     }
 
     private getOutputFilePath(smaliClassName: string) {
         return join(this.sourceOutputDir, (smaliClassName.includes("/") ? "" : "defpackage/") + smaliClassName + ".java")
     }
 
-    private async getJadxPath(): Promise<string> {
-        const jadxPath: string | undefined = workspace.getConfiguration("smali2java").get("jadxPath")
-        if (!jadxPath) throw new DecompileError("The jadx executable path has not been configured")
-        if (!(await fsAsync.stat(jadxPath)).isFile()) throw new DecompileError("Illegal jadx executable path")
-        return jadxPath
+    private async loadConfig(): Promise<JadxConfig> {
+        const config = workspace.getConfiguration("smali2java.decompiler.jadx")
+        return {
+            path: config.get("path"),
+            options: config.get("options")
+        }
     }
 
-    async decompile(smaliFileUri: Uri, options?: any): Promise<Uri> {
+    async decompile(smaliFileUri: Uri): Promise<Uri> {
         const smaliClassName = await getSmaliDocumentClassNameFromUri(smaliFileUri)
         if (!smaliClassName) throw new DecompileError("Illegal smali file")
+        const config = await this.loadConfig()
+        if (!config.path) throw new DecompileError("The jadx executable path has not been configured")
+        if (!(await fsAsync.stat(config.path)).isFile()) throw new DecompileError("Illegal jadx executable path")
         const outputFilePath = this.getOutputFilePath(smaliClassName)
-        const { stdout, stderr } = await execAsync(`${await this.getJadxPath()} "${smaliFileUri.fsPath}" -ds "${this.sourceOutputDir}" ${options ?? ""}`)
+        const { stdout, stderr } = await execAsync(`${await config.path} "${smaliFileUri.fsPath}" -ds "${this.sourceOutputDir}" ${config.options ?? ""}`)
         this.outputChannel.append(stdout)
         if (stderr && stderr.length > 0) {
             this.outputChannel.show()
@@ -41,8 +49,8 @@ export class JadxDecompiler implements SmaliDecompiler {
         }
         try {
             await fsAsync.stat(outputFilePath)
-        } catch {
-            throw new DecompileError("The compiled file is not found")
+        } catch(e) {
+            throw new DecompileError(`Error is caught when reading ${outputFilePath}: ${e}`)
         }
         return Uri.from({
             scheme: JavaCodeProvider.scheme,

res/dark/decompile.svg

@@ -4,10 +4,10 @@ import DecompileCommand from './command/decompile';
 import clearCacheCommand from './command/clear-cache';
 
 export function activate(context: ExtensionContext) {
-	const provider = new JavaCodeProvider()
+	const provider = new JavaCodeProvider();
 	context.subscriptions.push(
 		workspace.registerTextDocumentContentProvider(JavaCodeProvider.scheme, provider),
-		commands.registerCommand("smali2java.decompileCurrentSmaliToJava", DecompileCommand(context, provider)),
+		commands.registerCommand("smali2java.decompileThisFile", DecompileCommand(context, provider)),
 		commands.registerCommand("smali2java.clearCache", clearCacheCommand(context))
 	);
 }