fix: use currentOrPreviousFocusedEditor on search (#2761)

* fix: use currentOrPreviousFocusedEditor  on search

Author: pipiiiiii

packages/editor/src/browser/workbench-editor.service.ts

@@ -336,6 +336,10 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
     return this._currentEditorGroup as any;
   }
 
+  public get currentOrPreviousFocusedEditor(): IEditor | null {
+    return this.currentEditorGroup && this.currentEditorGroup.currentOrPreviousFocusedEditor;
+  }
+
   async open(uri: URI, options?: IResourceOpenOptions) {
     await this.initialize();
     let group = this.currentEditorGroup;

packages/editor/src/common/editor.ts

@@ -346,6 +346,11 @@ export abstract class WorkbenchEditorService {
    */
   currentEditor: IEditor | null;
 
+  /**
+   * 和 currentEditor 不同，对于 DiffEditor 来说会取到上一次 focus 的 Editor
+   */
+  currentOrPreviousFocusedEditor: IEditor | null;
+
   /**
    * 当前焦点的编辑器资源
    */

packages/search/src/browser/search.service.ts

@@ -579,7 +579,7 @@ export class ContentSearchClientService extends Disposable implements IContentSe
   };
 
   searchEditorSelection = () => {
-    const currentEditor = this.workbenchEditorService.currentEditor;
+    const currentEditor = this.workbenchEditorService.currentOrPreviousFocusedEditor;
     if (currentEditor) {
       const selections = currentEditor.getSelections();
       if (selections && selections.length > 0 && currentEditor.currentDocumentModel) {