Merge branch 'release/2.6'

Author: basilevs

rcpttTests/platform_tests/Contexts/Workbench Context/ResetExternalViews.test

@@ -0,0 +1,36 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _osb-oDAHEfCYDPUxWxrtVw,_4zI9AWpgEeCzId1Gnkds9A
+Element-Name: ResetExternalViews
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _lQ0MUDAHEfCYDPUxWxrtVw
+Runtime-Version: 2.6.0.qualifier
+Save-Time: 5/13/25, 6:46 PM
+Testcase-Type: ecl
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Copyright (c) 2025 Xored Software Inc and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+https://www.eclipse.org/legal/epl-v20.html
+
+Contributors:
+    Xored Software Inc - initial creation and/or initial documentation
+--------------------------------------------------------------------------------
+
+Open the context help view and ensure that worbench context with "Reset perspective" flag closes it.
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+verify-error {
+   get-view Help
+}
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--

rcpttTests/platform_tests/Contexts/Workbench Context/ShowContextHelp.ctx

@@ -0,0 +1,30 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.ecl
+Element-Name: ShowContextHelp
+Element-Type: context
+Element-Version: 2.0
+Id: _osb-oDAHEfCYDPUxWxrtVw
+Runtime-Version: 2.6.0.qualifier
+Save-Time: 5/13/25, 6:45 PM
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Copyright (c) 2025 Xored Software Inc and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+https://www.eclipse.org/legal/epl-v20.html
+
+Contributors:
+    Xored Software Inc - initial creation and/or initial documentation
+--------------------------------------------------------------------------------
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
+Content-Type: text/ecl
+Entry-Name: .ecl.context
+
+get-menu -path "Help/Show Context Help" | click
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998--

runtime/contexts/org.eclipse.rcptt.ctx.workbench.impl/src/org/eclipse/rcptt/ctx/workbench/impl/WorkbenchContextProcessor.java

@@ -261,6 +261,15 @@ private UIRunnable<Object> closeAllPerspectives(final IWorkbenchPage page) {
 			@Override
 			public Object run() throws CoreException {
 				try {
+					// getViewReferences() returns invalid results if all perspectives are closed
+					// @see https://github.com/eclipse-platform/eclipse.platform.ui/issues/2978
+					IViewReference[] viewReferences = page.getViewReferences();
+					for (IViewReference i: viewReferences) {
+						// some views do not belong to a perspective, and are not closed on perspective reset, consuming screen space
+						// close them in a resetting workbench context explicitly
+						// @see https://github.com/eclipse-platform/eclipse.platform.ui/issues/2976
+						page.hideView(i);
+					}
 					page.closeAllPerspectives(false, false);
 				} catch (Throwable e) {
 					RcpttPlugin.log(e);