Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

debug/org.eclipse.debug.terminal/META-INF/MANIFEST.MF

@@ -7,10 +7,13 @@ Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core;bundle-version="3.23.0",
  org.eclipse.tm.terminal.control;bundle-version="5.6.0",
- org.eclipse.cdt.core.native;bundle-version="6.4.0",
+ org.eclipse.cdt.core.native;bundle-version="[6.4.0,7.0.0)",
  org.eclipse.swt;bundle-version="3.130.0",
- org.eclipse.ui;bundle-version="3.207.100"
+ org.eclipse.ui;bundle-version="3.207.100",
+ org.eclipse.ui.console,
+ org.eclipse.core.expressions
 Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-Localization: plugin
 Automatic-Module-Name: org.eclipse.debug.terminal
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.debug.terminal.ui.PageBookAdapter.xml

debug/org.eclipse.debug.terminal/META-INF/p2.inf

@@ -0,0 +1,31 @@
+requires.1.namespace = org.eclipse.equinox.p2.iu
+requires.1.name = org.eclipse.cdt.core.linux
+requires.1.filter = (osgi.os=linux)
+
+requires.2.namespace = org.eclipse.equinox.p2.iu
+requires.2.name = org.eclipse.cdt.core.linux.x86_64
+requires.2.filter = (&(osgi.os=linux)(osgi.arch=x86_64))
+
+requires.3.namespace = org.eclipse.equinox.p2.iu
+requires.3.name = org.eclipse.cdt.core.linux.ppc64le
+requires.3.filter = (&(osgi.os=linux)(osgi.arch=ppc64le))
+
+requires.4.namespace = org.eclipse.equinox.p2.iu
+requires.4.name = org.eclipse.cdt.core.linux.aarch64
+requires.4.filter = (&(osgi.os=linux)(osgi.arch=aarch64))
+
+requires.5.namespace = org.eclipse.equinox.p2.iu
+requires.5.name = org.eclipse.cdt.core.macosx
+requires.5.filter = (osgi.os=macosx)
+
+requires.6.namespace = org.eclipse.equinox.p2.iu
+requires.6.name = org.eclipse.cdt.core.win32
+requires.6.filter = (osgi.os=win32)
+
+requires.7.namespace = org.eclipse.equinox.p2.iu
+requires.7.name = org.eclipse.cdt.core.win32.x86_64
+requires.7.filter = (&(osgi.os=win32)(osgi.arch=x86_64))
+
+requires.8.namespace = org.eclipse.equinox.p2.iu
+requires.8.name = org.eclipse.cdt.core.win32.aarch64
+requires.8.filter = (&(osgi.os=win32)(osgi.arch=aarch64))

debug/org.eclipse.debug.terminal/build.properties

@@ -4,5 +4,7 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                OSGI-INF/,\
-               about.html
-src.includes = about.html
+               about.html,\
+               plugin.properties
+src.includes = about.html,\
+               icons/

debug/org.eclipse.debug.terminal/icons/console_view.png

@@ -16,5 +16,13 @@
             id="org.eclipse.debug.terminal.processFactory">
       </processFactory>
    </extension>
+   <extension
+         point="org.eclipse.ui.console.consoleFactories">
+      <consoleFactory
+            class="org.eclipse.debug.terminal.ui.TerminalConsoleFactory"
+            icon="icons/console_view.png"
+            label="Terminal">
+      </consoleFactory>
+   </extension>
 
 </plugin>

debug/org.eclipse.debug.terminal/icons/console_view@2x.png

@@ -24,7 +24,7 @@
 
 class ConsoleConnector implements ITerminalConnector {
 
-	private Spawner process;
+	private final Spawner process;
 	private ITerminalControl control;
 
 	public ConsoleConnector(Spawner process) {

debug/org.eclipse.debug.terminal/plugin.xml

@@ -13,9 +13,14 @@
  *******************************************************************************/
 package org.eclipse.debug.terminal.ui;
 
+import java.io.IOException;
+import java.io.OutputStream;
+
 import org.eclipse.cdt.utils.spawner.Spawner;
 import org.eclipse.core.runtime.AdapterTypes;
 import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.debug.core.model.IBinaryStreamMonitor;
+import org.eclipse.debug.core.model.IStreamMonitor;
 import org.eclipse.debug.terminal.PtyRuntimeProcess;
 import org.eclipse.ui.part.IPageBookViewPage;
 import org.osgi.service.component.annotations.Component;
@@ -29,7 +34,19 @@ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (adaptableObject instanceof PtyRuntimeProcess rt) {
 			Spawner spawner = rt.getSpawner();
 			if (spawner != null) {
-				return adapterType.cast(new TerminalConsolePage(spawner, rt.getStreamsProxy()));
+				return adapterType.cast(new TerminalConsolePage(new ConsoleConnector(spawner), terminal -> {
+					IStreamMonitor streamMonitor = rt.getStreamsProxy().getOutputStreamMonitor();
+					if (streamMonitor instanceof IBinaryStreamMonitor bin) {
+						OutputStream outputStream = terminal.getRemoteToTerminalOutputStream();
+						bin.addBinaryListener((data, monitor) -> {
+							try {
+								outputStream.write(data);
+							} catch (IOException e1) {
+								e1.printStackTrace();
+							}
+						});
+					}
+				}));
 			}
 		}
 		return null;

debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/ConsoleConnector.java

@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Christoph Läubrich and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Christoph Läubrich - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.debug.terminal.ui;
+
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
+import org.eclipse.ui.console.AbstractConsole;
+import org.eclipse.ui.console.IConsoleView;
+import org.eclipse.ui.part.IPageBookViewPage;
+
+class TerminalConsole extends AbstractConsole {
+
+	public final static String TYPE = "terminalConsole"; //$NON-NLS-1$
+	private final ITerminalConnector terminalConnector;
+
+	TerminalConsole(ITerminalConnector terminalConnector) {
+		super("Terminal", TYPE, null, true);
+		this.terminalConnector = terminalConnector;
+	}
+
+	@Override
+	public IPageBookViewPage createPage(IConsoleView view) {
+		return new TerminalConsolePage(terminalConnector, null);
+	}
+
+}

debug/org.eclipse.debug.terminal/src/org/eclipse/debug/terminal/ui/PageBookAdapter.java

@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Christoph Läubrich and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Christoph Läubrich - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.debug.terminal.ui;
+
+import java.util.Map;
+
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.core.runtime.ILog;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleFactory;
+import org.eclipse.ui.handlers.IHandlerService;
+
+/**
+ * A Factory that supports open new Terminal Console.
+ */
+public class TerminalConsoleFactory implements IConsoleFactory {
+
+	@Override
+	public void openConsole() {
+		ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
+		IHandlerService handlerService = PlatformUI.getWorkbench().getService(IHandlerService.class);
+		if (commandService == null || handlerService == null) {
+			return;
+		}
+		Command command = commandService.getCommand("org.eclipse.tm.terminal.view.ui.command.launchConsole");
+		if (command == null) {
+			return;
+		}
+		ParameterizedCommand parameterizedCommand = ParameterizedCommand.generateCommand(command, Map.of());
+		try {
+			Object result = handlerService.executeCommandInContext(parameterizedCommand, null,
+					handlerService.getCurrentState());
+			if (result instanceof ITerminalConnector terminalConnector) {
+				TerminalConsole console = new TerminalConsole(terminalConnector);
+				ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] { console });
+			}
+		} catch (Exception e) {
+			ILog.get().error("Can't launch terminal console", e);
+		}
+	}
+
+}