App Run: parameter supports

Author: tangzx

src/main/java/com/tang/intellij/lua/debugger/app/LuaAppAttachProcess.java

@@ -40,7 +40,8 @@ protected LuaAttachBridge startBridge() {
         bridge = new LuaAttachBridge(getSession());
         bridge.setProtoHandler(this);
         bridge.setProtoFactory(this);
-        bridge.launch(configuration.getProgram(), workingDir, new String[] { configuration.getFile() });
+
+        bridge.launch(configuration.getProgram(), workingDir, configuration.getParametersArray());
 
         return bridge;
     }

src/main/java/com/tang/intellij/lua/debugger/app/LuaAppRunConfiguration.java

@@ -33,14 +33,16 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.tang.intellij.lua.debugger.DebuggerType;
 import com.tang.intellij.lua.debugger.IRemoteConfiguration;
-import com.tang.intellij.lua.debugger.LuaRunConfiguration;
 import com.tang.intellij.lua.debugger.LuaCommandLineState;
+import com.tang.intellij.lua.debugger.LuaRunConfiguration;
 import com.tang.intellij.lua.psi.LuaFileUtil;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
@@ -52,6 +54,7 @@ public class LuaAppRunConfiguration extends LuaRunConfiguration implements IRemo
     private String program = SystemInfoRt.isWindows ? "lua.exe" : "lua";
     private String file;
     private String workingDir;
+    private String params;
     private DebuggerType debuggerType = DebuggerType.Attach;
 
     LuaAppRunConfiguration(Project project, ConfigurationFactory factory) {
@@ -92,6 +95,7 @@ public void writeExternal(Element element) throws WriteExternalException {
         JDOMExternalizerUtil.writeField(element, "file", file);
         JDOMExternalizerUtil.writeField(element, "workingDir", workingDir);
         JDOMExternalizerUtil.writeField(element, "debuggerType", String.valueOf(debuggerType.value()));
+        JDOMExternalizerUtil.writeField(element, "params", params);
     }
 
     @Override
@@ -106,6 +110,8 @@ public void readExternal(Element element) throws InvalidDataException {
         String debuggerType = JDOMExternalizerUtil.readField(element, "debuggerType");
         if (debuggerType != null)
             this.debuggerType = DebuggerType.valueOf(Integer.parseInt(debuggerType));
+
+        params = JDOMExternalizerUtil.readField(element, "params");
     }
 
     @Override
@@ -134,6 +140,27 @@ public void setDebuggerType(DebuggerType debuggerType) {
         this.debuggerType = debuggerType;
     }
 
+    public void setParameters(@Nullable String params) {
+        this.params = params;
+    }
+
+    public String getParameters() {
+        return params;
+    }
+
+    @NotNull
+    public String[] getParametersArray() {
+        ArrayList<String> list = new ArrayList<>();
+        if (params != null && !params.isEmpty()) {
+            String[] strings = params.split("\\s+");
+            list.addAll(Arrays.asList(strings));
+        }
+        if (file != null && !file.isEmpty()) {
+            list.add(file);
+        }
+        return list.toArray(new String[list.size()]);
+    }
+
     public String getWorkingDir() {
         if (workingDir == null || workingDir.isEmpty())
             workingDir = getDefaultWorkingDir();
@@ -180,7 +207,8 @@ public void checkConfiguration() throws RuntimeConfigurationException {
     @Override
     public GeneralCommandLine createCommandLine() {
         GeneralCommandLine commandLine = new GeneralCommandLine().withExePath(program);
-        commandLine.addParameters(getFile());
+        String[] params = getParametersArray();
+        commandLine.addParameters(params);
         commandLine.setWorkDirectory(getWorkingDir());
         return commandLine;
     }

src/main/java/com/tang/intellij/lua/debugger/app/LuaAppSettingsEditor.form

@@ -79,7 +79,7 @@
           <text value="Program:"/>
         </properties>
       </component>
-      <component id="30b37" class="com.intellij.ui.RawCommandLineEditor">
+      <component id="30b37" class="com.intellij.ui.RawCommandLineEditor" binding="parameters">
         <constraints>
           <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>

src/main/java/com/tang/intellij/lua/debugger/app/LuaAppSettingsEditor.java

@@ -26,6 +26,7 @@
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.SystemInfoRt;
+import com.intellij.ui.RawCommandLineEditor;
 import com.intellij.util.TextFieldCompletionProvider;
 import com.intellij.util.textCompletion.TextFieldWithCompletion;
 import com.tang.intellij.lua.debugger.DebuggerType;
@@ -46,6 +47,7 @@ public class LuaAppSettingsEditor extends SettingsEditor<LuaAppRunConfiguration>
     private JComboBox<DebuggerType> myDebugger;
     private TextFieldWithCompletion myFile;
     private TextFieldWithBrowseButton myWorkingDir;
+    private RawCommandLineEditor parameters;
     private Project project;
 
     LuaAppSettingsEditor(Project project) {
@@ -72,6 +74,7 @@ protected void resetEditorFrom(@NotNull LuaAppRunConfiguration luaAppRunConfigur
         myWorkingDir.setText(luaAppRunConfiguration.getWorkingDir());
         myFile.setText(luaAppRunConfiguration.getFile());
         myDebugger.setSelectedItem(luaAppRunConfiguration.getDebuggerType());
+        parameters.setText(luaAppRunConfiguration.getParameters());
     }
 
     @Override
@@ -80,6 +83,7 @@ protected void applyEditorTo(@NotNull LuaAppRunConfiguration luaAppRunConfigurat
         luaAppRunConfiguration.setWorkingDir(myWorkingDir.getText());
         luaAppRunConfiguration.setFile(myFile.getText());
         luaAppRunConfiguration.setDebuggerType((DebuggerType) myDebugger.getSelectedItem());
+        luaAppRunConfiguration.setParameters(parameters.getText());
     }
 
     @NotNull