Skip to content

Support to use a launcher to run in terminal #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Eskibear merged 1 commit into from
Aug 9, 2019
Merged

Support to use a launcher to run in terminal #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...ore/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,10 @@ protected void handleTerminatedEvent(IDebugAdapterContext context) {
*/
public static String[] constructLaunchCommands(LaunchArguments launchArguments, boolean serverMode, String address) {
String slash = System.getProperty("file.separator");

List<String> launchCmds = new ArrayList<>();
if (launchArguments.launcherScript != null) {
launchCmds.add(launchArguments.launcherScript);
}
final String javaHome = StringUtils.isNotEmpty(DebugSettings.getCurrent().javaHome) ? DebugSettings.getCurrent().javaHome
: System.getProperty("java.home");
launchCmds.add(javaHome + slash + "bin" + slash + "java");
Expand Down
3 changes: 2 additions & 1 deletion ...rosoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Requests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ public static class LaunchArguments extends LaunchBaseArguments {
public Map<String, String> env;
public boolean stopOnEntry;
public boolean noDebug = false;
public CONSOLE console = CONSOLE.internalConsole;
public CONSOLE console = CONSOLE.integratedTerminal;
public ShortenApproach shortenCommandLine = ShortenApproach.NONE;
public String launcherScript;
}

public static class AttachArguments extends LaunchBaseArguments {
Expand Down