duplicate code into function

Signed-off-by: odelia <odelia.zehavi@sap.com>
eclipse-theia · Feb 3, 2021 · 4d61c07 · 4d61c07
1 parent ef9d9ee
commit 4d61c07
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/packages/editor/src/browser/editor-widget.ts b/packages/editor/src/browser/editor-widget.ts
@@ -28,18 +28,21 @@ export class EditorWidget extends BaseWidget implements SaveableSource, Navigata
         super(editor);
         this.addClass('theia-editor');
         this.toDispose.push(this.editor);
-        this.toDispose.push(this.editor.onSelectionChanged(() => {
-            if (this.editor.isFocused()) {
-                this.selectionService.selection = this.editor;
-            }
-        }));
+        this.toDispose.push(this.editor.onSelectionChanged(() => this.setSelection()));
+        this.toDispose.push(this.editor.onFocusChanged(() => this.setSelection()));
         this.toDispose.push(Disposable.create(() => {
             if (this.selectionService.selection === this.editor) {
                 this.selectionService.selection = undefined;
             }
         }));
     }
 
+    setSelection(): void {
+        if (this.editor.isFocused() && this.selectionService.selection !== this.editor) {
+            this.selectionService.selection = this.editor;
+        }
+    }
+
     get saveable(): Saveable {
         return this.editor.document;
     }