Mw modern find replace rebased

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/IFindReplaceTargetExtension5.java

@@ -0,0 +1,43 @@
+package org.eclipse.jface.text;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Extension to search and replace using an "inline"-Find replace Bar. In order for this inline
+ * find-replace bar to work, inheriting panes need to provide a way to inject a "toolbar".
+ *
+ * In the future, extension could be elevated to a "IInlineToolBarExtension", in case there are
+ * other tools that want to profit from this extension
+ *
+ * @since 3.24
+ */
+public interface IFindReplaceTargetExtension5 {
+
+	/**
+	 * This is called every time the inline find-replace dialog is to be shown. The implementing
+	 * class guarantees to then provide a composite onto which the inline search is drawn.
+	 *
+	 * The composite is expected to have a GridLayout with a single column. Neither the width nor
+	 * the height are specified (XXX ?).
+	 *
+	 * TODO: I'm unhappy with the name, but it seems consistent with the current status Quo defined
+	 * in IFindReplaceTargetExtension
+	 *
+	 * @return the composite the inline find-replace dialog may draw on
+	 */
+	public Composite beginInlineSession();
+
+	/**
+	 * Updates the layout of the implementing class. Is required, for example, when the
+	 * "replace"-dropdown is opened/closed
+	 *
+	 * TODO: I'd like to avoid having this method. Is there a better way?
+	 */
+	public void updateLayout();
+
+	/**
+	 * The implementing class may now dispose of the composite created in beginInlineSession.
+	 *
+	 */
+	public void endInlineSession();
+}

bundles/org.eclipse.ui.ide/.project

@@ -37,6 +37,13 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>src/org/eclipse/ui/internal/views/markers/search-feature</name>
+			<type>2</type>
+			<location>C:/Users/mwittmer/Documents/search-feature</location>
+		</link>
+	</linkedResources>
 	<filteredResources>
 		<filter>
 			<id>1676382308432</id>

bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF

@@ -63,7 +63,8 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.19.0,4.0.0)";resol
  org.eclipse.e4.ui.ide;bundle-version="[3.15.0,4.0.0)";visibility:=reexport,
  org.eclipse.e4.core.di;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.e4.core.di.extensions;bundle-version="[0.18.0,1.0.0)",
- org.eclipse.ui.navigator;bundle-version="3.12.0"
+ org.eclipse.ui.navigator;bundle-version="3.12.0",
+ org.eclipse.ui.workbench.texteditor
 Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
  javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.service.event;version="[1.4.0,2.0.0)"

bundles/org.eclipse.ui.ide/plugin.xml

@@ -1089,7 +1089,13 @@
             id="org.eclipse.ui.ide.markers.copyMarkerResourceQualifiedName"
             name="%command.copyMarkerResourceQualifiedName.name"
             defaultHandler="org.eclipse.ui.internal.views.markers.CopyMarkerResourceQualifiedNameHandler">            
-      </command>          
+      </command>
+      <command
+            defaultHandler="org.eclipse.ui.internal.views.markers.MarkerViewFindHandler"
+            description="Finds a string inside of the markers, using the inline search"
+            id="org.eclipse.ui.ide.findinmarkers"
+            name="Find in Markers">
+      </command>
    </extension>
 
    <extension
@@ -1250,6 +1256,12 @@
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="CTRL+M1+F">
       </key>
+      <key
+            commandId="org.eclipse.ui.ide.findinmarkers"
+            contextId="org.eclipse.ui.contexts.window"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="CTRL+F">
+      </key>
    </extension>
 
    <extension