Skip to content

restore current working directory in terminal even if directory selected #2859

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

Open
danthe1st wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −4
Open

restore current working directory in terminal even if directory selected #2859

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
6 changes: 4 additions & 2 deletions ...nector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,10 @@ public CompletableFuture<?> execute(Map<String, Object> properties) {
properties.put(ITerminalsConnectorConstants.PROP_FORCE_NEW, Boolean.TRUE);
}

boolean hadWorkingDirectoryBefore = properties
.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR);
// Initialize the local terminal working directory.
if (!properties.containsKey(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR)) {
if (!hadWorkingDirectoryBefore) {
// By default, start the local terminal in the users home directory
String initialCwd = IPreferenceKeys.getPreferences()
.getString(IPreferenceKeys.PREF_LOCAL_TERMINAL_INITIAL_CWD);
Expand Down Expand Up @@ -213,7 +215,7 @@ public CompletableFuture<?> execute(Map<String, Object> properties) {
}
}
}
if (dir != null) {
if (!hadWorkingDirectoryBefore && dir != null) {
properties.put(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR, dir);

String basename = new Path(dir).lastSegment();
Expand Down
15 changes: 13 additions & 2 deletions ...g.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/TerminalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@

import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.atomic.AtomicReference;

import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
Expand Down Expand Up @@ -250,6 +252,7 @@ protected ITerminalConnector createTerminalConnector(Map<String, Object> propert
public CompletableFuture<?> openConsole(final Map<String, Object> properties) {
Assert.isNotNull(properties);
final boolean restoringView = fRestoringView;
AtomicReference<CompletableFuture<?>> endOperation = new AtomicReference<>(null);
return executeServiceOperation(properties, new TerminalServiceRunnable() {
@Override
public void run(TerminalViewId tvid, String title, ITerminalConnector connector, Object data)
Expand All @@ -261,7 +264,14 @@ public void run(TerminalViewId tvid, String title, ITerminalConnector connector,
fRestoringView = true;
consoleViewManager.showConsoleView(tvid);
fRestoringView = false;
doRun(tvid, title, connector, data);

// To make sure that the terminals started by showConsoleView() are started first,
// we have to delay starting the current one with executeServiceOperation()
// (add the operation at the end of the queue)
endOperation.set(executeServiceOperation(
(tvid2, title2, connector2, data2) -> doRun(tvid, title, connector, data), tvid, title,
connector, data));

}
}

Expand Down Expand Up @@ -294,7 +304,8 @@ private void doRun(TerminalViewId tvid, String title, ITerminalConnector connect
console.setData("properties", properties); //$NON-NLS-1$
}
}
});
}).thenCompose(o -> Objects.<CompletableFuture<?>>requireNonNullElse(endOperation.get(),
CompletableFuture.completedFuture(o)));
}

@Override
Expand Down
Loading